diff options
author | Havoc Pennington <hp@redhat.com> | 2001-04-16 15:21:19 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2001-04-16 15:21:19 +0000 |
commit | 988dd884957a4334416a717d01d4c3d14eb8ceaf (patch) | |
tree | b689ff2794cbaddfe767ebcd694d842f2880f5aa | |
parent | f2faafacb9460389c2585a2d1a3d93f6a52473d2 (diff) |
put AC_PATH_PROG(pkg-config) before "Checking for glib" so the output
2001-04-16 Havoc Pennington <hp@redhat.com>
* glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for
glib" so the output looks right
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-12 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | glib-2.0.m4 | 4 | ||||
-rw-r--r-- | m4macros/glib-2.0.m4 | 4 |
10 files changed, 44 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 78d3113af..405f4f3c0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington <hp@redhat.com> + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington <hp@redhat.com> * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/glib-2.0.m4 b/glib-2.0.m4 index 59e4f3884..e22610c44 100644 --- a/glib-2.0.m4 +++ b/glib-2.0.m4 @@ -28,13 +28,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru esac done + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + min_glib_version=ifelse([$1], ,1.3.3,$1) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) no_glib="" - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - if test x$PKG_CONFIG != xno ; then if pkg-config --atleast-pkgconfig-version 0.5 ; then : diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4 index 59e4f3884..e22610c44 100644 --- a/m4macros/glib-2.0.m4 +++ b/m4macros/glib-2.0.m4 @@ -28,13 +28,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and ru esac done + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + min_glib_version=ifelse([$1], ,1.3.3,$1) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) no_glib="" - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - if test x$PKG_CONFIG != xno ; then if pkg-config --atleast-pkgconfig-version 0.5 ; then : |