aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog6
-rw-r--r--macros/gnome-ghttp-check.m47
2 files changed, 10 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 74dfc3cca3..572ba694eb 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-21 Jacob Berkman <jberkman@andrew.cmu.edu>
+
+ * gnome-ghttp-check.m4: use a temp value until we know that
+ ghttp exists. This will hopefully fix building on Solaris
+ machines
+
1999-09-26 Jody Goldberg <jgoldberg@home.com>
* compiler-flags.m4 : Remove -Wpointer-arith. It generates large
diff --git a/macros/gnome-ghttp-check.m4 b/macros/gnome-ghttp-check.m4
index 1fc85783f9..7a82afc147 100644
--- a/macros/gnome-ghttp-check.m4
+++ b/macros/gnome-ghttp-check.m4
@@ -1,14 +1,15 @@
AC_DEFUN([GNOME_GHTTP_CHECK],[
AC_REQUIRE([GNOME_INIT_HOOK])
+ GHTTP_LIB_TEMP=
GHTTP_LIB=
AC_CHECK_FUNC(connect,,[
AC_CHECK_LIB(socket,connect,
- GHTTP_LIB="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
+ GHTTP_LIB_TEMP="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
AC_CHECK_FUNC(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,
- GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)])
+ GHTTP_LIB_TEMP="-lnsl $GHTTP_LIB_TEMP",,$GHTTP_LIB_TEMP)])
AC_CHECK_LIB(ghttp, ghttp_request_new,
- GHTTP_LIB="-lghttp $GHTTP_LIB",,-L$gnome_prefix $GHTTP_LIB)
+ GHTTP_LIB="-lghttp $GHTTP_LIB_TEMP",,-L$gnome_prefix $GHTTP_LIB_TEMP)
AC_SUBST(GHTTP_LIB)
AC_PROVIDE([GNOME_GHTTP_CHECK])
])