edsp: optionally store a compressed copy of the last scenario

[apt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d0e0a9dbc77892fd4fd252322e410ba514afa7b..ac61bbf15fc3a06143d695b739d7ef8f18d4951f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,13 +12,14 @@ dnl not used but STL is.
 dnl 'make -f Makefile startup' will generate the configure file from
 dnl configure.ac correctly and can be run at any time
 
 dnl 'make -f Makefile startup' will generate the configure file from
 dnl configure.ac correctly and can be run at any time
 

-AC_PREREQ(2.50)
-AC_INIT(configure.ac)
+AC_PREREQ([2.68])
+AC_INIT
+AC_CONFIG_SRCDIR([configure.ac])

 AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
 AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"

-PACKAGE_VERSION="1.1~exp3"
+PACKAGE_VERSION="1.3~exp1"

 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")


@@ -28,12 +29,12 @@ AC_SUBST(PACKAGE_VERSION)
 AC_SUBST(PACKAGE_MAIL)
 
 dnl Check the archs, we want the target type.
 AC_SUBST(PACKAGE_MAIL)
 
 dnl Check the archs, we want the target type.

-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET

 
 dnl Check our C compiler
 
 dnl Check our C compiler

-AC_CHECK_TOOL_PREFIX
+

 AC_PROG_CC
 AC_PROG_CC

-AC_ISC_POSIX
+AC_SEARCH_LIBS([strerror],[cposix])

 
 dnl check for large file support and enable it if possible
 dnl do this early as other stuff might depend on it
 
 dnl check for large file support and enable it if possible
 dnl do this early as other stuff might depend on it


@@ -91,7 +92,7 @@ AC_CHECK_LIB(curl, curl_easy_init,
 
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADER(gtest/gtest.h,,
 
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADER(gtest/gtest.h,,

-     AC_MSG_ERROR([failed: I need gtest to build tests]),
+     AC_MSG_WARN([failed: I need gtest (packaged as libgtest-dev) for unit testing]),

 )
 AC_LANG_POP([C++])
 
 )
 AC_LANG_POP([C++])
 


@@ -107,6 +108,13 @@ if test "x$HAVE_ZLIB" = "xyes"; then
        AC_DEFINE(HAVE_ZLIB)
 fi
 
        AC_DEFINE(HAVE_ZLIB)
 fi
 

+HAVE_LZ4=no
+AC_CHECK_LIB(lz4, LZ4F_createCompressionContext,[AC_CHECK_HEADER(lz4frame.h, [HAVE_LZ4=yes], [])], [])
+AC_SUBST(HAVE_LZ4)
+if test "x$HAVE_LZ4" = "xyes"; then
+       AC_DEFINE(HAVE_LZ4)
+fi
+

 HAVE_BZ2=no
 AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], [])
 AC_SUBST(HAVE_BZ2)
 HAVE_BZ2=no
 AC_CHECK_LIB(bz2, BZ2_bzopen,[AC_CHECK_HEADER(bzlib.h, [HAVE_BZ2=yes], [])], [])
 AC_SUBST(HAVE_BZ2)


@@ -174,9 +182,14 @@ AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)],
 
 
 dnl check for setuid checking function
 
 
 dnl check for setuid checking function

-AC_CHECK_FUNCS(getresuid getresgid)
+AC_CHECK_FUNCS(getresuid getresgid setresuid setresgid)

 AC_SUBST(HAVE_GETRESUID)
 AC_SUBST(HAVE_GETRESGID)
 AC_SUBST(HAVE_GETRESUID)
 AC_SUBST(HAVE_GETRESGID)

+AC_SUBST(HAVE_SETRESUID)
+AC_SUBST(HAVE_SETRESGID)
+
+AC_CHECK_FUNC(ptsname_r)
+AC_SUBST(HAVE_PTSNAME_R)

 
 dnl Check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)
 
 dnl Check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)


@@ -204,4 +217,5 @@ fi
 AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 
 AC_SUBST(USE_NLS)
 AC_PATH_PROG(BASH, bash)
 

-AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in,make -s dirs)
+AC_CONFIG_FILES([environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in])
+AC_OUTPUT