X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/67a51bcc96e3e09528ce0b5841f93f511ed1e44f..f8081133c528e8c91b533b4fab6f56ae42d51ecb:/configure.in diff --git a/configure.in b/configure.in index 1525e961b..0dc5083a0 100644 --- a/configure.in +++ b/configure.in @@ -14,113 +14,150 @@ dnl configure.in correctly and can be run at any time AC_INIT(configure.in) AC_CONFIG_AUX_DIR(buildlib) -AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in) +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.3.12.1") +AC_DEFINE_UNQUOTED(VERSION,"0.5.0") AC_DEFINE_UNQUOTED(PACKAGE,"apt") -dnl Tom's host stuff -tl_CHECK_TOOL_PREFIX dnl Initial guess +dnl Check the archs, we want the target type. +AC_CANONICAL_SYSTEM 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 - 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) -fi - -dnl Checks for pthread -#AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) +AC_PROG_CXX +AC_PROG_CPP +AC_PROG_RANLIB +AC_CHECK_TOOL(AR,ar,"ar") + +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 Checks for pthread -- disabled due to glibc bugs jgg +dnl 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 - -dnl Converts the ARCH to be the same as dpkg +dnl if test "$PTHREADLIB" != "-lpthread"; then +dnl AC_MSG_ERROR(failed: I need posix threads, pthread) +dnl fi + +dnl Check for DB2 +AC_CHECK_HEADER(db2/db.h, + [AC_CHECK_LIB(db2,db_open, + [AC_DEFINE(HAVE_DB2) DB2LIB="-ldb2"])]) +AC_SUBST(DB2LIB) + +dnl Converts the ARCH to be something singular for this general CPU family +dnl This is often the dpkg architecture string. AC_MSG_CHECKING(system architecture) -archset="`awk '$1 == "'$host_cpu'" { print $2 }' $srcdir/buildlib/archtable`" +archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $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") +AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") + +dnl Get a common name for the host OS - this is primarily only for HURD and is +dnl non fatal if it fails +AC_MSG_CHECKING(system OS) +osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" +AC_MSG_RESULT($osset) +AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") -dnl We use C9x types if at all possible -AC_CACHE_CHECK([for C9x integer types],c9x_ints,[ +dnl We use C99 types if at all possible +AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ AC_TRY_COMPILE([#include ], - [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;uint64_t Foo], + [uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;], 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 +dnl Single Unix Spec statvfs +AC_CHECK_FUNC(statvfs,[HAVE_STATVFS=yes]) +AC_SUBST(HAVE_STATVFS) + +dnl Arg, linux and bsd put their statfs function in different places +if test x"$HAVE_STATVFS" != x"yes"; then + AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ + AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) + ]) +fi - if test "$cross_compiling" = "yes" -a "$archline" = ""; then - AC_MSG_ERROR(When cross compiling, architecture must be present in sizetable) +dnl Check the sizes etc. of the architecture +dnl This is stupid, it should just use the AC macros like it does below +dnl Cross compilers can either get a real C library or preload the cache +dnl with their size values. +changequote(,) +archline="`awk \" ! /^#|^\\\$/ {if (match(\\\"$archset\\\",\\\$1)) {print; exit}}\" $srcdir/buildlib/sizetable | cut -f 2- -d ' '`" +if test "x$archline" != "x"; then + changequote([,]) + set $archline + if test "$1" = "little"; then + ac_cv_c_bigendian=no + else + ac_cv_c_bigendian=yes fi - AC_C_BIGENDIAN + size_char=$2 + size_int=$3 + size_short=$4 + size_long=$5 +fi + +dnl I wonder what AC_C_BIGENDIAN does if you cross compile... +dnl This is probably bogus, as above we only care if we have to build our own +dnl C9x types. +if test "$cross_compiling" = "yes" -a "x$archline" = "x"; 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 HP-UX sux.. +AC_MSG_CHECKING(for missing socklen_t) +AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ + AC_DEFINE(NEED_SOCKLEN_T_DEFINE) + NEED_SOCKLEN_T_DEFINE=yes + AC_MSG_RESULT(missing.)]) +AC_SUBST(NEED_SOCKLEN_T_DEFINE) + +dnl HP-UX needs -d_XOPEN_SOURCE_EXTENDED for h_errno +AC_MSG_CHECKING(for h_errno) +AC_EGREP_HEADER(h_errno, netdb.h, [AC_MSG_RESULT(normal)], + [CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" + AC_EGREP_HEADER(h_errno, netdb.h, + [AC_MSG_RESULT(needs _XOPEN_SOURCE_EXTENDED)], + [AC_MSG_ERROR("not found.")]) + ]) + dnl Check for debiandoc -AC_CHECK_PROG(DEBIANDOC_HTML,debiandoc2html,"yes","") -AC_CHECK_PROG(DEBIANDOC_TEXT,debiandoc2text,"yes","") +AC_PATH_PROG(DEBIANDOC_HTML,debiandoc2html) +AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text) + +dnl Check for the SGML tools needed to build man pages +AC_PATH_PROG(NSGMLS,nsgmls) +AC_PATH_PROG(SGMLSPL,sgmlspl) dnl Check for YODL -AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","") +dnl 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 +ah_NUM_PROCS + +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)