aboutsummaryrefslogtreecommitdiff
path: root/m4/glib-2.0.m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4/glib-2.0.m4')
-rw-r--r--m4/glib-2.0.m424
1 files changed, 12 insertions, 12 deletions
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
index 13a3ce68f..e8ac8522e 100644
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -2,11 +2,11 @@
2# Owen Taylor 1997-2001 2# Owen Taylor 1997-2001
3 3
4dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) 4dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
5dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 5dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
6dnl gthread is specified in MODULES, pass to pkg-config 6dnl gthread is specified in MODULES, pass to pkg-config
7dnl 7dnl
8AC_DEFUN([AM_PATH_GLIB_2_0], 8AC_DEFUN([AM_PATH_GLIB_2_0],
9[dnl 9[dnl
10dnl Get the cflags and libraries from pkg-config 10dnl Get the cflags and libraries from pkg-config
11dnl 11dnl
12AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], 12AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
@@ -16,13 +16,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
16 for module in . $4 16 for module in . $4
17 do 17 do
18 case "$module" in 18 case "$module" in
19 gmodule) 19 gmodule)
20 pkg_config_args="$pkg_config_args gmodule-2.0" 20 pkg_config_args="$pkg_config_args gmodule-2.0"
21 ;; 21 ;;
22 gobject) 22 gobject)
23 pkg_config_args="$pkg_config_args gobject-2.0" 23 pkg_config_args="$pkg_config_args gobject-2.0"
24 ;; 24 ;;
25 gthread) 25 gthread)
26 pkg_config_args="$pkg_config_args gthread-2.0" 26 pkg_config_args="$pkg_config_args gthread-2.0"
27 ;; 27 ;;
28 esac 28 esac
@@ -89,7 +89,7 @@ dnl
89#include <stdio.h> 89#include <stdio.h>
90#include <stdlib.h> 90#include <stdlib.h>
91 91
92int 92int
93main () 93main ()
94{ 94{
95 int major, minor, micro; 95 int major, minor, micro;
@@ -108,17 +108,17 @@ main ()
108 (glib_minor_version != $glib_config_minor_version) || 108 (glib_minor_version != $glib_config_minor_version) ||
109 (glib_micro_version != $glib_config_micro_version)) 109 (glib_micro_version != $glib_config_micro_version))
110 { 110 {
111 printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 111 printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
112 $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, 112 $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
113 glib_major_version, glib_minor_version, glib_micro_version); 113 glib_major_version, glib_minor_version, glib_micro_version);
114 printf ("*** was found! If pkg-config was correct, then it is best\n"); 114 printf ("*** was found! If pkg-config was correct, then it is best\n");
115 printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); 115 printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
116 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 116 printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
117 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 117 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
118 printf("*** required on your system.\n"); 118 printf("*** required on your system.\n");
119 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 119 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
120 printf("*** to point to the correct configuration files\n"); 120 printf("*** to point to the correct configuration files\n");
121 } 121 }
122 else if ((glib_major_version != GLIB_MAJOR_VERSION) || 122 else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
123 (glib_minor_version != GLIB_MINOR_VERSION) || 123 (glib_minor_version != GLIB_MINOR_VERSION) ||
124 (glib_micro_version != GLIB_MICRO_VERSION)) 124 (glib_micro_version != GLIB_MICRO_VERSION))
@@ -149,7 +149,7 @@ main ()
149 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 149 printf("*** being found. The easiest way to fix this is to remove the old version\n");
150 printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); 150 printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
151 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); 151 printf("*** correct copy of pkg-config. (In this case, you will have to\n");
152 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 152 printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
153 printf("*** so that the correct libraries are found at run-time))\n"); 153 printf("*** so that the correct libraries are found at run-time))\n");
154 } 154 }
155 } 155 }
@@ -162,7 +162,7 @@ main ()
162 fi 162 fi
163 if test "x$no_glib" = x ; then 163 if test "x$no_glib" = x ; then
164 AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) 164 AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
165 ifelse([$2], , :, [$2]) 165 ifelse([$2], , :, [$2])
166 else 166 else
167 AC_MSG_RESULT(no) 167 AC_MSG_RESULT(no)
168 if test "$PKG_CONFIG" = "no" ; then 168 if test "$PKG_CONFIG" = "no" ; then
@@ -191,7 +191,7 @@ main ()
191 echo "*** If you have an old version installed, it is best to remove it, although" 191 echo "*** If you have an old version installed, it is best to remove it, although"
192 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], 192 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
193 [ echo "*** The test program failed to compile or link. See the file config.log for the" 193 [ echo "*** The test program failed to compile or link. See the file config.log for the"
194 echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) 194 echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
195 CFLAGS="$ac_save_CFLAGS" 195 CFLAGS="$ac_save_CFLAGS"
196 LIBS="$ac_save_LIBS" 196 LIBS="$ac_save_LIBS"
197 fi 197 fi