Update for 0.3.14

[apt.git] / configure.in

diff --git a/configure.in b/configure.in
index e52a87b54a0880e5d76f5774a48169ab043c95c5..9f12f472c87732cfb3f9fa6b0c8a665e2d88bc2e 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)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.3.2")
+AC_DEFINE_UNQUOTED(VERSION,"0.3.14")

 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Tom's host stuff
 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Tom's host stuff


@@ -34,7 +34,6 @@ tl_CHECK_TOOL_PREFIX  dnl recheck, in case the initial guess was wrong
 dnl Check for other programs
 tl_PROG_CXX
 AC_LANG_CPLUSPLUS
 dnl Check for other programs
 tl_PROG_CXX
 AC_LANG_CPLUSPLUS

-

 dnl Checks for X11
 AC_PATH_X
 AC_PATH_XTRA
 dnl Checks for X11
 AC_PATH_X
 AC_PATH_XTRA


@@ -63,11 +62,11 @@ if test "$with_gpm" != "no"; then
 fi
 
 dnl Checks for pthread
 fi
 
 dnl Checks for pthread

-AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
+#AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])

 AC_SUBST(PTHREADLIB)
 AC_SUBST(PTHREADLIB)

-if test "$PTHREADLIB" != "-lpthread"; then
-  AC_MSG_ERROR(failed: I need posix threads, pthread)
-fi
+#if test "$PTHREADLIB" != "-lpthread"; then
+#  AC_MSG_ERROR(failed: I need posix threads, pthread)
+#fi

 
 dnl Converts the ARCH to be the same as dpkg
 AC_MSG_CHECKING(system architecture)
 
 dnl Converts the ARCH to be the same as dpkg
 AC_MSG_CHECKING(system architecture)


@@ -78,29 +77,44 @@ fi
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(ARCHITECTURE,"$archset")
 
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(ARCHITECTURE,"$archset")
 

+dnl We use C9x types if at all possible
+AC_CACHE_CHECK([for C9x integer types],c9x_ints,[
+    AC_TRY_COMPILE([#include <inttypes.h>],
+                   [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;uint64_t Foo],
+                  c9x_ints=yes,c9x_ints=no)])
+

 dnl Check the sizes etc. of the architecture
 changequote(,)
 if archline="`sed -ne 's/^'$archset':[         ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then
 dnl Check the sizes etc. of the architecture
 changequote(,)
 if archline="`sed -ne 's/^'$archset':[         ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then

-changequote([,])
-  set $archline
-  if test "$1" = "little"; then
-    ac_cv_c_bigendian=no
-  else
-    ac_cv_c_bigendian=yes
-  fi
-  size_char=$2
-  size_int=$3
-  size_short=$4
-  size_long=$5
+   changequote([,])
+   set $archline
+   if test "$1" = "little"; then
+      ac_cv_c_bigendian=no
+   else
+      ac_cv_c_bigendian=yes
+   fi
+   size_char=$2
+   size_int=$3
+   size_short=$4
+   size_long=$5

 fi
 fi

+

 if test "$cross_compiling" = "yes" -a "$archline" = ""; then
   AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
 fi
 AC_C_BIGENDIAN
 if test "$cross_compiling" = "yes" -a "$archline" = ""; then
   AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
 fi
 AC_C_BIGENDIAN

-AC_CHECK_SIZEOF(char,$size_char)
-AC_CHECK_SIZEOF(int,$size_int)
-AC_CHECK_SIZEOF(short,$size_short)
-AC_CHECK_SIZEOF(long,$size_long)
+   
+dnl We do not need this if we have inttypes..
+HAVE_C9X=yes
+if test x"$c9x_ints" = x"no"; then
+   AC_CHECK_SIZEOF(char,$size_char)
+   AC_CHECK_SIZEOF(int,$size_int)
+   AC_CHECK_SIZEOF(short,$size_short)
+   AC_CHECK_SIZEOF(long,$size_long)
+  
+   HAVE_C9X=
+   AC_SUBST(HAVE_C9X)
+fi

 
 dnl Check for debiandoc
 AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","")
 
 dnl Check for debiandoc
 AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","")