Updated.

[apt.git] / configure.in

diff --git a/configure.in b/configure.in
index 431df2009762bf959263d5ad5e9af5071618f2dc..b03cc887f7c63572c59edbcf7ae0836662e6b385 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,8 +17,10 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.4.11")
-AC_DEFINE_UNQUOTED(PACKAGE,"apt")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.4.9")
+PACKAGE="apt"
+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
+AC_SUBST(PACKAGE)
 
 dnl Check the archs, we want the target type.
 AC_CANONICAL_SYSTEM
@@ -50,39 +52,6 @@ dnl if test "$PTHREADLIB" != "-lpthread"; then
 dnl   AC_MSG_ERROR(failed: I need posix threads, pthread)
 dnl fi
 
-dnl Find the version of python we are using and ensure the library and header
-dnl are available.. Also get all the paths and options from the python setup
-dnl makefile.
-AC_CACHE_CHECK("python version", ac_cv_ver_python, [ac_cv_ver_python=`python -c 'import sys;print sys.version[[:3]]' 2> /dev/null`])
-AC_CACHE_CHECK("python prefix", ac_cv_prefix_python, [ac_cv_prefix_python=`python -c 'import sys;print sys.prefix' 2> /dev/null`])
-AC_CACHE_CHECK("python exec prefix", ac_cv_execprefix_python, [ac_cv_execprefix_python=`python -c 'import sys;print sys.exec_prefix' 2> /dev/null`])
-if test "x$ac_cv_ver_python" != "x"; then
-
-   cat > pytest << EOF
-include $ac_cv_execprefix_python/lib/python$ac_cv_ver_python/config/Makefile
-.PHONY: libs include
-libs:
-       @echo \$(MODLIBS) \$(LIBS) \$(SYSLIBS)
-include:
-       @echo \$(INCLUDEPY)
-EOF
-   AC_CACHE_CHECK("python libs", ac_cv_libs_python, [ac_cv_libs_python=`make -s -f pytest libs 2> /dev/null`])
-   AC_CACHE_CHECK("python include", ac_cv_include_python, [ac_cv_include_python=`make -s -f pytest include 2> /dev/null`])
-   AC_CHECK_HEADER(python$ac_cv_ver_python/Python.h,
-     [AC_CHECK_LIB(python$ac_cv_ver_python,PyArg_ParseTuple,
-        [AC_DEFINE(HAVE_PYTHONLIB) PYTHONLIB="-lpython$ac_cv_ver_python $ac_cv_libs_python"],[],$ac_cv_libs_python)])
-   AC_SUBST(PYTHONLIB)
-   
-   PYTHONVER=$ac_cv_ver_python
-   PYTHONPREFIX=$ac_cv_prefix_python
-   PYTHONEXECPREFIX=$ac_cv_execprefix_python
-   PYTHONINCLUDE=$ac_cv_include_python
-   AC_SUBST(PYTHONVER)
-   AC_SUBST(PYTHONPREFIX)
-   AC_SUBST(PYTHONEXECPREFIX)
-   AC_SUBST(PYTHONINCLUDE)
-fi
-
 dnl Check for DB2
 AC_CHECK_HEADER(db2/db.h,
      [AC_CHECK_LIB(db2,db_open,
@@ -123,6 +92,10 @@ if test x"$HAVE_STATVFS" != x"yes"; then
    ])
 fi
 
+dnl We should use the real timegm function if we have it.
+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
+AC_SUBST(HAVE_TIMEGM)
+
 dnl Check the sizes etc. of the architecture
 dnl This is stupid, it should just use the AC macros like it does below
 dnl Cross compilers can either get a real C library or preload the cache
@@ -185,12 +158,25 @@ AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html)
 AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text)
 
 dnl Check for the SGML tools needed to build man pages
-AC_PATH_PROG(NSGMLS,nsgmls)
-AC_PATH_PROG(SGMLSPL,sgmlspl)
+AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
 
 dnl Check for YODL
 dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
 
 ah_NUM_PROCS
+rc_GLIBC_VER
+rc_LIBSTDCPP_VER
+ah_GCC3DEP
+
+dnl It used to be that the user could select translations and that could get
+dnl passed to the makefiles, but now that can only work if you use special
+dnl gettext approved makefiles, so this feature is unsupported by this.
+ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
+AM_GNU_GETTEXT(external)
+if test x"$USE_NLS" = "xyes"; then
+   AC_DEFINE(USE_NLS)
+fi
+AC_SUBST(USE_NLS)
+AC_PATH_PROG(BASH, bash)
 
 AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)