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.15")
AC_DEFINE_UNQUOTED(PACKAGE,"apt")
-dnl Tom's host stuff
-tl_CHECK_TOOL_PREFIX dnl Initial guess
-
dnl Check our C compiler
-tl_PROG_CC
+AC_CHECK_TOOL_PREFIX
+AC_PROG_CC
AC_ISC_POSIX
dnl Check the host arch (build+target not needed... yet)
-tl_CANONICAL_HOST
-tl_CHECK_TOOL_PREFIX dnl recheck, in case the initial guess was wrong
+AC_CANONICAL_HOST
+AC_CHECK_TOOL_PREFIX dnl recheck, in case the initial guess was wrong
dnl Check for other programs
-tl_PROG_CXX
-AC_LANG_CPLUSPLUS
-dnl Checks for X11
-AC_PATH_X
-AC_PATH_XTRA
-AC_SUBST(X11LIB)
-X11LIB=
-if test "$no_x" != "yes"; then
- X11LIB="-lX11"
- AC_DEFINE(HAVE_X11)
- dnl Checks for ZPM
- AC_CHECK_LIB(Xpm, XpmLibraryVersion,[AC_DEFINE(HAVE_LIBXPM) XPMLIB="-lXpm"],,$X_LIBS $X_PRE_LIBS $X11LIB $X_EXTRA_LIBS)
- AC_SUBST(XPMLIB)
- if test "$XPMLIB" != "-lXpm"; then
- AC_MSG_ERROR(failed: I need xpm if you are building for X)
- fi
-fi
-
-dnl Checks for Slang
-AC_CHECK_LIB(slang, SLang_Version,[AC_DEFINE(HAVE_LIBSLANG) SLANGLIB="-lslang"])
-AC_SUBST(SLANGLIB)
-
-dnl Checks for GPM
-AC_ARG_WITH(gpm,[ --without-gpm do not use GPM mouse support])
-if test "$with_gpm" != "no"; then
- AC_CHECK_LIB(gpm, Gpm_Open,[AC_DEFINE(HAVE_LIBGPM) GPMLIB="-lgpm"])
- AC_SUBST(GPMLIB)
+AC_PROG_CXX
+#AC_LANG_CPLUSPLUS
+
+dnl Checks for sockets
+SAVE_LIBS="$LIBS"
+LIBS=""
+AC_SEARCH_LIBS(gethostbyname,nsl)
+AC_SEARCH_LIBS(connect,socket)
+SOCKETLIBS="$LIBS"
+AC_SUBST(SOCKETLIBS)
+LIBS="$SAVE_LIBS"
+
+dnl Section Disabled pending removal of deity widget library -- jgg
+if test "yes" != "yes"; then
+ dnl Checks for X11
+ AC_PATH_X
+ AC_PATH_XTRA
+ AC_SUBST(X11LIB)
+ X11LIB=
+ if test "$no_x" != "yes"; then
+ X11LIB="-lX11"
+ AC_DEFINE(HAVE_X11)
+ dnl Checks for ZPM
+ AC_CHECK_LIB(Xpm, XpmLibraryVersion,[AC_DEFINE(HAVE_LIBXPM) XPMLIB="-lXpm"],,$X_LIBS $X_PRE_LIBS $X11LIB $X_EXTRA_LIBS)
+ AC_SUBST(XPMLIB)
+ if test "$XPMLIB" != "-lXpm"; then
+ AC_MSG_ERROR(failed: I need xpm if you are building for X)
+ fi
+ fi
+
+ dnl Checks for Slang
+ AC_CHECK_LIB(slang, SLang_Version,[AC_DEFINE(HAVE_LIBSLANG) SLANGLIB="-lslang"])
+ AC_SUBST(SLANGLIB)
+
+ dnl Checks for GPM
+ AC_ARG_WITH(gpm,[ --without-gpm do not use GPM mouse support])
+ if test "$with_gpm" != "no"; then
+ AC_CHECK_LIB(gpm, Gpm_Open,[AC_DEFINE(HAVE_LIBGPM) GPMLIB="-lgpm"])
+ AC_SUBST(GPMLIB)
+ fi
fi
dnl Checks for pthread
dnl Converts the ARCH to be the same as dpkg
AC_MSG_CHECKING(system architecture)
-archset="`awk '$1 == "'$host_cpu'" { print $2 }' $srcdir/buildlib/archtable`"
+archset="`awk \"{ if(\\\$1 == \\\"$host_cpu\\\") print \\\$2 }\" $srcdir/buildlib/archtable`"
if test "x$archset" = "x"; then
AC_MSG_ERROR(failed: use --host=)
fi
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 Single Unix Spec statvfs
+AC_CHECK_FUNC(statvfs)
+AC_SUBST(HAVE_STATVFS)
+
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
+if archline="`grep \"^$archset\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`";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)
+
+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 YODL
AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
+ah_NUM_PROCS
+
AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make dirs)
projects / apt.git / blobdiff