Remove is not sticky

[apt.git] / configure.in

diff --git a/configure.in b/configure.in
index 736885c35af18d49fd38f376e289f693fcefc9f8..1525e961b18c29babb85462de3bd8e2e7ab1ec1c 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_DEFINE_UNQUOTED(VERSION,"0.3.6")
+AC_DEFINE_UNQUOTED(VERSION,"0.3.12.1")
 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Tom's host stuff
@@ -62,11 +62,11 @@ if test "$with_gpm" != "no"; then
 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)
-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)
@@ -77,29 +77,40 @@ fi
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(ARCHITECTURE,"$archset")
 
-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
+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 We do not need this if we have inttypes..
+   if test x"$c9x_ints" = x"no"; 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
+   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
+   
+   AC_CHECK_SIZEOF(char,$size_char)
+   AC_CHECK_SIZEOF(int,$size_int)
+   AC_CHECK_SIZEOF(short,$size_short)
+   AC_CHECK_SIZEOF(long,$size_long)
 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
-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 Check for debiandoc
 AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","")
@@ -108,4 +119,8 @@ AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","")
 dnl Check for YODL
 AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
 
-AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs)
+if test x"$c9x_ints" = x"no"; then
+   AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in include/inttypes.h:buildlib/inttypes.h.in,make dirs)
+else
+   AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs)
+fi