summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2002-05-27 19:04:36 +0000
committerJP Rosevear <jpr@src.gnome.org>2002-05-27 19:04:36 +0000
commit94f2fb80706f92bf206ebc25c4b553f7ef7859e6 (patch)
treef4e8186448988d45c0b31698d27ba78c4f281f1a
parent7da5b44ed9259e47500a526c0bdc1644dc028c99 (diff)
downloadlibsoup-94f2fb80706f92bf206ebc25c4b553f7ef7859e6.tar.gz
see if we can handle the case where glib2 is not installed and we are in
2002-05-27 JP Rosevear <jpr@ximian.com> * configure.in: see if we can handle the case where glib2 is not installed and we are in maintainer mode
-rw-r--r--ChangeLog5
-rw-r--r--configure.in3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8834e64..9c1d6f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-27 JP Rosevear <jpr@ximian.com>
+
+ * configure.in: see if we can handle the case where glib2 is not
+ installed and we are in maintainer mode
+
2002-05-24 Joe Shaw <joe@ximian.com>
* src/libsoup/soup-server.c (read_headers_cb): According to RFC
diff --git a/configure.in b/configure.in
index 2e244ad4..e7652300 100644
--- a/configure.in
+++ b/configure.in
@@ -77,7 +77,8 @@ enable_glib2=no)
AC_MSG_RESULT($enable_glib2)
if test x"$enable_glib2" != xno; then
- AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([Cannot find glib 2.0]))
+ ifdef(PKG_CHECK_MODULES,PKG_CHECK_MODULES,AC_MSG_ERROR(Unable to find pkg-config))
+ ifdef(AM_PATH_GLIB_2_0,AM_PATH_GLIB_2_0(2.0.0),AC_MSG_ERROR(Unable to find glib 2.0))
GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0`
GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0`
GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`