|
Line 0
Link Here
|
|
|
1 |
--- configure.orig Thu Mar 24 00:31:42 2005 |
| 2 |
+++ configure Mon May 30 16:58:31 2005 |
| 3 |
@@ -3902,7 +3902,7 @@ |
| 4 |
# |
| 5 |
# Try to get the Samba Version for old releases |
| 6 |
# |
| 7 |
-SAMBA_VERSION_H_STR=$(cat ${SAMBA_srcdir}/include/version.h |grep '#define VERSION'|cut -d ' ' -f3-) |
| 8 |
+SAMBA_VERSION_H_STR=`cat ${SAMBA_srcdir}/include/version.h |grep '#define SAMBA_VERSION'|cut -d ' ' -f3-` |
| 9 |
|
| 10 |
SAMBA_VERSION= |
| 11 |
#################################################### |
| 12 |
@@ -3950,26 +3950,21 @@ |
| 13 |
esac |
| 14 |
fi; |
| 15 |
|
| 16 |
- |
| 17 |
-if test -z "$SAMBA_VERSION_STRING";then |
| 18 |
+if /usr/bin/true ;then |
| 19 |
|
| 20 |
if test -z "$SAMBA_VERSION"; then |
| 21 |
SAMBA_VERSION=$SAMBA_VERSION_H_STR |
| 22 |
fi |
| 23 |
- |
| 24 |
echo "$as_me:$LINENO: checking for Samba Version" >&5 |
| 25 |
echo $ECHO_N "checking for Samba Version... $ECHO_C" >&6 |
| 26 |
|
| 27 |
- SAMBA_VERSION_MAJOR=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\1/') |
| 28 |
- SAMBA_VERSION_MINOR=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\2/') |
| 29 |
- SAMBA_VERSION_RELEASE=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\3/') |
| 30 |
- SAMBA_VERSION_SUFFIX=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\4/') |
| 31 |
- SAMBA_VERSION_SUFFIX_RELEASE=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\5/') |
| 32 |
- SAMBA_VERSION_SUFFIX_EXTRA1=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\6/') |
| 33 |
- SAMBA_VERSION_SUFFIX_EXTRA2=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\8/') |
| 34 |
+ SAMBA_VERSION_MAJOR=$(echo $SAMBA_VERSION | awk '{print $1}') |
| 35 |
+ SAMBA_VERSION_MINOR=$(echo $SAMBA_VERSION | awk '{print $2}') |
| 36 |
+ SAMBA_VERSION_RELEASE=$(echo $SAMBA_VERSION | awk '{print $3}'| sed -e 's/\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)/\1/') |
| 37 |
+ SAMBA_VERSION_SUFFIX=$(echo $SAMBA_VERSION | awk '{print $3}' | sed -e 's/\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)/\2/') |
| 38 |
+ SAMBA_VERSION_SUFFIX_RELEASE=$(echo $SAMBA_VERSION | awk '{print $3}' | sed -e 's/\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)/\3/') |
| 39 |
|
| 40 |
SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}" |
| 41 |
- |
| 42 |
if test -n "$SAMBA_VERSION_RELEASE";then |
| 43 |
SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}.${SAMBA_VERSION_RELEASE}" |
| 44 |
fi |
| 45 |
@@ -4085,9 +4080,9 @@ |
| 46 |
fi |
| 47 |
|
| 48 |
|
| 49 |
-cat >>confdefs.h <<_ACEOF |
| 50 |
+#cat >>confdefs.h <<_ACEOF |
| 51 |
#define SAMBA_VERSION_OFFICIAL_STRING $SAMBA_VERSION_STRING |
| 52 |
-_ACEOF |
| 53 |
+#_ACEOF |
| 54 |
|
| 55 |
|
| 56 |
if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then |
| 57 |
@@ -4101,9 +4096,9 @@ |
| 58 |
|
| 59 |
SAMBA_VERSION_STRING="\"${SAMBA_VERSION_STRING}\"" |
| 60 |
|
| 61 |
-cat >>confdefs.h <<_ACEOF |
| 62 |
+#cat >>confdefs.h <<_ACEOF |
| 63 |
#define SAMBA_VERSION_STRING $SAMBA_VERSION_STRING |
| 64 |
-_ACEOF |
| 65 |
+#_ACEOF |
| 66 |
|
| 67 |
|
| 68 |
echo "$as_me:$LINENO: result: $SAMBA_VERSION_STRING" >&5 |
| 69 |
@@ -5128,7 +5123,7 @@ |
| 70 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
| 71 |
else |
| 72 |
ac_check_lib_save_LIBS=$LIBS |
| 73 |
-LIBS="-lmagic $LIBS" |
| 74 |
+LIBS="-lmagic -lz $LIBS" |
| 75 |
cat >conftest.$ac_ext <<_ACEOF |
| 76 |
#line $LINENO "configure" |
| 77 |
#include "confdefs.h" |
| 78 |
@@ -5182,7 +5177,7 @@ |
| 79 |
#define HAVE_LIBMAGIC 1 |
| 80 |
_ACEOF |
| 81 |
|
| 82 |
- LIBS="-lmagic $LIBS" |
| 83 |
+ LIBS="-lmagic -lz $LIBS" |
| 84 |
|
| 85 |
fi |
| 86 |
|
| 87 |
@@ -5190,7 +5185,7 @@ |
| 88 |
if test x"$ac_cv_header_magic_h" = x"yes"; then |
| 89 |
if test x"$ac_cv_lib_magic_magic_load" = x"yes"; then |
| 90 |
vscan_cv_filetype=yes |
| 91 |
- MAGIC_LIB="-lmagic" |
| 92 |
+ MAGIC_LIB="-lmagic -lz" |
| 93 |
fi |
| 94 |
fi |
| 95 |
fi |