X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=035a0b648f12e19681f98eb7dc07f4162402f7ec;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=e304e0a5f105c28ace245f365d01ac37bb363553;hpb=94a044f90357edefa6f4ae9f0b1d5885b0e34aee;p=debian%2Famanda

diff --git a/configure.in b/configure.in
index e304e0a..035a0b6 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.0")
+AMANDA_VERSION
+AM_INIT_AUTOMAKE(amanda, $VERSION)
 AC_CONFIG_HEADERS([config/config.h])
 
 dnl Minimum Autoconf version required.
@@ -41,7 +43,7 @@ dnl -------------------------------------------------------------------------
 
 AMANDA_WITH_USER
 AMANDA_WITH_GROUP
-AMANDA_WITH_DUMPERDIR
+AMANDA_WITH_APPLICATIONDIR
 AMANDA_WITH_CONFIGDIR
 AMANDA_WITH_INDEXDIR
 AMANDA_WITH_DBDIR
@@ -62,6 +64,7 @@ AMANDA_WITH_DEBUG_DAYS
 AMANDA_WITH_TESTING
 AMANDA_WITH_SINGLE_USERID
 AMANDA_DISABLE_INSTALLPERMS
+AMANDA_DISABLE_SYNTAX_CHECKS
 
 dnl -------------------------------------------------------------------------
 
@@ -98,6 +101,8 @@ AM_GNU_GETTEXT([external])
 #
 AMANDA_S3_DEVICE
 AMANDA_TAPE_DEVICE
+AMANDA_DVDRW_DEVICE
+AMANDA_NDMP_DEVICE
 
 #
 # Security (authentication) mechansims
@@ -107,7 +112,6 @@ AMANDA_BSDTCP_SECURITY
 AMANDA_BSDUDP_SECURITY
 AMANDA_RSH_SECURITY
 AMANDA_SSH_SECURITY
-AMANDA_KRB4_SECURITY
 AMANDA_KRB5_SECURITY
 
 #
@@ -118,6 +122,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
 
@@ -138,10 +143,12 @@ AMANDA_PROG_BASH
 AMANDA_PROG_SORT
 AMANDA_PROG_MAILER
 AMANDA_PROG_MT
-AMANDA_PROG_PRINT
+AMANDA_PROG_LPR
 AMANDA_PROG_PCAT
 AMANDA_PROG_PERL
 AMANDA_PROG_SWIG
+AMANDA_PS_ARGUMENT
+AMANDA_PROG_RPCGEN
 
 dnl -------------------------------------------------------------------------
 
@@ -168,12 +175,14 @@ AMANDA_ENABLE_GCC_WARNING([missing-prototypes])
 AMANDA_ENABLE_GCC_WARNING([strict-prototypes])
 AMANDA_ENABLE_GCC_WARNING([missing-declarations])
 AMANDA_ENABLE_GCC_WARNING([format])
+AMANDA_ENABLE_GCC_WARNING([format-security])
 AMANDA_ENABLE_GCC_WARNING([sign-compare])
 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
@@ -185,21 +194,21 @@ AMANDA_STATIC_FLAGS
 #
 # headers
 #
+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 \
-	string.h \
 	strings.h \
+	rpc/rpc.h \
 	sys/file.h \
 	sys/ioctl.h \
 	sys/ipc.h \
@@ -212,13 +221,17 @@ AC_CHECK_HEADERS(
 	sys/types.h \
 	sys/uio.h \
 	syslog.h \
+	time.h \
 	unistd.h \
 )
+AC_DEFINE([HAVE_AMANDA_H], 1, [Define to 1 if you have the "amanda.h" header file.])
+AC_DEFINE([HAVE_UTIL_H], 1, [Define to 1 if you have the "util.h" header file.])
+
+AC_DEFINE([USE_GETTEXT], 1, [Define to 1 if files will be processed with gettextize])
 
 #
 # Types
 #
-AC_SOCKADDR_STORAGE
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
@@ -233,7 +246,7 @@ AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 AC_TYPE_SIGNAL
 AC_STRUCT_TM
-AMANDA_CHECK_TYPE(socklen_t, int, sys/socket.h)
+AMANDA_SOCKLEN_T_EQUIV
 AMANDA_CHECK_TYPE(sa_family_t, unsigned short, sys/socket.h)
 AMANDA_CHECK_TYPE(in_port_t, unsigned short, netinet/in.h)
 CF_WAIT
@@ -249,6 +262,7 @@ AMANDA_CHECK_NET_LIBS
 AMANDA_CHECK_GLIB
 AMANDA_CHECK_READLINE
 AC_CHECK_LIB(m,modf)
+AMANDA_GLIBC_BACKTRACE
 
 #
 # Declarations
@@ -282,6 +296,8 @@ ICE_CHECK_DECL(fputs,stdio.h)
 ICE_CHECK_DECL(fread,stdio.h stdlib.h)
 ICE_CHECK_DECL(fseek,stdio.h)
 ICE_CHECK_DECL(fwrite,stdio.h stdlib.h)
+AC_CHECK_FUNCS(getgrgid_r)
+AC_CHECK_FUNCS(getpwuid_r)
 ICE_CHECK_DECL(gethostname,unistd.h)
 ICE_CHECK_DECL(getopt,stdlib.h unistd.h libc.h)
 ICE_CHECK_DECL(getpeername,sys/types.h sys/socket.h)
@@ -320,7 +336,6 @@ ICE_CHECK_DECL(setegid,unistd.h)
 ICE_CHECK_DECL(seteuid,unistd.h)
 ICE_CHECK_DECL(setresgid,unistd.h)
 ICE_CHECK_DECL(setresuid,unistd.h)
-AC_CHECK_FUNCS(shquote)
 ICE_CHECK_DECL(snprintf,stdio.h)
 ICE_CHECK_DECL(vsnprintf,stdio.h)
 AMANDA_FUNC_SETPGID
@@ -356,37 +371,27 @@ dnl
 AC_CONFIG_FILES([
     Makefile
     amandad-src/Makefile
+    amar-src/Makefile
     amplot/Makefile
     changer-src/Makefile
     client-src/Makefile
     common-src/Makefile
-    common-src/versuff.c
     config/Makefile
     device-src/Makefile
-    device-src/tests/Makefile
-    dumper-src/Makefile
+    application-src/Makefile
     example/Makefile
-    example/amanda-client.conf
-    example/amanda.conf
-    example/chg-mcutil.conf
-    example/template.d/amanda-S3.conf
-    example/template.d/advanced.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/Makefile
     po/Makefile
     recover-src/Makefile
-    restore-src/Makefile
     server-src/Makefile
-    tape-src/Makefile
+    xfer-src/Makefile
 ])
 
 AC_OUTPUT
-AMANDA_GET_SVN_INFO
 AMANDA_SHOW_SUMMARY