cvs: php4(PHP_4_2_0) / configure.in

derick Thu Mar 28 05:58:39 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4 configure.in Log: - Backout Makefile patch, it caused problems Index: php4/configure.in diff -u php4/configure.in:1.302.2.5 php4/configure.in:1.302.2.6 --- php4/configure.in:1.302.2.5 Thu Mar 28 02:56:35 2002 +++ php4/configure.in Thu Mar 28 05:58:39 2002 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.302.2.5 2002/03/28 07:56:35 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.302.2.6 2002/03/28 10:58:39 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -94,10 +94,7 @@ *darwin*|*rhapsody*) CPPFLAGS="$CPPFLAGS -traditional-cpp";; *bsdi*) - if test "GNU" != ${MAKE} --version | sed -n -e "s|^GNU.*|GNU|p"; then - BSD_MAKEFILE=yes - fi - ;; + BSD_MAKEFILE=yes;; *beos*) beos_threads=1 LIBS="$LIBS -lbe -lroot";; @@ -318,73 +315,30 @@ dnl Only include libbind if inet_aton is not found in dnl libresolv. -dnl As of bind9, a shared libbind requires libisc. -dnl BSDi 4.4 has inet_aton in libc. -dnl 20020327 Reworked this, to give libc precedence. - -AC_MSG_CHECKING([for native inet_aton]) -AC_TRY_LINK([ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/inet.h>], - [struct in_addr in; inet_aton(0, &in); return (0);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_INET_ATON,1,[ ]) - ], - [ - AC_MSG_RESULT(no) - AC_CHECK_LIB(resolv, inet_aton, [], [ - AC_CHECK_LIB(bind, inet_aton, [], [ - AC_CHECK_LIB(bind, __inet_aton, [ - AC_CHECK_LIB(bind, inet_aton, [ - LIBS="$LIBS -lisc"],[], -lisc) - ]) - ]) - ]) +AC_CHECK_LIB(resolv, inet_aton, [], [ + AC_CHECK_LIB(bind, inet_aton, [], [ + AC_CHECK_LIB(bind, __inet_aton) ]) ]) dnl The res_search may be in libsocket as well, and if it is dnl make sure to check for dn_skipname in libresolv, or if res_search dnl is in neither of these libs, still check for dn_skipname in libresolv -dnl There are systems (BSDi4.x) with a native res_search. Check these -dnl first, so no linking is necessary. - -AC_MSG_CHECKING([for native res_search]) -AC_TRY_LINK([ -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/nameser.h> -#include <resolv.h>], - [ -const char host[7]="php.net"; -u_char ans[1024]; -int r; -res_init(); -/* Capture result in r but return 0, since a working nameserver is - * not a requirement for compilation. - */ -r = res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans)); -return 0; -res_close(); - ], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RES_SEARCH,1,[ ])], - [AC_MSG_RESULT(no) - AC_CHECK_LIB(socket, res_search, [ - AC_CHECK_LIB(resolv, dn_skipname) - AC_CHECK_LIB(resolv, __dn_skipname) - LIBS="$LIBS -lsocket" - AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [ - AC_CHECK_LIB(resolv, res_search, [ - LIBS="$LIBS -lresolv" - AC_DEFINE(HAVE_LIBRESOLV,1,[ ]) - ], [ - AC_CHECK_LIB(resolv, dn_skipname) - AC_CHECK_LIB(resolv, __dn_skipname) - ]) -]) +AC_CHECK_LIB(socket, res_search, [ + AC_CHECK_LIB(resolv, dn_skipname) + AC_CHECK_LIB(resolv, __dn_skipname) + LIBS="$LIBS -lsocket" + AC_DEFINE(HAVE_LIBSOCKET,1,[ ]) ], [ + AC_CHECK_LIB(resolv, res_search, [ + LIBS="$LIBS -lresolv" + AC_DEFINE(HAVE_LIBRESOLV,1,[ ]) + ], [ + AC_CHECK_LIB(resolv, dn_skipname) + AC_CHECK_LIB(resolv, __dn_skipname) + ]) ]) + + dnl Then headers. dnl -------------------------------------------------------------------------