Don't try to use PKG_CONFIG when we didn't find it. (#62944, Eric Lemings)

Mon Oct 29 11:29:37 2001  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
        when we didn't find it. (#62944, Eric Lemings)

        * m4macros/glib-2.0.m4: Fix problem with spaces around =
        sign in assignment. (#63209, Arkadiusz Miskiewicz)
This commit is contained in:
Owen Taylor 2001-10-29 16:48:40 +00:00 committed by Owen Taylor
parent 404bb824c9
commit 227ae2a96c
9 changed files with 94 additions and 18 deletions

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -1,6 +1,15 @@
Mon Oct 29 11:29:37 2001 Owen Taylor <otaylor@redhat.com>
* m4macros/glib-2.0.m4: Don't try to use PKG_CONFIG
when we didn't find it. (#62944, Eric Lemings)
* m4macros/glib-2.0.m4: Fix problem with spaces around =
sign in assignment. (#63209, Arkadiusz Miskiewicz)
Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:59:36 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add gobject/glib-mkenums to AC_OUTPUT. * configure.in: Check for path to Perl, add gobject/glib-mkenums
to AC_OUTPUT. (#63093, Dan Winship)
Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com> Mon Oct 29 10:55:12 2001 Owen Taylor <otaylor@redhat.com>

View File

@ -40,21 +40,25 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru
no_glib=yes no_glib=yes
PKG_CONFIG=no PKG_CONFIG=no
fi fi
fi else
no_glib=yes
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
enable_glibtest=no
fi fi
min_glib_version=ifelse([$1], ,1.3.3,$1) min_glib_version=ifelse([$1], ,1.3.3,$1)
AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then if test x$PKG_CONFIG != xno ; then
: ## don't try to run the test against uninstalled libtool libs
else if $PKG_CONFIG --uninstalled $pkg_config_args; then
no_glib = yes echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
enable_glibtest=no
fi
if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
:
else
no_glib=yes
fi
fi fi
if test x"$no_glib" = x ; then if test x"$no_glib" = x ; then