aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog4
-rw-r--r--macros/gnome-ghttp-check.m412
2 files changed, 13 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index b4d963a336..6f90694611 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,7 @@
+1998-09-24 Raja R Harinath <harinath@cs.umn.edu>
+
+ * gnome-ghttp-check.m4: Add checks for -lsocket -lnsl.
+
1998-09-18 Raja R Harinath <harinath@cs.umn.edu>
* gnome-support.m4: Remove commented out code.
diff --git a/macros/gnome-ghttp-check.m4 b/macros/gnome-ghttp-check.m4
index 230c20a1bf..1fc85783f9 100644
--- a/macros/gnome-ghttp-check.m4
+++ b/macros/gnome-ghttp-check.m4
@@ -1,8 +1,14 @@
AC_DEFUN([GNOME_GHTTP_CHECK],[
- GHTTP_LIB=""
AC_REQUIRE([GNOME_INIT_HOOK])
- AC_CHECK_LIB(ghttp, ghttp_request_new, GHTTP_LIB="-lghttp",
- ,-L$gnome_prefix)
+ GHTTP_LIB=
+ AC_CHECK_FUNC(connect,,[
+ AC_CHECK_LIB(socket,connect,
+ GHTTP_LIB="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
+ AC_CHECK_FUNC(gethostbyname,,[
+ AC_CHECK_LIB(nsl,gethostbyname,
+ GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)])
+ AC_CHECK_LIB(ghttp, ghttp_request_new,
+ GHTTP_LIB="-lghttp $GHTTP_LIB",,-L$gnome_prefix $GHTTP_LIB)
AC_SUBST(GHTTP_LIB)
AC_PROVIDE([GNOME_GHTTP_CHECK])
])