Mercurial > pidgin.yaz
annotate acinclude.m4 @ 26853:e72df47d41fe
Escape all the values when appending them to the Entity Caps verification str.
xmlnode_get_attrib and xmlnode_get_data unescape what they return. Thanks to
Tobias and Waqas. This will still fail to validate if the other side uses
entity codes (or uses other entities unnecessarily), but that should be dealt
with as a hash failure instead of a collision.
(10:12:11) Tobias: [18:48:43] <waqas> <identity category='client' type='pc' name='SomeClient'/><feature var='http://jabber.org/protocol/muc'/> turns into 'client/pc//SomeClient<http://jabber.org/protocol/caps<'
but so does <identity category='client' type='pc' name='SomeClient<http://jabber.org/protocol/caps'/>, which is a collision, right?
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 02 May 2009 01:26:18 +0000 |
parents | 0d4a41a50168 |
children |
rev | line source |
---|---|
4563
d6491dc2b7b2
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
1 dnl Added by setup-gettext. Do not remove this |
d6491dc2b7b2
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
2 dnl unless you know what you are doing. |
3410
3fd9f8e2c463
[gaim-migrate @ 3429]
Christian Hammond <chipx86@chipx86.com>
parents:
3357
diff
changeset
|
3 AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
4563
d6491dc2b7b2
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
4 |
3661
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
5 # Configure paths for GLIB |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
6 # Owen Taylor 1997-2001 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
7 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
8 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
9 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
10 dnl gthread is specified in MODULES, pass to pkg-config |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
11 dnl |
8992 | 12 AC_DEFUN([AM_PATH_GLIB_2_0], |
3661
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
13 [dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
14 dnl Get the cflags and libraries from pkg-config |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
15 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
16 AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
17 , enable_glibtest=yes) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
18 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
19 pkg_config_args=glib-2.0 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
20 for module in . $4 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
21 do |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
22 case "$module" in |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
23 gmodule) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
24 pkg_config_args="$pkg_config_args gmodule-2.0" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
25 ;; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
26 gobject) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
27 pkg_config_args="$pkg_config_args gobject-2.0" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
28 ;; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
29 gthread) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
30 pkg_config_args="$pkg_config_args gthread-2.0" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
31 ;; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
32 esac |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
33 done |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
34 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
35 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
36 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
37 no_glib="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
38 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
39 if test x$PKG_CONFIG != xno ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
40 if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
41 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
42 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
43 echo *** pkg-config too old; version 0.7 or better required. |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
44 no_glib=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
45 PKG_CONFIG=no |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
46 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
47 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
48 no_glib=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
49 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
50 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
51 min_glib_version=ifelse([$1], ,2.0.0,$1) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
52 AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
53 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
54 if test x$PKG_CONFIG != xno ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
55 ## don't try to run the test against uninstalled libtool libs |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
56 if $PKG_CONFIG --uninstalled $pkg_config_args; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
57 echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
58 enable_glibtest=no |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
59 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
60 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
61 if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
62 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
63 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
64 no_glib=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
65 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
66 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
67 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
68 if test x"$no_glib" = x ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
69 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
70 GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
71 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
72 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
73 GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
74 GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
75 glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
76 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
77 glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
78 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
79 glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
80 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
81 if test "x$enable_glibtest" = "xyes" ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
82 ac_save_CFLAGS="$CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
83 ac_save_LIBS="$LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
84 CFLAGS="$CFLAGS $GLIB_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
85 LIBS="$GLIB_LIBS $LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
86 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
87 dnl Now check if the installed GLIB is sufficiently new. (Also sanity |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
88 dnl checks the results of pkg-config to some extent) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
89 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
90 rm -f conf.glibtest |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
91 AC_TRY_RUN([ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
92 #include <glib.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
93 #include <stdio.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
94 #include <stdlib.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
95 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
96 int |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
97 main () |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
98 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
99 int major, minor, micro; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
100 char *tmp_version; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
101 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
102 system ("touch conf.glibtest"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
103 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
104 /* HP/UX 9 (%@#!) writes to sscanf strings */ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
105 tmp_version = g_strdup("$min_glib_version"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
106 if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
107 printf("%s, bad version string\n", "$min_glib_version"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
108 exit(1); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
109 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
110 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
111 if ((glib_major_version != $glib_config_major_version) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
112 (glib_minor_version != $glib_config_minor_version) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
113 (glib_micro_version != $glib_config_micro_version)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
114 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
115 printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
116 $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
117 glib_major_version, glib_minor_version, glib_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
118 printf ("*** was found! If pkg-config was correct, then it is best\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
119 printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
120 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
121 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
122 printf("*** required on your system.\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
123 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
124 printf("*** to point to the correct configuration files\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
125 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
126 else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
127 (glib_minor_version != GLIB_MINOR_VERSION) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
128 (glib_micro_version != GLIB_MICRO_VERSION)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
129 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
130 printf("*** GLIB header files (version %d.%d.%d) do not match\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
131 GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
132 printf("*** library (version %d.%d.%d)\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
133 glib_major_version, glib_minor_version, glib_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
134 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
135 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
136 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
137 if ((glib_major_version > major) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
138 ((glib_major_version == major) && (glib_minor_version > minor)) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
139 ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
140 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
141 return 0; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
142 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
143 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
144 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
145 printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
146 glib_major_version, glib_minor_version, glib_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
147 printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
148 major, minor, micro); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
149 printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
150 printf("***\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
151 printf("*** If you have already installed a sufficiently new version, this error\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
152 printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
153 printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
154 printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
155 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
156 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
157 printf("*** so that the correct libraries are found at run-time))\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
158 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
159 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
160 return 1; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
161 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
162 ],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
163 CFLAGS="$ac_save_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
164 LIBS="$ac_save_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
165 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
166 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
167 if test "x$no_glib" = x ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
168 AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
169 ifelse([$2], , :, [$2]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
170 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
171 AC_MSG_RESULT(no) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
172 if test "$PKG_CONFIG" = "no" ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
173 echo "*** A new enough version of pkg-config was not found." |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
174 echo "*** See http://www.freedesktop.org/software/pkgconfig/" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
175 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
176 if test -f conf.glibtest ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
177 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
178 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
179 echo "*** Could not run GLIB test program, checking why..." |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
180 ac_save_CFLAGS="$CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
181 ac_save_LIBS="$LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
182 CFLAGS="$CFLAGS $GLIB_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
183 LIBS="$LIBS $GLIB_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
184 AC_TRY_LINK([ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
185 #include <glib.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
186 #include <stdio.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
187 ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
188 [ echo "*** The test program compiled, but did not run. This usually means" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
189 echo "*** that the run-time linker is not finding GLIB or finding the wrong" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
190 echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
191 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
192 echo "*** to the installed location Also, make sure you have run ldconfig if that" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
193 echo "*** is required on your system" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
194 echo "***" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
195 echo "*** If you have an old version installed, it is best to remove it, although" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
196 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
197 [ echo "*** The test program failed to compile or link. See the file config.log for the" |
10453 | 198 echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."]) |
3661
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
199 CFLAGS="$ac_save_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
200 LIBS="$ac_save_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
201 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
202 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
203 GLIB_CFLAGS="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
204 GLIB_LIBS="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
205 GLIB_GENMARSHAL="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
206 GOBJECT_QUERY="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
207 GLIB_MKENUMS="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
208 ifelse([$3], , :, [$3]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
209 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
210 AC_SUBST(GLIB_CFLAGS) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
211 AC_SUBST(GLIB_LIBS) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
212 AC_SUBST(GLIB_GENMARSHAL) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
213 AC_SUBST(GOBJECT_QUERY) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
214 AC_SUBST(GLIB_MKENUMS) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
215 rm -f conf.glibtest |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
216 ]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
217 # Configure paths for GTK+ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
218 # Owen Taylor 1997-2001 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
219 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
220 dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
221 dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
222 dnl pass to pkg-config |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
223 dnl |
8992 | 224 AC_DEFUN([AM_PATH_GTK_2_0], |
3661
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
225 [dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
226 dnl Get the cflags and libraries from pkg-config |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
227 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
228 AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
229 , enable_gtktest=yes) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
230 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
231 pkg_config_args=gtk+-2.0 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
232 for module in . $4 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
233 do |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
234 case "$module" in |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
235 gthread) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
236 pkg_config_args="$pkg_config_args gthread-2.0" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
237 ;; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
238 esac |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
239 done |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
240 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
241 no_gtk="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
242 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
243 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
244 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
245 if test x$PKG_CONFIG != xno ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
246 if pkg-config --atleast-pkgconfig-version 0.7 ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
247 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
248 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
249 echo *** pkg-config too old; version 0.7 or better required. |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
250 no_gtk=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
251 PKG_CONFIG=no |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
252 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
253 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
254 no_gtk=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
255 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
256 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
257 min_gtk_version=ifelse([$1], ,2.0.0,$1) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
258 AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
259 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
260 if test x$PKG_CONFIG != xno ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
261 ## don't try to run the test against uninstalled libtool libs |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
262 if $PKG_CONFIG --uninstalled $pkg_config_args; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
263 echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
264 enable_gtktest=no |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
265 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
266 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
267 if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
268 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
269 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
270 no_gtk=yes |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
271 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
272 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
273 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
274 if test x"$no_gtk" = x ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
275 GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
276 GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
277 gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
278 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
279 gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
280 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
281 gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
282 sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
283 if test "x$enable_gtktest" = "xyes" ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
284 ac_save_CFLAGS="$CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
285 ac_save_LIBS="$LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
286 CFLAGS="$CFLAGS $GTK_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
287 LIBS="$GTK_LIBS $LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
288 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
289 dnl Now check if the installed GTK+ is sufficiently new. (Also sanity |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
290 dnl checks the results of pkg-config to some extent) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
291 dnl |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
292 rm -f conf.gtktest |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
293 AC_TRY_RUN([ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
294 #include <gtk/gtk.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
295 #include <stdio.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
296 #include <stdlib.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
297 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
298 int |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
299 main () |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
300 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
301 int major, minor, micro; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
302 char *tmp_version; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
303 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
304 system ("touch conf.gtktest"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
305 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
306 /* HP/UX 9 (%@#!) writes to sscanf strings */ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
307 tmp_version = g_strdup("$min_gtk_version"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
308 if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
309 printf("%s, bad version string\n", "$min_gtk_version"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
310 exit(1); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
311 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
312 |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
313 if ((gtk_major_version != $gtk_config_major_version) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
314 (gtk_minor_version != $gtk_config_minor_version) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
315 (gtk_micro_version != $gtk_config_micro_version)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
316 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
317 printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
318 $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
319 gtk_major_version, gtk_minor_version, gtk_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
320 printf ("*** was found! If pkg-config was correct, then it is best\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
321 printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
322 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
323 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
324 printf("*** required on your system.\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
325 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
326 printf("*** to point to the correct configuration files\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
327 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
328 else if ((gtk_major_version != GTK_MAJOR_VERSION) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
329 (gtk_minor_version != GTK_MINOR_VERSION) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
330 (gtk_micro_version != GTK_MICRO_VERSION)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
331 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
332 printf("*** GTK+ header files (version %d.%d.%d) do not match\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
333 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
334 printf("*** library (version %d.%d.%d)\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
335 gtk_major_version, gtk_minor_version, gtk_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
336 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
337 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
338 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
339 if ((gtk_major_version > major) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
340 ((gtk_major_version == major) && (gtk_minor_version > minor)) || |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
341 ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
342 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
343 return 0; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
344 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
345 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
346 { |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
347 printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
348 gtk_major_version, gtk_minor_version, gtk_micro_version); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
349 printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
350 major, minor, micro); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
351 printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
352 printf("***\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
353 printf("*** If you have already installed a sufficiently new version, this error\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
354 printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
355 printf("*** being found. The easiest way to fix this is to remove the old version\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
356 printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
357 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
358 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
359 printf("*** so that the correct libraries are found at run-time))\n"); |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
360 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
361 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
362 return 1; |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
363 } |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
364 ],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
365 CFLAGS="$ac_save_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
366 LIBS="$ac_save_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
367 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
368 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
369 if test "x$no_gtk" = x ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
370 AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
371 ifelse([$2], , :, [$2]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
372 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
373 AC_MSG_RESULT(no) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
374 if test "$PKG_CONFIG" = "no" ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
375 echo "*** A new enough version of pkg-config was not found." |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
376 echo "*** See http://pkgconfig.sourceforge.net" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
377 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
378 if test -f conf.gtktest ; then |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
379 : |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
380 else |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
381 echo "*** Could not run GTK+ test program, checking why..." |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
382 ac_save_CFLAGS="$CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
383 ac_save_LIBS="$LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
384 CFLAGS="$CFLAGS $GTK_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
385 LIBS="$LIBS $GTK_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
386 AC_TRY_LINK([ |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
387 #include <gtk/gtk.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
388 #include <stdio.h> |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
389 ], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
390 [ echo "*** The test program compiled, but did not run. This usually means" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
391 echo "*** that the run-time linker is not finding GTK+ or finding the wrong" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
392 echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
393 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
394 echo "*** to the installed location Also, make sure you have run ldconfig if that" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
395 echo "*** is required on your system" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
396 echo "***" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
397 echo "*** If you have an old version installed, it is best to remove it, although" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
398 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
399 [ echo "*** The test program failed to compile or link. See the file config.log for the" |
10453 | 400 echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."]) |
3661
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
401 CFLAGS="$ac_save_CFLAGS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
402 LIBS="$ac_save_LIBS" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
403 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
404 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
405 GTK_CFLAGS="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
406 GTK_LIBS="" |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
407 ifelse([$3], , :, [$3]) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
408 fi |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
409 AC_SUBST(GTK_CFLAGS) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
410 AC_SUBST(GTK_LIBS) |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
411 rm -f conf.gtktest |
de4c62f656ee
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
412 ]) |
4561 | 413 |
4564 | 414 dnl ac_var_timeszone_externals.m4 |
415 | |
416 # Define 'timezone', 'altzone' and 'daylight' | |
417 # http://www.gnu.org/software/ac-archive/Miscellaneous/ac_var_timezone_externals.html | |
418 # Use instead of 'AC_STRUCT_TIMEZONE' to determine whether the | |
419 # the external timezone variables 'timezone', 'altzone' and 'daylight' exist, | |
420 # defining 'HAVE_TIMEZONE', 'HAVE_ALTZONE' and 'HAVE_DAYLIGHT' respectively | |
421 # (as well as gaining the macros defined by 'AC_STRUCT_TIMEZONE'). | |
422 # Mark R.Bannister <markb@freedomware.co.uk> | |
423 AC_DEFUN([AC_VAR_TIMEZONE_EXTERNALS], | |
424 [ AC_REQUIRE([AC_STRUCT_TIMEZONE])dnl | |
425 AC_CACHE_CHECK(for timezone external, mb_cv_var_timezone, | |
426 [ AC_TRY_LINK([#include <time.h>], [return (int)timezone;], | |
427 mb_cv_var_timezone=yes, | |
428 mb_cv_var_timezone=no) | |
429 ]) | |
430 AC_CACHE_CHECK(for altzone external, mb_cv_var_altzone, | |
431 [ AC_TRY_LINK([#include <time.h>], [return (int)altzone;], | |
432 mb_cv_var_altzone=yes, | |
433 mb_cv_var_altzone=no) | |
434 ]) | |
435 AC_CACHE_CHECK(for daylight external, mb_cv_var_daylight, | |
436 [ AC_TRY_LINK([#include <time.h>], [return (int)daylight;], | |
437 mb_cv_var_daylight=yes, | |
438 mb_cv_var_daylight=no) | |
439 ]) | |
440 if test $mb_cv_var_timezone = yes; then | |
441 AC_DEFINE([HAVE_TIMEZONE], 1, | |
442 [Define if you have the external 'timezone' variable.]) | |
443 fi | |
444 if test $mb_cv_var_altzone = yes; then | |
445 AC_DEFINE([HAVE_ALTZONE], 1, | |
446 [Define if you have the external 'altzone' variable.]) | |
447 fi | |
448 if test $mb_cv_var_daylight = yes; then | |
449 AC_DEFINE([HAVE_DAYLIGHT], 1, | |
450 [Define if you have the external 'daylight' variable.]) | |
451 fi | |
452 ]) | |
7201
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
453 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
454 dnl Available from the GNU Autoconf Macro Archive at: |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
455 dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_prog_perl_modules.html |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
456 dnl |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
457 AC_DEFUN([AC_PROG_PERL_MODULES],[dnl |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
458 ac_perl_modules="$1" |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
459 # Make sure we have perl |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
460 if test -z "$PERL"; then |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
461 AC_CHECK_PROG(PERL,perl,perl) |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
462 fi |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
463 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
464 if test "x$PERL" != x; then |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
465 ac_perl_modules_failed=0 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
466 for ac_perl_module in $ac_perl_modules; do |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
467 AC_MSG_CHECKING(for perl module $ac_perl_module) |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
468 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
469 # Would be nice to log result here, but can't rely on autoconf internals |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
470 $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
471 if test $? -ne 0; then |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
472 AC_MSG_RESULT(no); |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
473 ac_perl_modules_failed=1 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
474 else |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
475 AC_MSG_RESULT(ok); |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
476 fi |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
477 done |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
478 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
479 # Run optional shell commands |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
480 if test "$ac_perl_modules_failed" = 0; then |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
481 : |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
482 $2 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
483 else |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
484 : |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
485 $3 |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
486 fi |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
487 else |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
488 AC_MSG_WARN(could not find perl) |
35f92559a4a1
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
489 fi])dnl |
10245 | 490 |
491 | |
14520
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
492 dnl AM_GCONF_SOURCE_2 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
493 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
494 dnl (i.e. pass to gconftool-2 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
495 dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
496 dnl you should install foo.schemas files |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
497 dnl |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
498 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
499 AC_DEFUN([AM_GCONF_SOURCE_2], |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
500 [ |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
501 if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
502 GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
503 else |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
504 GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
505 fi |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
506 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
507 AC_ARG_WITH(gconf-source, |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
508 [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
509 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
510 AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
511 AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
512 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
513 if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
514 GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
515 fi |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
516 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
517 AC_ARG_WITH(gconf-schema-file-dir, |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
518 [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
519 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
520 AC_SUBST(GCONF_SCHEMA_FILE_DIR) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
521 AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
522 |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
523 AC_ARG_ENABLE(schemas-install, |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
524 [ --disable-schemas-install Disable the schemas installation], |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
525 [case ${enableval} in |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
526 yes|no) ;; |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
527 *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
528 esac]) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
529 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) |
82b59abcaee4
[gaim-migrate @ 17240]
Richard Laager <rlaager@wiktel.com>
parents:
10453
diff
changeset
|
530 ]) |