diff options
| author | Joe Shaw <joe@ximian.com> | 2002-05-31 18:41:27 +0000 |
|---|---|---|
| committer | Joe Shaw <joeshaw@src.gnome.org> | 2002-05-31 18:41:27 +0000 |
| commit | ed21953cb6ef08a32026a22b184efa7cc1fa0067 (patch) | |
| tree | ab24c5ae3a89275be2fa2d41f5b13429a3b19615 | |
| parent | 94f2fb80706f92bf206ebc25c4b553f7ef7859e6 (diff) | |
| download | libsoup-ed21953cb6ef08a32026a22b184efa7cc1fa0067.tar.gz | |
Added. Includes the pkg-config, glib1 and glib2 macros so it can be disted
2002-05-31 Joe Shaw <joe@ximian.com>
* acinclude.m4: Added. Includes the pkg-config, glib1 and glib2
macros so it can be disted on a machine without devel packages
from both installed.
* configure.in: Remove JP's commit, as it shouldn't be necessary
anymore.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2002-05-31 Joe Shaw <joe@ximian.com> + + * acinclude.m4: Added. Includes the pkg-config, glib1 and glib2 + macros so it can be disted on a machine without devel packages + from both installed. + + * configure.in: Remove JP's commit, as it shouldn't be necessary + anymore. + 2002-05-27 JP Rosevear <jpr@ximian.com> * configure.in: see if we can handle the case where glib2 is not diff --git a/configure.in b/configure.in index e7652300..2e244ad4 100644 --- a/configure.in +++ b/configure.in @@ -77,8 +77,7 @@ enable_glib2=no) AC_MSG_RESULT($enable_glib2) if test x"$enable_glib2" != xno; then - 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)) + AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([Cannot 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` |