From: Havoc Pennington Date: Mon, 16 Apr 2001 15:21:19 +0000 (+0000) Subject: put AC_PATH_PROG(pkg-config) before "Checking for glib" so the output X-Git-Tag: GLIB_1_3_3~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=988dd884957a4334416a717d01d4c3d14eb8ceaf;p=platform%2Fupstream%2Fglib.git put AC_PATH_PROG(pkg-config) before "Checking for glib" so the output 2001-04-16 Havoc Pennington * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for glib" so the output looks right --- diff --git a/ChangeLog b/ChangeLog index 78d3113..405f4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 78d3113..405f4f3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-04-16 Havoc Pennington + + * glib-2.0.m4: put AC_PATH_PROG(pkg-config) before "Checking for + glib" so the output looks right + 2001-03-23 Havoc Pennington * gutils.c (g_parse_debug_string): make GDebugKeys argument diff --git a/glib-2.0.m4 b/glib-2.0.m4 index 59e4f38..e22610c 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 59e4f38..e22610c 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 :