aboutsummaryrefslogtreecommitdiff
path: root/m4/gtk-2.0.m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4/gtk-2.0.m4')
-rw-r--r--m4/gtk-2.0.m420
1 files changed, 10 insertions, 10 deletions
diff --git a/m4/gtk-2.0.m4 b/m4/gtk-2.0.m4
index 3deba01be..a1059264e 100644
--- a/m4/gtk-2.0.m4
+++ b/m4/gtk-2.0.m4
@@ -2,11 +2,11 @@
2# Owen Taylor 1997-2001 2# Owen Taylor 1997-2001
3 3
4dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) 4dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
5dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 5dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
6dnl pass to pkg-config 6dnl pass to pkg-config
7dnl 7dnl
8AC_DEFUN([AM_PATH_GTK_2_0], 8AC_DEFUN([AM_PATH_GTK_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(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], 12AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest 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 gthread) 19 gthread)
20 pkg_config_args="$pkg_config_args gthread-2.0" 20 pkg_config_args="$pkg_config_args gthread-2.0"
21 ;; 21 ;;
22 esac 22 esac
@@ -79,7 +79,7 @@ dnl
79#include <stdio.h> 79#include <stdio.h>
80#include <stdlib.h> 80#include <stdlib.h>
81 81
82int 82int
83main () 83main ()
84{ 84{
85 int major, minor, micro; 85 int major, minor, micro;
@@ -98,17 +98,17 @@ main ()
98 (gtk_minor_version != $gtk_config_minor_version) || 98 (gtk_minor_version != $gtk_config_minor_version) ||
99 (gtk_micro_version != $gtk_config_micro_version)) 99 (gtk_micro_version != $gtk_config_micro_version))
100 { 100 {
101 printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 101 printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
102 $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, 102 $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
103 gtk_major_version, gtk_minor_version, gtk_micro_version); 103 gtk_major_version, gtk_minor_version, gtk_micro_version);
104 printf ("*** was found! If pkg-config was correct, then it is best\n"); 104 printf ("*** was found! If pkg-config was correct, then it is best\n");
105 printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); 105 printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
106 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 106 printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
107 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 107 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
108 printf("*** required on your system.\n"); 108 printf("*** required on your system.\n");
109 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 109 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
110 printf("*** to point to the correct configuration files\n"); 110 printf("*** to point to the correct configuration files\n");
111 } 111 }
112 else if ((gtk_major_version != GTK_MAJOR_VERSION) || 112 else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
113 (gtk_minor_version != GTK_MINOR_VERSION) || 113 (gtk_minor_version != GTK_MINOR_VERSION) ||
114 (gtk_micro_version != GTK_MICRO_VERSION)) 114 (gtk_micro_version != GTK_MICRO_VERSION))
@@ -139,7 +139,7 @@ main ()
139 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 139 printf("*** being found. The easiest way to fix this is to remove the old version\n");
140 printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); 140 printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
141 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); 141 printf("*** correct copy of pkg-config. (In this case, you will have to\n");
142 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 142 printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
143 printf("*** so that the correct libraries are found at run-time))\n"); 143 printf("*** so that the correct libraries are found at run-time))\n");
144 } 144 }
145 } 145 }
@@ -152,7 +152,7 @@ main ()
152 fi 152 fi
153 if test "x$no_gtk" = x ; then 153 if test "x$no_gtk" = x ; then
154 AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) 154 AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
155 ifelse([$2], , :, [$2]) 155 ifelse([$2], , :, [$2])
156 else 156 else
157 AC_MSG_RESULT(no) 157 AC_MSG_RESULT(no)
158 if test "$PKG_CONFIG" = "no" ; then 158 if test "$PKG_CONFIG" = "no" ; then
@@ -181,7 +181,7 @@ main ()
181 echo "*** If you have an old version installed, it is best to remove it, although" 181 echo "*** If you have an old version installed, it is best to remove it, although"
182 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], 182 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
183 [ echo "*** The test program failed to compile or link. See the file config.log for the" 183 [ echo "*** The test program failed to compile or link. See the file config.log for the"
184 echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) 184 echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
185 CFLAGS="$ac_save_CFLAGS" 185 CFLAGS="$ac_save_CFLAGS"
186 LIBS="$ac_save_LIBS" 186 LIBS="$ac_save_LIBS"
187 fi 187 fi