From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 25 Apr 1999 22:16:44 +0000 (+0000)
Subject: Ok, apxs build works nicely now
X-Git-Tag: BEFORE_PHP4_APACHE_MODULE_CHANGE~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ffbed7d7e7c2d06cd9a841d15ca4f23cc81a473;p=php

Ok, apxs build works nicely now
---

diff --git a/Makefile.in b/Makefile.in
index fc34fc176c..504158c01d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,7 +56,7 @@ RANLIB = @RANLIB@
 YACC = @YACC@
 MAINT = @MAINT@
 APXS = @APXS@
-APXS_LDFLAGS = $(EXTRA_LIBS)
+APXS_LDFLAGS = $(EXTRA_LIBS) $(LIBS)
 WARNING_LEVEL = @WARNING_LEVEL@
 
 SOURCE = main.c internal_functions.c snprintf.c php3_sprintf.c \
diff --git a/configure.in.in b/configure.in.in
index 9c970dfbe3..c79da587f8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -182,6 +182,7 @@ 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
 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) ], [
  AC_CHECK_LIB(resolv, res_search, [
@@ -189,6 +190,7 @@ AC_CHECK_LIB(socket, res_search, [
   AC_DEFINE(HAVE_LIBRESOLV) 
  ], [
   AC_CHECK_LIB(resolv, dn_skipname)
+  AC_CHECK_LIB(resolv, __dn_skipname)
  ]) 
 ])