X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=14cea9b79f2daad69a3d3ad6c81377a3919f9965;hb=60f6da4d2097c98e4c1a4b7e699a4200798d1d7b;hp=5e9e969413b83e26f2d54f1c95f525344ad1c96c;hpb=f802ee92ef20c58f0990a75433a694c7c66091de;p=catagits%2Ffcgi2.git diff --git a/configure.in b/configure.in index 5e9e969..14cea9b 100755 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.4 2001/08/30 22:13:01 robs Exp $ +dnl $Id: configure.in,v 1.5 2001/09/01 00:57:59 robs Exp $ dnl dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during the build @@ -17,94 +17,90 @@ if test -f "FCGI.XL"; then fi if test "$FCGI_BUILD"; then - AC_CONFIG_HEADER(fcgi_config.h) + AC_CONFIG_HEADER([fcgi_config.h]) else - AC_CONFIG_HEADER(include/fcgi_config.h) + AC_CONFIG_HEADER([include/fcgi_config.h]) fi AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_RANLIB -AC_CHECK_TOOL(AR, ar, ar) - -AC_CHECK_LIB([nsl],[main],[],[],[])ac_cv_lib_nsl=ac_cv_lib_nsl_main - -AC_CHECK_LIB([resolv],[main],[],[],[])ac_cv_lib_resolv=ac_cv_lib_resolv_main - -AC_CHECK_LIB([socket],[main],[],[],[])ac_cv_lib_socket=ac_cv_lib_socket_main - -AC_CHECK_LIB([dnet_stub],[main],[],[],[])ac_cv_lib_dnet_stub=ac_cv_lib_dnet_stub_main - -AC_CHECK_LIB([ieee],[main],[],[],[])ac_cv_lib_ieee=ac_cv_lib_ieee_main - -AC_CHECK_TYPE(ssize_t, int) - -AC_MSG_CHECKING(for sun_len in sys/un.h) -AC_EGREP_HEADER(sun_len, - sys/un.h, - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKADDR_UN_SUN_LEN), - AC_MSG_RESULT(no)) - -AC_CHECK_FUNCS(strerror) -AC_REPLACE_FUNCS(strerror) - -AC_MSG_CHECKING(for fpos in stdio.h) -AC_EGREP_HEADER(fpos_t, - stdio.h, - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_FPOS), - AC_MSG_RESULT(no)) - -AC_CHECK_HEADERS([sys/socket.h],[have_sys_socket=yes]) -AC_CHECK_HEADERS([netdb.h]) -AC_CHECK_HEADERS([netinet/in.h]) -AC_CHECK_HEADERS([arpa/inet.h]) -AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_HEADERS([limits.h]) - -if test "x$have_sys_socket" = "xyes"; then - AC_MSG_CHECKING(for socklen_t in sys/socket.h) - AC_EGREP_HEADER(socklen_t, - sys/socket.h, - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SOCKLEN), - AC_MSG_RESULT(no)) +AC_CHECK_TOOL([AR], [ar], [ar]) + +AC_CHECK_LIB([nsl], [main]) ac_cv_lib_nsl=ac_cv_lib_nsl_main +AC_CHECK_LIB([resolv], [main]) ac_cv_lib_resolv=ac_cv_lib_resolv_main +AC_CHECK_LIB([socket], [main]) ac_cv_lib_socket=ac_cv_lib_socket_main +AC_CHECK_LIB([dnet_stub], [main]) ac_cv_lib_dnet_stub=ac_cv_lib_dnet_stub_main +AC_CHECK_LIB([ieee], [main]) ac_cv_lib_ieee=ac_cv_lib_ieee_main + +AC_CHECK_LIB([pthread], [main], + [AC_DEFINE([HAVE_LIBPTHREAD], [1], + [Define if you have the pthread library]) + AC_SUBST([HAVE_LIBPTHREAD])]) +ac_cv_lib_pthread=ac_cv_lib_pthread_main + +AC_CHECK_TYPE([ssize_t], [int]) + +AC_MSG_CHECKING([for sun_len in sys/un.h]) +AC_EGREP_HEADER([sun_len], [sys/un.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SOCKADDR_UN_SUN_LEN], [1], + [Define if sockaddr_un in sys/un.h contains a sun_len component])], + AC_MSG_RESULT([no])) + +AC_REPLACE_FUNCS([strerror]) + +AC_MSG_CHECKING([for fpos_t in stdio.h]) +AC_EGREP_HEADER([fpos_t], [stdio.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_FPOS], [1], [Define if the fpos_t typedef is in stdio.h])], + AC_MSG_RESULT([no])) + +AC_CHECK_HEADERS([sys/socket.h netdb.h netinet/in.h arpa/inet.h sys/time.h limits.h sys/param.h unistd.h]) + +AC_MSG_CHECKING([for a fileno() prototype in stdio.h]) +AC_EGREP_HEADER([fileno], [stdio.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_FILENO_PROTO], [1], + [Define if there's a fileno() prototype in stdio.h])], + AC_MSG_RESULT([no])) + +if test "$HAVE_SYS_SOCKET_H"; then + AC_MSG_CHECKING([for socklen_t in sys/socket.h]) + AC_EGREP_HEADER([socklen_t], [sys/socket.h], + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_SOCKLEN], [1], + [Define if the socklen_t typedef is in sys/socket.h])], + AC_MSG_RESULT([no])) fi #-------------------------------------------------------------------- # Do we need cross-process locking on this platform? #-------------------------------------------------------------------- -AC_MSG_CHECKING("if this machine needs cross-process locking") +AC_MSG_CHECKING([whether cross-process locking is required by accept()]) case "`uname -sr`" in - IRIX\ 5.*) - AC_DEFINE(USE_LOCKING) - AC_MSG_RESULT(yes) - ;; - SunOS\ 5.*) - AC_DEFINE(USE_LOCKING) - AC_MSG_RESULT(yes) - ;; - UNIX_System_V\ 4.0) - AC_DEFINE(USE_LOCKING) - AC_MSG_RESULT(yes) - ;; + IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) + AC_MSG_RESULT([yes]) + AC_DEFINE([USE_LOCKING], [1], + [Define if cross-process locking is required by accept()]) + ;; *) - AC_MSG_RESULT(no) - ;; + AC_MSG_RESULT([no]) + ;; esac #-------------------------------------------------------------------- # Does va_arg(arg, long double) crash the compiler? # hpux 9.04 compiler does and so does Stratus FTX (uses HP's compiler) #-------------------------------------------------------------------- -AC_MSG_CHECKING(if va_arg(arg, long double) crashes the compiler) +AC_MSG_CHECKING([whether va_arg(arg, long double) crashes the compiler]) AC_TRY_COMPILE([#include ], [long double lDblArg; va_list arg; lDblArg = va_arg(arg, long double);], - AC_MSG_RESULT(no), - AC_DEFINE(HAVE_VA_ARG_LONG_DOUBLE_BUG) - AC_MSG_RESULT(yes)) + AC_MSG_RESULT([no]), + [AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_VA_ARG_LONG_DOUBLE_BUG], [1], + [Define if va_arg(arg, long double) crashes the compiler])]) AC_C_CONST AC_C_INLINE @@ -115,20 +111,20 @@ AC_C_INLINE # Windows builds don't run configure so we should be safe fixing # this to 'unix' (at least for now). #-------------------------------------------------------------------- - SYSTEM=unix -AC_SUBST(SYSTEM) +AC_SUBST([SYSTEM]) L=a -AC_SUBST(L) +AC_SUBST([L]) if test "$GCC"; then - CCDEFS="$CCDEFS -ansi -pedantic -Wall -Wmissing-prototypes" + CCDEFS="$CCDEFS -Wall -Wmissing-prototypes" fi -AC_SUBST(CCDEFS) +AC_SUBST([CCDEFS]) -AC_OBJEXT +AC_OBJEXT +AC_SUBST([EXEEXT]) if test -z "$FCGI_BUILD"; then AC_CONFIG_FILES([Makefile