diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 22 |
2 files changed, 17 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index dc6b6edddfa..81acce163c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ +Fri Feb 1 15:32:36 CET 2002 Paolo Molaro <lupus@ximian.com> + + * configure.in: allow PKG_CONFIG_PATH for the build-platform + pkg-config invocation. + Fri Feb 1 15:13:25 CET 2002 Paolo Molaro <lupus@ximian.com> * configure.in: add some support/fixes for cross-compilation. diff --git a/configure.in b/configure.in index 7b06a4bb491..70a3a1bad7a 100644 --- a/configure.in +++ b/configure.in @@ -33,6 +33,18 @@ AC_CHECK_SIZEOF(void *, 4) CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations' +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "x$PKG_CONFIG" = "xno"; then + AC_MSG_ERROR([You need to install pkg-config]) +fi + +dnl for use on the build system +dnl pkg-config is stupid +BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` +BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` +AC_SUBST(BUILD_GLIB_CFLAGS) +AC_SUBST(BUILD_GLIB_LIBS) + PKG_PATH= AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], if test x$with_crosspkgdir = "x"; then @@ -61,16 +73,6 @@ AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) -dnl for use on the build system -dnl we disable support for PKG_CONFIG_PATH -dnl pkg-config is stupid -PKG_CONFIG_PATH= -export PKG_CONFIG_PATH -BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` -BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` -AC_SUBST(BUILD_GLIB_CFLAGS) -AC_SUBST(BUILD_GLIB_LIBS) - dnl **************************************** dnl *** Check if we're building on win32 *** dnl **************************************** |