X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=configure.in;h=6cf0b35234c10a5aede24808c6228f028b727e8c;hb=d339304329df2d458e54c02eac10a27cb31d9cb1;hp=b6037a01e25b205fc4681281f1928c7c7c80c1ac;hpb=ddd2ef55b78a62c4bc3daad18bef8a90e85a2052;p=dump.git

diff --git a/configure.in b/configure.in
index b6037a0..6cf0b35 100644
--- a/configure.in
+++ b/configure.in
@@ -19,22 +19,6 @@ AC_CHECK_TOOL(PATCH, patch, :)
 AC_PROG_CC
 AC_PROG_INSTALL
 
-dnl
-dnl Handle --enable-dumpdates-patch
-dnl
-AC_ARG_ENABLE([dumpdates-patch],
-[  --enable-dumpdates-patch apply the dumpdates patch from Debian],
-if test "$enableval" = "yes"
-then
-	if test "$PATCH" = ":"
-	then
-		AC_MSG_ERROR(The patch program was not found on your system)
-	fi
-	(cd $srcdir; $PATCH -p < debian-patch)
-fi
-,
-)
-
 dnl
 dnl Handle --enable-debug
 dnl
@@ -90,6 +74,23 @@ echo "Not compiling rmt by default"
 )
 AC_SUBST(RMTDIR)
 
+dnl
+dnl Handle --enable-kerberos
+dnl
+AC_ARG_ENABLE([kerberos],
+[  --enable-kerberos       compile kerberos extensions],
+if test "$enableval" = "yes"
+then
+	OPTDEFS="-DKERBEROS"
+else
+	OPTDEFS=""
+fi
+,
+OPTDEFS=""
+echo "Not compiling kerberos extensions by default"
+)
+AC_SUBST(OPTDEFS)
+
 dnl
 dnl set $(CC) from --with-cc=value
 dnl
@@ -207,19 +208,48 @@ echo "MANMODE defaults to $MANMODE"
 )dnl
 AC_SUBST(MANMODE)
 
+dnl
+dnl set $(DUMPDATESPATH) from --with-dumpdatespath
+dnl
+AC_ARG_WITH([dumpdatespath],
+[  --with-dumpdatespath=path     select path for dumpdates file],
+AC_MSG_RESULT(DUMPDATESPATH is $withval)
+DUMPDATESPATH=$withval,
+DUMPDATESPATH="/etc/dumpdates"
+echo "DUMPDATESPATH defaults to $DUMPDATESPATH"
+)dnl
+AC_SUBST(DUMPDATESPATH)
+
 dnl
 dnl Check for Ext2fs headers and libraries
 dnl
 AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no])
 AC_CHECK_LIB(ext2fs, ext2fs_open, [ext2fs_lib=yes], [ext2fs_lib=no], [-lcom_err])
 if test "$ext2fs_h" = no -o "$ext2fs_lib" = no; then
-	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first)
+	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
 fi
 
 dnl
 dnl Check for library functions
 dnl
-AC_CHECK_FUNCS(err errx verr verrx vwarn vwarnx warn warnx realpath glob)
+AC_CHECK_FUNCS(err errx verr verrx vwarn vwarnx warn warnx realpath lchown)
+AC_CHECK_FUNC(glob)
+
+dnl
+dnl Check for GLOB_ALTDIRFUNC
+dnl
+if test "$ac_cv_func_glob" = "yes"; then
+	AC_EGREP_CPP(yes, 
+	[
+#	include <glob.h>
+#	ifdef GLOB_ALTDIRFUNC
+	yes
+#	endif
+	], AC_DEFINE(HAVE_GLOB), noglob=yes)
+	if test "$noglob" = "yes"; then
+		echo "Your system does not support extended glob, will use the internal routines"
+	fi
+fi
 
 dnl
 dnl Check for types
@@ -242,4 +272,4 @@ test -d compat/lib || mkdir compat/lib
 dnl
 dnl Output files
 dnl
-AC_OUTPUT(MCONFIG Makefile common/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE)
+AC_OUTPUT(MCONFIG Makefile common/Makefile compat/include/Makefile compat/lib/Makefile dump/Makefile restore/Makefile $RMTMAKEFILE)