Extract Templates adjustments

[apt.git] / configure.in

diff --git a/configure.in b/configure.in
index 431df2009762bf959263d5ad5e9af5071618f2dc..60bea15698bb1d0df8892ce02744e238d2b6944d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ 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_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(VERSION,"0.5.0")

 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Check the archs, we want the target type.
 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Check the archs, we want the target type.


@@ -50,39 +50,6 @@ dnl if test "$PTHREADLIB" != "-lpthread"; then
 dnl   AC_MSG_ERROR(failed: I need posix threads, pthread)
 dnl fi
 
 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,
 dnl Check for DB2
 AC_CHECK_HEADER(db2/db.h,
      [AC_CHECK_LIB(db2,db_open,


@@ -192,5 +159,7 @@ dnl Check for YODL
 dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
 
 ah_NUM_PROCS
 dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
 
 ah_NUM_PROCS

+ah_GLIBC_VER
+ah_LIBSTDCPP_VER

 
 AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)
 
 AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)