From 4a4d6d94914a15996a51c1bc3edc504c0fc0e33e Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 11 Apr 2001 15:45:12 +0000 Subject: [PATCH] Pass pkg-config options before the other args so it works even if 2001-04-11 Alexander Larsson * gtk-2.0.m4: Pass pkg-config options before the other args so it works even if POSIXLY_CORRECT is set. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk-2.0.m4 | 10 +++++----- m4macros/gtk-2.0.m4 | 10 +++++----- 9 files changed, 52 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 353fdc14f..ef8a85ae2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-04-11 Alexander Larsson + + * gtk-2.0.m4: Pass pkg-config options + before the other args so it works even if + POSIXLY_CORRECT is set. + Mon Apr 9 19:02:07 2001 Tim Janik * configure.in (GTK_MICRO_VERSION): increment version to 1.3.4 (binary diff --git a/gtk-2.0.m4 b/gtk-2.0.m4 index b3763444d..54c57e688 100644 --- a/gtk-2.0.m4 +++ b/gtk-2.0.m4 @@ -40,13 +40,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru fi if test x"$no_glib" = x ; then - GLIB_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GLIB_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - glib_config_major_version=`$PKG_CONFIG glib-2.0 --modversion | \ + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG glib-2.0 --modversion | \ + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG glib-2.0 --modversion | \ + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_glibtest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" diff --git a/m4macros/gtk-2.0.m4 b/m4macros/gtk-2.0.m4 index b3763444d..54c57e688 100644 --- a/m4macros/gtk-2.0.m4 +++ b/m4macros/gtk-2.0.m4 @@ -40,13 +40,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru fi if test x"$no_glib" = x ; then - GLIB_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GLIB_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - glib_config_major_version=`$PKG_CONFIG glib-2.0 --modversion | \ + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG glib-2.0 --modversion | \ + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG glib-2.0 --modversion | \ + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_glibtest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" -- 2.43.2