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)

diff --git a/ChangeLog b/ChangeLog
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
-       * 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>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 02043d4..fbd12e3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
-       * 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>
 

diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4
index b5dba4f..9945ce3 100644 (file)
--- a/m4macros/glib-2.0.m4
+++ b/m4macros/glib-2.0.m4
@@ -40,21 +40,25 @@ AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and ru
       no_glib=yes
       PKG_CONFIG=no
     fi
-  fi
-
-  ## 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
+  else
+    no_glib=yes
   fi
 
   min_glib_version=ifelse([$1], ,1.3.3,$1)
   AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
 
-  if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
-        :
-  else
-        no_glib = yes
+  if test x$PKG_CONFIG != xno ; then
+    ## 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
+
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+         :
+    else
+         no_glib=yes
+    fi
   fi
 
   if test x"$no_glib" = x ; then