X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=8cc9bfbb35364b48189580680b19780ed6c98f8e;hb=d0a23775e98f94e9d5eac7160a4c4094b48f4ad8;hp=14a3ab99409c8a4a0b364866e48b8532f9a6f885;hpb=d74dc4d908fcbc1a4ef474edaf51e61ec90eab6b;p=debian%2Famanda

diff --git a/configure.in b/configure.in
index 14a3ab9..8cc9bfb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,14 @@
 AC_INIT
 AC_CONFIG_SRCDIR([common-src/amanda.h])
 AC_CONFIG_AUX_DIR(config)
-AC_CANONICAL_TARGET([])
+AC_CONFIG_MACRO_DIR(config)
+AC_CANONICAL_HOST
 
 PACKAGE=amanda
 AC_SUBST(PACKAGE)
 
-AM_INIT_AUTOMAKE(amanda, "2.6.1p1")
+AMANDA_VERSION
+AM_INIT_AUTOMAKE(amanda, $VERSION)
 AC_CONFIG_HEADERS([config/config.h])
 
 dnl Minimum Autoconf version required.
@@ -62,6 +64,7 @@ AMANDA_WITH_DEBUG_DAYS
 AMANDA_WITH_TESTING
 AMANDA_WITH_SINGLE_USERID
 AMANDA_DISABLE_INSTALLPERMS
+AMANDA_DISABLE_SYNTAX_CHECKS
 
 dnl -------------------------------------------------------------------------
 
@@ -73,13 +76,11 @@ AMANDA_SETUP_AMPLOT
 AMANDA_SETUP_DOCUMENTATION
 AMANDA_SETUP_DEFAULTS
 AMANDA_SETUP_LFS
-AMANDA_SETUP_CHANGER
 AMANDA_SETUP_GETFSENT
 AMANDA_SETUP_FILE_LOCKING
 AMANDA_SETUP_SWIG
 AMANDA_CHECK_COMPRESSION
 AMANDA_CHECK_IPV6
-AMANDA_CHECK_SHMEM
 AMANDA_CHECK_READDIR
 AMANDA_CHECK_DEVICE_PREFIXES
 AMANDA_SYSHACKS
@@ -98,6 +99,8 @@ AM_GNU_GETTEXT([external])
 #
 AMANDA_S3_DEVICE
 AMANDA_TAPE_DEVICE
+AMANDA_DVDRW_DEVICE
+AMANDA_NDMP_DEVICE
 
 #
 # Security (authentication) mechansims
@@ -107,7 +110,6 @@ AMANDA_BSDTCP_SECURITY
 AMANDA_BSDUDP_SECURITY
 AMANDA_RSH_SECURITY
 AMANDA_SSH_SECURITY
-AMANDA_KRB4_SECURITY
 AMANDA_KRB5_SECURITY
 
 #
@@ -118,6 +120,7 @@ AMANDA_PROG_VXDUMP_VXRESTORE
 AMANDA_PROG_VDUMP_VRESTORE
 AMANDA_PROG_DUMP_RESTORE
 AMANDA_PROG_GNUTAR
+AMANDA_PROG_STAR
 AMANDA_PROG_SAMBA_CLIENT
 AMANDA_CHECK_USE_RUNDUMP
 
@@ -127,7 +130,7 @@ AMANDA_CHECK_USE_RUNDUMP
 AMANDA_PROG_GREP
 AC_PROG_EGREP
 AMANDA_PROG_LINT
-AM_PROG_LEX
+AMANDA_PROG_LEX
 AMANDA_PROG_AR
 AMANDA_PROG_GETTEXT
 AC_PROG_AWK
@@ -138,11 +141,13 @@ AMANDA_PROG_BASH
 AMANDA_PROG_SORT
 AMANDA_PROG_MAILER
 AMANDA_PROG_MT
-AMANDA_PROG_PRINT
+AMANDA_PROG_MTX
+AMANDA_PROG_LPR
 AMANDA_PROG_PCAT
 AMANDA_PROG_PERL
 AMANDA_PROG_SWIG
 AMANDA_PS_ARGUMENT
+AMANDA_PROG_RPCGEN
 
 dnl -------------------------------------------------------------------------
 
@@ -175,7 +180,8 @@ AMANDA_ENABLE_GCC_WARNING([float-equal])
 AMANDA_ENABLE_GCC_WARNING([old-style-definition])
 AMANDA_DISABLE_GCC_WARNING([strict-aliasing])
 AMANDA_DISABLE_GCC_WARNING([unknown-pragmas])
-
+AMANDA_WERROR_FLAGS
+AMANDA_SWIG_ERROR
 
 #
 # Libtool
@@ -191,18 +197,17 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_CHECK_HEADERS(
-	arpa/inet.h \
 	grp.h \
 	libc.h \
 	libgen.h \
 	limits.h \
 	math.h \
-	netdb.h \
 	netinet/in.h \
 	regex.h \
 	stdarg.h \
 	stdlib.h \
 	strings.h \
+	rpc/rpc.h \
 	sys/file.h \
 	sys/ioctl.h \
 	sys/ipc.h \
@@ -350,6 +355,7 @@ ICE_CHECK_DECL(time,time.h sys/time.h)
 ICE_CHECK_DECL(tolower,ctype.h)
 ICE_CHECK_DECL(toupper,ctype.h)
 ICE_CHECK_DECL(ungetc,stdio.h)
+AC_CHECK_FUNCS(unsetenv)
 ICE_CHECK_DECL(vfprintf,stdio.h stdlib.h)
 ICE_CHECK_DECL(vprintf,stdio.h stdlib.h)
 AC_CHECK_FUNC(wait4)
@@ -370,36 +376,23 @@ AC_CONFIG_FILES([
     changer-src/Makefile
     client-src/Makefile
     common-src/Makefile
-    common-src/versuff.c
     config/Makefile
     device-src/Makefile
     application-src/Makefile
     example/Makefile
-    example/amanda-client.conf
-    example/amanda.conf
-    example/xinetd.amandaclient
-    example/xinetd.amandaserver
-    example/inetd.conf.amandaclient
-    example/inetd.conf.amandaserver
-    example/chg-mcutil.conf
-    example/template.d/advanced.conf
-    example/template.d/amanda-S3.conf
-    example/template.d/amanda-harddisk.conf
-    example/template.d/amanda-single-tape.conf
-    example/template.d/amanda-tape-changer.conf
     gnulib/Makefile
     installcheck/Makefile
     man/Makefile
+    ndmp-src/Makefile
     oldrecover-src/Makefile
     packaging/Makefile
+    perl/amglue/Makefile
     perl/Makefile
     po/Makefile
     recover-src/Makefile
-    restore-src/Makefile
     server-src/Makefile
     xfer-src/Makefile
 ])
 
 AC_OUTPUT
-AMANDA_GET_SVN_INFO
 AMANDA_SHOW_SUMMARY