Update for 0.3.14

[apt.git] / configure.in

diff --git a/configure.in b/configure.in
index 1525e961b18c29babb85462de3bd8e2e7ab1ec1c..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_DEFINE_UNQUOTED(VERSION,"0.3.12.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.3.14")
 AC_DEFINE_UNQUOTED(PACKAGE,"apt")
 
 dnl Tom's host stuff
@@ -83,33 +83,37 @@ AC_CACHE_CHECK([for C9x integer types],c9x_ints,[
                    [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
+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
+if test "$cross_compiling" = "yes" -a "$archline" = ""; then
+  AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable)
+fi
+AC_C_BIGENDIAN
    
+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
@@ -119,8 +123,4 @@ AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","")
 dnl Check for YODL
 AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
 
-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
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs)