samba3-vscan .cvsignore,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2 aclocal.m4,1.1.1.1,1.2 autogen.sh,1.1.1.1,1.2 configure.in,1.1.1.1,1.2 install-sh,1.1.1.1,1.2

Update of /cvsroot/openantivirus/samba3-vscan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8372

Modified Files:
	.cvsignore Makefile.in aclocal.m4 autogen.sh configure.in 
	install-sh 
Log Message:
remove Samba 2.2 support, Samba3 is from now on supported only




Index: configure.in
===================================================================
RCS file: /cvsroot/openantivirus/samba3-vscan/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.in	23 Jul 2005 14:33:53 -0000	1.1.1.1
+++ configure.in	23 Jul 2005 14:47:44 -0000	1.2
@@ -119,6 +119,9 @@
 		[ GLOBAL_LIBS="-lresolv $GLOBAL_LIBS"
 		  AC_DEFINE(HAVE_INET_ATON, 1, [Define if you have inet_aton])])])
 
+AC_CHECK_FUNCS(atoll)
+
+
 AC_ARG_WITH(fhs, 
 [  --with-fhs              Use FHS-compliant paths (default=no)],
     libdir="\${prefix}/lib/samba",
@@ -493,164 +496,6 @@
     AC_MSG_RESULT($SAMBA_VERSION_VENDOR_SUFFIX)
 fi
 
-################################################################
-################################################################
-
-################################################################
-################################################################
-#
-# Try to get the Samba Version for old releases
-#
-SAMBA_VERSION_H_STR=$(cat ${SAMBA_srcdir}/include/version.h |grep '#define VERSION'|cut -d ' ' -f3-)
-
-SAMBA_VERSION=
-####################################################
-# set the location location of the samba source tree
-AC_ARG_WITH(samba-version,
-[  --with-samba-version=VERSION_STRING Default is autodetect from (\${SAMBA_srcdir}/include/version.h)],
-[ case "$withval" in
-  yes|no)
-  #
-  # Just in case anybody calls it without argument
-  #
-    AC_MSG_WARN([--with-samba-version called with($withval) - will use default])
-  ;;
-  * )
-    if test -z "$withval";then
-       AC_MSG_WARN([--with-samba-version called without argument - will use default])
-    else
-      SAMBA_VERSION="\"$withval\""
-
-      if test -n "$SAMBA_VERSION_STRING";then
-	    AC_MSG_WARN([you specified --with-samba-version=$SAMBA_VERSION])
-	    AC_MSG_WARN([this will have no effect because the used])
-	    AC_MSG_WARN([SAMBA Version $SAMBA_VERSION_STRING already])
-	    AC_MSG_WARN([includes the SAMBA_VERSION_{MAJOR,MINOR,RELEASE} define's])
-      else
-	if test x"$SAMBA_VERSION" != x"$SAMBA_VERSION_H_STR"; then
-	    AC_MSG_WARN([you specified --with-samba-version=$SAMBA_VERSION])
-	    AC_MSG_WARN([this will overwrite $SAMBA_VERSION_H_STR])
-	    AC_MSG_WARN([which is shown in \${SAMBA_srcdir}/include/version.h])
-	fi
-      fi
-    fi
-    ;;
-  esac])
-
-
-if test -z "$SAMBA_VERSION_STRING";then
-
- if test -z "$SAMBA_VERSION"; then
-	SAMBA_VERSION=$SAMBA_VERSION_H_STR
- fi
-
- AC_MSG_CHECKING(for Samba Version)
-
- changequote(, )dnl
- SAMBA_VERSION_MAJOR=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\1/')
- SAMBA_VERSION_MINOR=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\2/')
- SAMBA_VERSION_RELEASE=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\3/')
- SAMBA_VERSION_SUFFIX=$(echo $SAMBA_VERSION | sed -e 's/"\([0-9]\)\.\([0-9]\)[\.]*\([0-9]*\)\([a-zA-Z]*\)\([0-9]*\)\([a-zA-Z]*\)\([-]*\)\(.*\)"/\4/')
- 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/')
- 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/')
- 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/')
- changequote([, ])dnl
-
- SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}"
-
- if test -n "$SAMBA_VERSION_RELEASE";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}.${SAMBA_VERSION_RELEASE}"
- fi
-
- case $SAMBA_VERSION_SUFFIX in
-    a)
-	SAMBA_VERSION_REVISION="a"
-	;;
-    b)
-	SAMBA_VERSION_REVISION="b"
-	;;
-    c)
-	SAMBA_VERSION_REVISION="c"
-	;;
-    d)
-	SAMBA_VERSION_REVISION="d"
-	;;
-    *pre*)
-	SAMBA_VERSION_PRE_RELEASE=$SAMBA_VERSION_SUFFIX_RELEASE
-	;;
-    *rc*)
-	SAMBA_VERSION_RC_RELEASE=$SAMBA_VERSION_SUFFIX_RELEASE
-	;;
-    *beta*)
-	SAMBA_VERSION_BETA_RELEASE=$SAMBA_VERSION_SUFFIX_RELEASE
-	;;
-    *alpha*)
-	SAMBA_VERSION_ALPHA_RELEASE=$SAMBA_VERSION_SUFFIX_RELEASE
-	;;
-    *cvs*)
-	SAMBA_VERSION_IS_CVS_SNAPSHOT=yes
-	;;
-    *)
-	SAMBA_VERSION_VENDOR_SUFFIX=$SAMBA_VERSION_SUFFIX
-	;;
- esac
-
- case $SAMBA_VERSION_SUFFIX_EXTRA1 in
-    *cvs*)
-	SAMBA_VERSION_IS_CVS_SNAPSHOT=yes
-	;;
-    *)
-	SAMBA_VERSION_VENDOR_SUFFIX="${SAMBA_VERSION_VENDOR_SUFFIX}${SAMBA_VERSION_SUFFIX_EXTRA1}"
-	;;
- esac
-
- if test -n "$SAMBA_VERSION_SUFFIX_EXTRA2";then
-	SAMBA_VERSION_VENDOR_SUFFIX="${SAMBA_VERSION_VENDOR_SUFFIX}${SAMBA_VERSION_SUFFIX_EXTRA2}"
- fi
-
- AC_DEFINE_UNQUOTED(SAMBA_VERSION_MAJOR,$SAMBA_VERSION_MAJOR,[Samba Major version])
- AC_DEFINE_UNQUOTED(SAMBA_VERSION_MINOR,$SAMBA_VERSION_MINOR,[Samba Minor version])
- if test -n "$SAMBA_VERSION_RELEASE";then
-   AC_DEFINE_UNQUOTED(SAMBA_VERSION_RELEASE,$SAMBA_VERSION_RELEASE,[Samba Release version])
- fi
-
- if test -n "${SAMBA_VERSION_REVISION}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_REVISION,"${SAMBA_VERSION_REVISION}",[Samba Release Revision version])
- elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_PRE_RELEASE,${SAMBA_VERSION_PRE_RELEASE},[Samba PRE Release version])
- elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}rc${SAMBA_VERSION_RC_RELEASE}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_RC_RELEASE,${SAMBA_VERSION_RC_RELEASE},[Samba RC Release version])
- elif test -n "${SAMBA_VERSION_BETA_RELEASE}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}beta${SAMBA_VERSION_BETA_RELEASE}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_BETA_RELEASE,${SAMBA_VERSION_BETA_RELEASE},[Samba Beta Release version])
- elif test -n "${SAMBA_VERSION_ALPHA_RELEASE}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}alpha${SAMBA_VERSION_ALPHA_RELEASE}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_ALPHA_RELEASE,${SAMBA_VERSION_ALPHA_RELEASE},[Samba Alpha Release version])
- fi
-
- if test x"${SAMBA_VERSION_IS_CVS_SNAPSHOT}" = x"yes";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}cvs"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_IS_CVS_SNAPSHOT,1,[Samba is cvs snapshot])
- fi
-
- AC_DEFINE_UNQUOTED(SAMBA_VERSION_OFFICIAL_STRING,$SAMBA_VERSION_STRING,[Samba Version Official String])
-
- if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
-    AC_DEFINE_UNQUOTED(SAMBA_VERSION_VENDOR_SUFFIX,"$SAMBA_VERSION_VENDOR_SUFFIX",[Samba Version Vendor Suffix])
- fi
- 
- SAMBA_VERSION_STRING="\"${SAMBA_VERSION_STRING}\""
- AC_DEFINE_UNQUOTED(SAMBA_VERSION_STRING,$SAMBA_VERSION_STRING,[Samba Version String])
-
- AC_MSG_RESULT($SAMBA_VERSION_STRING)
-fi
-###########################################################
-###########################################################
-
 ###########################################################
 ###########################################################
 # POPT include dir






-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click