Fri, 23 Dec 2005 19:26:04 +0000
[gaim-migrate @ 14983]
SF Patch #1314512 from Sadrul (who has a patch for everything)
"This patch introduces a flag for protocol plugins that
support offline messages (like Y!M and ICQ). This was
encouraged by the following conversation:
<sadrul> should offline buddies be listed/enabled in
the send-to menu?
<rekkanoryo> i would think only for protocols that
support offline messaging, if it's indicated that the
buddy is offline
-- <snip> --
<Bleeter> sadrul: personally, I'd like to see a
'supports offline' flag of some description
<Bleeter> one could then redirect (via plugins) through
email or alternative methods
<Bleeter> just a thought
<Paco-Paco> yeah, that sounds like a reasonble thing to have
This patch uses this flag to disable the buddies in the
send-to menu who are offline and the protocol doesn't
support offline messages."
I made this make the label insensitive instead of the whole menuitem. This
should address SimGuy's concerns about inconsistency (i.e. you could create a
conversation with someone via the buddy list that you couldn't create via the
Send To menu). I also hacked up some voodoo to show the label as sensitive when
moused-over, as that looks better (given the label-insensitive thing is itself a
hack). I think this works quite well.
BUG NOTE:
This makes more obvious an existing bug. The Send To menu isn't updated when
buddies sign on or off or change status (at least under some circumstances).
We need to fix that anyway, so I'm not going to let it hold up this commit.
Switching tabs will clear it up. I'm thinking we just might want to build the
contents of that menu when it is selected. That would save us a mess of
inefficient signal callbacks that update the Send To menus in open windows all
the time.
AIM NOTE:
This assumes that AIM can't offline message. That's not strictly true. You can
message invisible users on AIM. However, by design, we can't tell when a user
is invisible without resorting to dirty hackery. In practice, this isn't a
problem, as you can still select the AIM user from the menu. And really, how
often will you be choosing the Invisible contact, rather than the user going
Invisible in the middle of a conversation or IMing you while they're Invisible?
JABBER NOTE:
This assumes that Jabber can always offline message. This isn't strictly true.
Sadrul said:
I have updated Jabber according to this link which seems to
talk about how to determine the existence offline-message
support in a server:
http://www.jabber.org/jeps/jep-0013.html#discover
However, jabber.org doesn't seem to send the required
info. So I am not sure about it.
He later said:
I talked to Nathan and he said offline message support is
mostly assumed for most jabber servers. GTalk doesn't yet
support it, but they are working on it. So I have made
jabber to always return TRUE.
If there is truly no way to detect offline messaging capability, then this is
an acceptable solution. We could special case Google Talk because of its
popularity, and remove that later. It's probably not worth it though.
MSN NOTE:
This assumes that MSN can never offline message. That's effectively true, but
to be technically correct, MSN can offline message if there's already a
switchboard conversation open with a user. We could write an offline_message
function in the MSN prpl to detect that, but it'd be of limited usefulness,
especially given that under most circumstances (where this might matter), the
switchboard connection will be closed almost immediately.
CVS NOTE:
I'm writing to share a tragic little story.
I have a PC that I use for Gaim development. One day, I was writing a commit
message on it, when all of a suddent it went berserk. The screen started
flashing, and the whole commit message just disappeared. All of it. And it was
a good commit message! I had to cram and rewrite it really quickly. Needless to
say, my rushed commit message wasn't nearly as good, and I blame the PC for that.
Seriously, though, what kind of version control system loses your commit
message on a broken connection to the server? Stupid!
committer: Richard Laager <rlaager@pidgin.im>
|
4563
c224db84797b
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
1 | dnl Added by setup-gettext. Do not remove this |
|
c224db84797b
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
2 | dnl unless you know what you are doing. |
|
3410
f89a6dc23411
[gaim-migrate @ 3429]
Christian Hammond <chipx86@chipx86.com>
parents:
3357
diff
changeset
|
3 | AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
|
4563
c224db84797b
[gaim-migrate @ 4844]
Christian Hammond <chipx86@chipx86.com>
parents:
4561
diff
changeset
|
4 | |
|
3661
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
5 | # Configure paths for GLIB |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
6 | # Owen Taylor 1997-2001 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
7 | |
|
8132e5232391
[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]]]]) |
|
8132e5232391
[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 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
10 | dnl gthread is specified in MODULES, pass to pkg-config |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
11 | dnl |
| 8992 | 12 | AC_DEFUN([AM_PATH_GLIB_2_0], |
|
3661
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
13 | [dnl |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
14 | dnl Get the cflags and libraries from pkg-config |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
15 | dnl |
|
8132e5232391
[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], |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
17 | , enable_glibtest=yes) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
18 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
19 | pkg_config_args=glib-2.0 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
20 | for module in . $4 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
21 | do |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
22 | case "$module" in |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
23 | gmodule) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
24 | pkg_config_args="$pkg_config_args gmodule-2.0" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
25 | ;; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
26 | gobject) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
27 | pkg_config_args="$pkg_config_args gobject-2.0" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
28 | ;; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
29 | gthread) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
30 | pkg_config_args="$pkg_config_args gthread-2.0" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
31 | ;; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
32 | esac |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
33 | done |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
34 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
35 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
36 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
37 | no_glib="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
38 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
39 | if test x$PKG_CONFIG != xno ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
40 | if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
41 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
42 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
43 | echo *** pkg-config too old; version 0.7 or better required. |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
44 | no_glib=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
45 | PKG_CONFIG=no |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
46 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
47 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
48 | no_glib=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
49 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
50 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
51 | min_glib_version=ifelse([$1], ,2.0.0,$1) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
52 | AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
53 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
54 | if test x$PKG_CONFIG != xno ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
55 | ## don't try to run the test against uninstalled libtool libs |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
56 | if $PKG_CONFIG --uninstalled $pkg_config_args; then |
|
8132e5232391
[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" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
58 | enable_glibtest=no |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
59 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
60 | |
|
8132e5232391
[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 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
62 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
63 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
64 | no_glib=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
65 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
66 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
67 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
68 | if test x"$no_glib" = x ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
69 | GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
70 | GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
71 | GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
72 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
73 | GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
74 | GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
75 | glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
76 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
77 | glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
78 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
79 | glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
80 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
81 | if test "x$enable_glibtest" = "xyes" ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
82 | ac_save_CFLAGS="$CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
83 | ac_save_LIBS="$LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
84 | CFLAGS="$CFLAGS $GLIB_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
85 | LIBS="$GLIB_LIBS $LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
86 | dnl |
|
8132e5232391
[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 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
88 | dnl checks the results of pkg-config to some extent) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
89 | dnl |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
90 | rm -f conf.glibtest |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
91 | AC_TRY_RUN([ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
92 | #include <glib.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
93 | #include <stdio.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
94 | #include <stdlib.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
95 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
96 | int |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
97 | main () |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
98 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
99 | int major, minor, micro; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
100 | char *tmp_version; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
101 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
102 | system ("touch conf.glibtest"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
103 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
104 | /* HP/UX 9 (%@#!) writes to sscanf strings */ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
105 | tmp_version = g_strdup("$min_glib_version"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
106 | if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
107 | printf("%s, bad version string\n", "$min_glib_version"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
108 | exit(1); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
109 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
110 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
111 | if ((glib_major_version != $glib_config_major_version) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
112 | (glib_minor_version != $glib_config_minor_version) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
113 | (glib_micro_version != $glib_config_micro_version)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
114 | { |
|
8132e5232391
[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", |
|
8132e5232391
[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, |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
117 | glib_major_version, glib_minor_version, glib_micro_version); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
122 | printf("*** required on your system.\n"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
124 | printf("*** to point to the correct configuration files\n"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
125 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
126 | else if ((glib_major_version != GLIB_MAJOR_VERSION) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
127 | (glib_minor_version != GLIB_MINOR_VERSION) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
128 | (glib_micro_version != GLIB_MICRO_VERSION)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
129 | { |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
131 | GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
132 | printf("*** library (version %d.%d.%d)\n", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
133 | glib_major_version, glib_minor_version, glib_micro_version); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
134 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
135 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
136 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
137 | if ((glib_major_version > major) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
138 | ((glib_major_version == major) && (glib_minor_version > minor)) || |
|
8132e5232391
[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))) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
140 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
141 | return 0; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
142 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
143 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
144 | { |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
146 | glib_major_version, glib_minor_version, glib_micro_version); |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
148 | major, minor, micro); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
149 | printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
150 | printf("***\n"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
158 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
159 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
160 | return 1; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
161 | } |
|
8132e5232391
[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"]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
163 | CFLAGS="$ac_save_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
164 | LIBS="$ac_save_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
165 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
166 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
167 | if test "x$no_glib" = x ; then |
|
8132e5232391
[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)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
169 | ifelse([$2], , :, [$2]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
170 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
171 | AC_MSG_RESULT(no) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
172 | if test "$PKG_CONFIG" = "no" ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
173 | echo "*** A new enough version of pkg-config was not found." |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
174 | echo "*** See http://www.freedesktop.org/software/pkgconfig/" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
175 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
176 | if test -f conf.glibtest ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
177 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
178 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
179 | echo "*** Could not run GLIB test program, checking why..." |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
180 | ac_save_CFLAGS="$CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
181 | ac_save_LIBS="$LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
182 | CFLAGS="$CFLAGS $GLIB_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
183 | LIBS="$LIBS $GLIB_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
184 | AC_TRY_LINK([ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
185 | #include <glib.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
186 | #include <stdio.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
187 | ], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
193 | echo "*** is required on your system" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
194 | echo "***" |
|
8132e5232391
[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" |
|
8132e5232391
[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" ], |
|
8132e5232391
[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
e4990afc92ab
[gaim-migrate @ 11721]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10253
diff
changeset
|
198 | echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."]) |
|
3661
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
199 | CFLAGS="$ac_save_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
200 | LIBS="$ac_save_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
201 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
202 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
203 | GLIB_CFLAGS="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
204 | GLIB_LIBS="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
205 | GLIB_GENMARSHAL="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
206 | GOBJECT_QUERY="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
207 | GLIB_MKENUMS="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
208 | ifelse([$3], , :, [$3]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
209 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
210 | AC_SUBST(GLIB_CFLAGS) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
211 | AC_SUBST(GLIB_LIBS) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
212 | AC_SUBST(GLIB_GENMARSHAL) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
213 | AC_SUBST(GOBJECT_QUERY) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
214 | AC_SUBST(GLIB_MKENUMS) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
215 | rm -f conf.glibtest |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
216 | ]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
217 | # Configure paths for GTK+ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
218 | # Owen Taylor 1997-2001 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
219 | |
|
8132e5232391
[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]]]]) |
|
8132e5232391
[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, |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
222 | dnl pass to pkg-config |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
223 | dnl |
| 8992 | 224 | AC_DEFUN([AM_PATH_GTK_2_0], |
|
3661
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
225 | [dnl |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
226 | dnl Get the cflags and libraries from pkg-config |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
227 | dnl |
|
8132e5232391
[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], |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
229 | , enable_gtktest=yes) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
230 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
231 | pkg_config_args=gtk+-2.0 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
232 | for module in . $4 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
233 | do |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
234 | case "$module" in |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
235 | gthread) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
236 | pkg_config_args="$pkg_config_args gthread-2.0" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
237 | ;; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
238 | esac |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
239 | done |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
240 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
241 | no_gtk="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
242 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
243 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
244 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
245 | if test x$PKG_CONFIG != xno ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
246 | if pkg-config --atleast-pkgconfig-version 0.7 ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
247 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
248 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
249 | echo *** pkg-config too old; version 0.7 or better required. |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
250 | no_gtk=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
251 | PKG_CONFIG=no |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
252 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
253 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
254 | no_gtk=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
255 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
256 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
257 | min_gtk_version=ifelse([$1], ,2.0.0,$1) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
258 | AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
259 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
260 | if test x$PKG_CONFIG != xno ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
261 | ## don't try to run the test against uninstalled libtool libs |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
262 | if $PKG_CONFIG --uninstalled $pkg_config_args; then |
|
8132e5232391
[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" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
264 | enable_gtktest=no |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
265 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
266 | |
|
8132e5232391
[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 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
268 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
269 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
270 | no_gtk=yes |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
271 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
272 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
273 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
274 | if test x"$no_gtk" = x ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
275 | GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
276 | GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
277 | gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
278 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
279 | gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
280 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
281 | gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
282 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
283 | if test "x$enable_gtktest" = "xyes" ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
284 | ac_save_CFLAGS="$CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
285 | ac_save_LIBS="$LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
286 | CFLAGS="$CFLAGS $GTK_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
287 | LIBS="$GTK_LIBS $LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
288 | dnl |
|
8132e5232391
[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 |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
290 | dnl checks the results of pkg-config to some extent) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
291 | dnl |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
292 | rm -f conf.gtktest |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
293 | AC_TRY_RUN([ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
294 | #include <gtk/gtk.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
295 | #include <stdio.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
296 | #include <stdlib.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
297 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
298 | int |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
299 | main () |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
300 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
301 | int major, minor, micro; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
302 | char *tmp_version; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
303 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
304 | system ("touch conf.gtktest"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
305 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
306 | /* HP/UX 9 (%@#!) writes to sscanf strings */ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
307 | tmp_version = g_strdup("$min_gtk_version"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
308 | if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
309 | printf("%s, bad version string\n", "$min_gtk_version"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
310 | exit(1); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
311 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
312 | |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
313 | if ((gtk_major_version != $gtk_config_major_version) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
314 | (gtk_minor_version != $gtk_config_minor_version) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
315 | (gtk_micro_version != $gtk_config_micro_version)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
316 | { |
|
8132e5232391
[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", |
|
8132e5232391
[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, |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
319 | gtk_major_version, gtk_minor_version, gtk_micro_version); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
324 | printf("*** required on your system.\n"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
326 | printf("*** to point to the correct configuration files\n"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
327 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
328 | else if ((gtk_major_version != GTK_MAJOR_VERSION) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
329 | (gtk_minor_version != GTK_MINOR_VERSION) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
330 | (gtk_micro_version != GTK_MICRO_VERSION)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
331 | { |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
333 | GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
334 | printf("*** library (version %d.%d.%d)\n", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
335 | gtk_major_version, gtk_minor_version, gtk_micro_version); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
336 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
337 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
338 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
339 | if ((gtk_major_version > major) || |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
340 | ((gtk_major_version == major) && (gtk_minor_version > minor)) || |
|
8132e5232391
[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))) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
342 | { |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
343 | return 0; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
344 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
345 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
346 | { |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
348 | gtk_major_version, gtk_minor_version, gtk_micro_version); |
|
8132e5232391
[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", |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
350 | major, minor, micro); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
351 | printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
352 | printf("***\n"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[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"); |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
360 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
361 | } |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
362 | return 1; |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
363 | } |
|
8132e5232391
[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"]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
365 | CFLAGS="$ac_save_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
366 | LIBS="$ac_save_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
367 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
368 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
369 | if test "x$no_gtk" = x ; then |
|
8132e5232391
[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)) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
371 | ifelse([$2], , :, [$2]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
372 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
373 | AC_MSG_RESULT(no) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
374 | if test "$PKG_CONFIG" = "no" ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
375 | echo "*** A new enough version of pkg-config was not found." |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
376 | echo "*** See http://pkgconfig.sourceforge.net" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
377 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
378 | if test -f conf.gtktest ; then |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
379 | : |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
380 | else |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
381 | echo "*** Could not run GTK+ test program, checking why..." |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
382 | ac_save_CFLAGS="$CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
383 | ac_save_LIBS="$LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
384 | CFLAGS="$CFLAGS $GTK_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
385 | LIBS="$LIBS $GTK_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
386 | AC_TRY_LINK([ |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
387 | #include <gtk/gtk.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
388 | #include <stdio.h> |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
389 | ], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[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" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
395 | echo "*** is required on your system" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
396 | echo "***" |
|
8132e5232391
[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" |
|
8132e5232391
[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" ], |
|
8132e5232391
[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
e4990afc92ab
[gaim-migrate @ 11721]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10253
diff
changeset
|
400 | echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."]) |
|
3661
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
401 | CFLAGS="$ac_save_CFLAGS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
402 | LIBS="$ac_save_LIBS" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
403 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
404 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
405 | GTK_CFLAGS="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
406 | GTK_LIBS="" |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
407 | ifelse([$3], , :, [$3]) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
408 | fi |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
409 | AC_SUBST(GTK_CFLAGS) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
410 | AC_SUBST(GTK_LIBS) |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
411 | rm -f conf.gtktest |
|
8132e5232391
[gaim-migrate @ 3790]
Christian Hammond <chipx86@chipx86.com>
parents:
3410
diff
changeset
|
412 | ]) |
| 4561 | 413 | |
| 414 | dnl This is XIPH_PATH_AO renamed to GAIM_PATH_AO to prevent conflicts. | |
| 415 | dnl It's a long story. --elb | |
| 416 | ||
| 417 | # ao.m4 | |
| 418 | # Configure paths for libao | |
| 419 | # Jack Moffitt <jack@icecast.org> 10-21-2000 | |
| 420 | # Shamelessly stolen from Owen Taylor and Manish Singh | |
| 421 | ||
| 422 | dnl GAIM_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) | |
| 423 | dnl Test for libao, and define AO_CFLAGS and AO_LIBS | |
| 424 | dnl | |
| 8992 | 425 | AC_DEFUN([GAIM_PATH_AO], |
| 4561 | 426 | [dnl |
| 427 | dnl Get the cflags and libraries | |
| 428 | dnl | |
| 429 | AC_ARG_WITH(ao,[ --with-ao=PFX Prefix where libao is installed (optional)], ao_prefix="$withval", ao_prefix="") | |
| 430 | AC_ARG_WITH(ao-libraries,[ --with-ao-libraries=DIR Directory where libao library is installed (optional)], ao_libraries="$withval", ao_libraries="") | |
| 431 | AC_ARG_WITH(ao-includes,[ --with-ao-includes=DIR Directory where libao header files are installed (optional)], ao_includes="$withval", ao_includes="") | |
| 432 | AC_ARG_ENABLE(aotest, [ --disable-aotest Do not try to compile and run a test ao program],, enable_aotest=yes) | |
| 433 | ||
| 434 | ||
| 435 | if test "x$ao_libraries" != "x" ; then | |
| 436 | AO_LIBS="-L$ao_libraries" | |
| 437 | elif test "x$ao_prefix" != "x"; then | |
| 438 | AO_LIBS="-L$ao_prefix/lib" | |
| 439 | elif test "x$prefix" != "xNONE"; then | |
| 440 | AO_LIBS="-L$prefix/lib" | |
| 441 | fi | |
| 442 | ||
| 443 | if test "x$ao_includes" != "x" ; then | |
| 444 | AO_CFLAGS="-I$ao_includes" | |
| 445 | elif test "x$ao_prefix" != "x"; then | |
| 446 | AO_CFLAGS="-I$ao_prefix/include" | |
| 447 | elif test "x$prefix" != "xNONE"; then | |
| 448 | AO_CFLAGS="-I$prefix/include" | |
| 449 | fi | |
| 450 | ||
| 451 | # see where dl* and friends live | |
| 452 | AC_CHECK_FUNCS(dlopen, [AO_DL_LIBS=""], [ | |
| 453 | AC_CHECK_LIB(dl, dlopen, [AO_DL_LIBS="-ldl"], [ | |
| 454 | AC_MSG_WARN([could not find dlopen() needed by libao sound drivers | |
| 455 | your system may not be supported.]) | |
| 456 | ]) | |
| 457 | ]) | |
| 458 | ||
| 459 | AO_LIBS="$AO_LIBS -lao $AO_DL_LIBS" | |
| 460 | ||
| 461 | AC_MSG_CHECKING(for ao) | |
| 462 | no_ao="" | |
| 463 | ||
| 464 | ||
| 465 | if test "x$enable_aotest" = "xyes" ; then | |
| 466 | ac_save_CFLAGS="$CFLAGS" | |
| 467 | ac_save_LIBS="$LIBS" | |
| 468 | CFLAGS="$CFLAGS $AO_CFLAGS" | |
| 469 | LIBS="$LIBS $AO_LIBS" | |
| 470 | dnl | |
| 471 | dnl Now check if the installed ao is sufficiently new. | |
| 472 | dnl | |
| 473 | rm -f conf.aotest | |
| 474 | AC_TRY_RUN([ | |
| 475 | #include <stdio.h> | |
| 476 | #include <stdlib.h> | |
| 477 | #include <string.h> | |
| 478 | #include <ao/ao.h> | |
| 479 | ||
| 480 | int main () | |
| 481 | { | |
| 482 | system("touch conf.aotest"); | |
| 483 | return 0; | |
| 484 | } | |
| 485 | ||
| 486 | ],, no_ao=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
| 487 | CFLAGS="$ac_save_CFLAGS" | |
| 488 | LIBS="$ac_save_LIBS" | |
| 489 | fi | |
| 490 | ||
| 491 | if test "x$no_ao" = "x" ; then | |
| 492 | AC_MSG_RESULT(yes) | |
| 493 | ifelse([$1], , :, [$1]) | |
| 494 | else | |
| 495 | AC_MSG_RESULT(no) | |
| 496 | if test -f conf.aotest ; then | |
| 497 | : | |
| 498 | else | |
| 499 | echo "*** Could not run ao test program, checking why..." | |
| 500 | CFLAGS="$CFLAGS $AO_CFLAGS" | |
| 501 | LIBS="$LIBS $AO_LIBS" | |
| 502 | AC_TRY_LINK([ | |
| 503 | #include <stdio.h> | |
| 504 | #include <ao/ao.h> | |
| 505 | ], [ return 0; ], | |
| 506 | [ echo "*** The test program compiled, but did not run. This usually means" | |
| 507 | echo "*** that the run-time linker is not finding ao or finding the wrong" | |
| 508 | echo "*** version of ao. If it is not finding ao, you'll need to set your" | |
| 509 | echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" | |
| 510 | echo "*** to the installed location Also, make sure you have run ldconfig if that" | |
| 511 | echo "*** is required on your system" | |
| 512 | echo "***" | |
| 513 | echo "*** If you have an old version installed, it is best to remove it, although" | |
| 514 | echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], | |
| 515 | [ echo "*** The test program failed to compile or link. See the file config.log for the" | |
|
10453
e4990afc92ab
[gaim-migrate @ 11721]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10253
diff
changeset
|
516 | echo "*** exact error that occurred. This usually means ao was incorrectly installed" |
| 4561 | 517 | echo "*** or that you have moved ao since it was installed." ]) |
| 518 | CFLAGS="$ac_save_CFLAGS" | |
| 519 | LIBS="$ac_save_LIBS" | |
| 520 | fi | |
| 521 | AO_CFLAGS="" | |
| 522 | AO_LIBS="" | |
| 523 | ifelse([$2], , :, [$2]) | |
| 524 | fi | |
| 525 | AC_SUBST(AO_CFLAGS) | |
| 526 | AC_SUBST(AO_LIBS) | |
| 527 | rm -f conf.aotest | |
| 528 | ]) | |
| 4564 | 529 | |
| 530 | dnl audiofile.m4, included here for those people who don't have audiofile | |
| 531 | dnl installed but would like to build CVS. | |
| 532 | ||
| 533 | # Configure paths for the Audio File Library | |
| 534 | # Bertrand Guiheneuf 98-10-21 | |
| 535 | # stolen from esd.m4 in esound : | |
| 536 | # Manish Singh 98-9-30 | |
| 537 | # stolen back from Frank Belew | |
| 538 | # stolen from Manish Singh | |
| 539 | # Shamelessly stolen from Owen Taylor | |
| 540 | ||
| 541 | dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
| 542 | dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS. | |
| 543 | dnl | |
| 8992 | 544 | AC_DEFUN([AM_PATH_AUDIOFILE], |
| 4564 | 545 | [dnl |
| 546 | dnl Get compiler flags and libraries from the audiofile-config script. | |
| 547 | dnl | |
| 548 | AC_ARG_WITH(audiofile-prefix,[ --with-audiofile-prefix=PFX Prefix where Audio File Library is installed (optional)], | |
| 549 | audiofile_prefix="$withval", audiofile_prefix="") | |
| 550 | AC_ARG_WITH(audiofile-exec-prefix,[ --with-audiofile-exec-prefix=PFX Exec prefix where Audio File Library is installed (optional)], | |
| 551 | audiofile_exec_prefix="$withval", audiofile_exec_prefix="") | |
| 552 | AC_ARG_ENABLE(audiofiletest, [ --disable-audiofiletest Do not try to compile and run a test Audio File Library program], , enable_audiofiletest=yes) | |
| 553 | ||
| 554 | if test x$audiofile_exec_prefix != x ; then | |
| 555 | audiofile_args="$audiofile_args --exec-prefix=$audiofile_exec_prefix" | |
| 556 | if test x${AUDIOFILE_CONFIG+set} != xset ; then | |
| 557 | AUDIOFILE_CONFIG=$audiofile_exec_prefix/bin/audiofile-config | |
| 558 | fi | |
| 559 | fi | |
| 560 | if test x$audiofile_prefix != x ; then | |
| 561 | audiofile_args="$audiofile_args --prefix=$audiofile_prefix" | |
| 562 | if test x${AUDIOFILE_CONFIG+set} != xset ; then | |
| 563 | AUDIOFILE_CONFIG=$audiofile_prefix/bin/audiofile-config | |
| 564 | fi | |
| 565 | fi | |
| 566 | ||
| 567 | AC_PATH_PROG(AUDIOFILE_CONFIG, audiofile-config, no) | |
| 568 | min_audiofile_version=ifelse([$1], ,0.2.5,$1) | |
| 569 | AC_MSG_CHECKING(for Audio File Library - version >= $min_audiofile_version) | |
| 570 | no_audiofile="" | |
| 571 | if test "$AUDIOFILE_CONFIG" = "no" ; then | |
| 572 | no_audiofile=yes | |
| 573 | else | |
| 574 | AUDIOFILE_LIBS=`$AUDIOFILE_CONFIG $audiofileconf_args --libs` | |
| 575 | AUDIOFILE_CFLAGS=`$AUDIOFILE_CONFIG $audiofileconf_args --cflags` | |
| 576 | audiofile_major_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ | |
| 577 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
| 578 | audiofile_minor_version=`$AUDIOFILE_CONFIG $audiofile_args --version | \ | |
| 579 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
| 580 | audiofile_micro_version=`$AUDIOFILE_CONFIG $audiofile_config_args --version | \ | |
| 581 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
| 582 | if test "x$enable_audiofiletest" = "xyes" ; then | |
| 583 | AC_LANG_SAVE | |
| 584 | AC_LANG_C | |
| 585 | ac_save_CFLAGS="$CFLAGS" | |
| 586 | ac_save_LIBS="$LIBS" | |
| 587 | CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" | |
| 588 | LIBS="$LIBS $AUDIOFILE_LIBS" | |
| 589 | dnl | |
| 590 | dnl Now check if the installed Audio File Library is sufficiently new. | |
| 591 | dnl (Also checks the sanity of the results of audiofile-config to some extent.) | |
| 592 | dnl | |
| 593 | rm -f conf.audiofiletest | |
| 594 | AC_TRY_RUN([ | |
| 595 | #include <stdio.h> | |
| 596 | #include <stdlib.h> | |
| 597 | #include <string.h> | |
| 598 | #include <audiofile.h> | |
| 599 | ||
| 600 | char* | |
| 601 | my_strdup (char *str) | |
| 602 | { | |
| 603 | char *new_str; | |
| 604 | ||
| 605 | if (str) | |
| 606 | { | |
| 607 | new_str = malloc ((strlen (str) + 1) * sizeof(char)); | |
| 608 | strcpy (new_str, str); | |
| 609 | } | |
| 610 | else | |
| 611 | new_str = NULL; | |
| 612 | ||
| 613 | return new_str; | |
| 614 | } | |
| 615 | ||
| 616 | int main () | |
| 617 | { | |
| 618 | int major, minor, micro; | |
| 619 | char *tmp_version; | |
| 620 | ||
| 621 | system ("touch conf.audiofiletest"); | |
| 622 | ||
| 623 | /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
| 624 | tmp_version = my_strdup("$min_audiofile_version"); | |
| 625 | if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
| 626 | printf("%s, bad version string\n", "$min_audiofile_version"); | |
| 627 | exit(1); | |
| 628 | } | |
| 629 | ||
| 630 | if (($audiofile_major_version > major) || | |
| 631 | (($audiofile_major_version == major) && ($audiofile_minor_version > minor)) || | |
| 632 | (($audiofile_major_version == major) && ($audiofile_minor_version == minor) && ($audiofile_micro_version >= micro))) | |
| 633 | { | |
| 634 | return 0; | |
| 635 | } | |
| 636 | else | |
| 637 | { | |
| 638 | printf("\n*** 'audiofile-config --version' returned %d.%d.%d, but the minimum version\n", $audiofile_major_version, $audiofile_minor_version, $audiofile_micro_version); | |
| 639 | printf("*** of the Audio File Library required is %d.%d.%d. If audiofile-config is correct, then it is\n", major, minor, micro); | |
| 640 | printf("*** best to upgrade to the required version.\n"); | |
| 641 | printf("*** If audiofile-config was wrong, set the environment variable AUDIOFILE_CONFIG\n"); | |
| 642 | printf("*** to point to the correct copy of audiofile-config, and remove the file\n"); | |
| 643 | printf("*** config.cache before re-running configure\n"); | |
| 644 | return 1; | |
| 645 | } | |
| 646 | } | |
| 647 | ||
| 648 | ],, no_audiofile=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
| 649 | CFLAGS="$ac_save_CFLAGS" | |
| 650 | LIBS="$ac_save_LIBS" | |
| 651 | AC_LANG_RESTORE | |
| 652 | fi | |
| 653 | fi | |
| 654 | if test "x$no_audiofile" = x ; then | |
| 655 | AC_MSG_RESULT(yes) | |
| 656 | ifelse([$2], , :, [$2]) | |
| 657 | else | |
| 658 | AC_MSG_RESULT(no) | |
| 659 | if test "$AUDIOFILE_CONFIG" = "no" ; then | |
| 660 | cat <<END | |
| 661 | *** The audiofile-config script installed by the Audio File Library could | |
| 662 | *** not be found. If the Audio File Library was installed in PREFIX, make | |
| 663 | *** sure PREFIX/bin is in your path, or set the AUDIOFILE_CONFIG | |
| 664 | *** environment variable to the full path to audiofile-config. | |
| 665 | END | |
| 666 | else | |
| 667 | if test -f conf.audiofiletest ; then | |
| 668 | : | |
| 669 | else | |
| 670 | echo "*** Could not run Audio File Library test program; checking why..." | |
| 671 | AC_LANG_SAVE | |
| 672 | AC_LANG_C | |
| 673 | CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" | |
| 674 | LIBS="$LIBS $AUDIOFILE_LIBS" | |
| 675 | AC_TRY_LINK([ | |
| 676 | #include <stdio.h> | |
| 677 | #include <audiofile.h> | |
| 678 | ], [ return 0; ], | |
| 679 | [ cat <<END | |
| 680 | *** The test program compiled, but did not run. This usually means that | |
| 681 | *** the run-time linker is not finding Audio File Library or finding the | |
| 682 | *** wrong version of Audio File Library. | |
| 683 | *** | |
| 684 | *** If it is not finding Audio File Library, you'll need to set your | |
| 685 | *** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point | |
| 686 | *** to the installed location. Also, make sure you have run ldconfig if | |
| 687 | *** that is required on your system. | |
| 688 | *** | |
| 689 | *** If you have an old version installed, it is best to remove it, although | |
| 690 | *** you may also be able to get things to work by modifying | |
| 691 | *** LD_LIBRARY_PATH. | |
| 692 | END | |
| 693 | ], | |
| 694 | [ echo "*** The test program failed to compile or link. See the file config.log" | |
|
10453
e4990afc92ab
[gaim-migrate @ 11721]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10253
diff
changeset
|
695 | echo "*** for the exact error that occurred. This usually means the Audio File" |
| 4564 | 696 | echo "*** Library was incorrectly installed or that you have moved the Audio" |
| 697 | echo "*** File Library since it was installed. In the latter case, you may want" | |
| 698 | echo "*** to edit the audiofile-config script: $AUDIOFILE_CONFIG" ]) | |
| 699 | CFLAGS="$ac_save_CFLAGS" | |
| 700 | LIBS="$ac_save_LIBS" | |
| 701 | AC_LANG_RESTORE | |
| 702 | fi | |
| 703 | fi | |
| 704 | AUDIOFILE_CFLAGS="" | |
| 705 | AUDIOFILE_LIBS="" | |
| 706 | ifelse([$3], , :, [$3]) | |
| 707 | fi | |
| 708 | AC_SUBST(AUDIOFILE_CFLAGS) | |
| 709 | AC_SUBST(AUDIOFILE_LIBS) | |
| 710 | rm -f conf.audiofiletest | |
| 711 | ]) | |
| 712 | ||
| 713 | dnl ac_var_timeszone_externals.m4 | |
| 714 | ||
| 715 | # Define 'timezone', 'altzone' and 'daylight' | |
| 716 | # http://www.gnu.org/software/ac-archive/Miscellaneous/ac_var_timezone_externals.html | |
| 717 | # Use instead of 'AC_STRUCT_TIMEZONE' to determine whether the | |
| 718 | # the external timezone variables 'timezone', 'altzone' and 'daylight' exist, | |
| 719 | # defining 'HAVE_TIMEZONE', 'HAVE_ALTZONE' and 'HAVE_DAYLIGHT' respectively | |
| 720 | # (as well as gaining the macros defined by 'AC_STRUCT_TIMEZONE'). | |
| 721 | # Mark R.Bannister <markb@freedomware.co.uk> | |
| 722 | AC_DEFUN([AC_VAR_TIMEZONE_EXTERNALS], | |
| 723 | [ AC_REQUIRE([AC_STRUCT_TIMEZONE])dnl | |
| 724 | AC_CACHE_CHECK(for timezone external, mb_cv_var_timezone, | |
| 725 | [ AC_TRY_LINK([#include <time.h>], [return (int)timezone;], | |
| 726 | mb_cv_var_timezone=yes, | |
| 727 | mb_cv_var_timezone=no) | |
| 728 | ]) | |
| 729 | AC_CACHE_CHECK(for altzone external, mb_cv_var_altzone, | |
| 730 | [ AC_TRY_LINK([#include <time.h>], [return (int)altzone;], | |
| 731 | mb_cv_var_altzone=yes, | |
| 732 | mb_cv_var_altzone=no) | |
| 733 | ]) | |
| 734 | AC_CACHE_CHECK(for daylight external, mb_cv_var_daylight, | |
| 735 | [ AC_TRY_LINK([#include <time.h>], [return (int)daylight;], | |
| 736 | mb_cv_var_daylight=yes, | |
| 737 | mb_cv_var_daylight=no) | |
| 738 | ]) | |
| 739 | if test $mb_cv_var_timezone = yes; then | |
| 740 | AC_DEFINE([HAVE_TIMEZONE], 1, | |
| 741 | [Define if you have the external 'timezone' variable.]) | |
| 742 | fi | |
| 743 | if test $mb_cv_var_altzone = yes; then | |
| 744 | AC_DEFINE([HAVE_ALTZONE], 1, | |
| 745 | [Define if you have the external 'altzone' variable.]) | |
| 746 | fi | |
| 747 | if test $mb_cv_var_daylight = yes; then | |
| 748 | AC_DEFINE([HAVE_DAYLIGHT], 1, | |
| 749 | [Define if you have the external 'daylight' variable.]) | |
| 750 | fi | |
| 751 | ]) | |
|
7201
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
752 | |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
753 | dnl Available from the GNU Autoconf Macro Archive at: |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
754 | dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_prog_perl_modules.html |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
755 | dnl |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
756 | AC_DEFUN([AC_PROG_PERL_MODULES],[dnl |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
757 | ac_perl_modules="$1" |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
758 | # Make sure we have perl |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
759 | if test -z "$PERL"; then |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
760 | AC_CHECK_PROG(PERL,perl,perl) |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
761 | fi |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
762 | |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
763 | if test "x$PERL" != x; then |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
764 | ac_perl_modules_failed=0 |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
765 | for ac_perl_module in $ac_perl_modules; do |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
766 | AC_MSG_CHECKING(for perl module $ac_perl_module) |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
767 | |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
768 | # Would be nice to log result here, but can't rely on autoconf internals |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
769 | $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1 |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
770 | if test $? -ne 0; then |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
771 | AC_MSG_RESULT(no); |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
772 | ac_perl_modules_failed=1 |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
773 | else |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
774 | AC_MSG_RESULT(ok); |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
775 | fi |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
776 | done |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
777 | |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
778 | # Run optional shell commands |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
779 | if test "$ac_perl_modules_failed" = 0; then |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
780 | : |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
781 | $2 |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
782 | else |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
783 | : |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
784 | $3 |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
785 | fi |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
786 | else |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
787 | AC_MSG_WARN(could not find perl) |
|
4495b0fd4f03
[gaim-migrate @ 7770]
Christian Hammond <chipx86@chipx86.com>
parents:
4564
diff
changeset
|
788 | fi])dnl |
| 10245 | 789 | |
| 790 | ||
| 791 | dnl This file scares me... | |
| 792 | # Check for binary relocation support | |
| 793 | # Hongli Lai | |
| 794 | # http://autopackage.org/ | |
| 795 | ||
| 796 | AC_DEFUN([AM_BINRELOC], | |
| 797 | [ | |
| 798 | AC_ARG_ENABLE(binreloc, | |
| 799 | [ --enable-binreloc compile with binary relocation support | |
| 800 | (default=enable when available)], | |
| 801 | enable_binreloc=$enableval,enable_binreloc=auto) | |
| 802 | ||
| 803 | BINRELOC_CFLAGS= | |
| 804 | BINRELOC_LIBS= | |
| 805 | if test "x$enable_binreloc" = "xauto"; then | |
| 806 | AC_CACHE_CHECK([whether everything is installed to the same prefix], | |
| 807 | [br_cv_valid_prefixes], [ | |
| 808 | if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ | |
| 809 | "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ | |
| 810 | "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' | |
| 811 | then | |
| 812 | br_cv_valid_prefixes=yes | |
| 813 | else | |
| 814 | br_cv_valid_prefixes=no | |
| 815 | fi | |
| 816 | ]) | |
| 817 | fi | |
| 818 | AC_CACHE_CHECK([whether binary relocation support should be enabled], | |
| 819 | [br_cv_binreloc], | |
| 820 | [if test "x$enable_binreloc" = "xyes"; then | |
| 821 | br_cv_binreloc=yes | |
| 822 | elif test "x$enable_binreloc" = "xauto"; then | |
| 10253 | 823 | if test "x$br_cv_valid_prefixes" = "xyes"; then |
| 10245 | 824 | br_cv_binreloc=yes |
| 825 | else | |
| 826 | br_cv_binreloc=no | |
| 827 | fi | |
| 828 | else | |
| 829 | br_cv_binreloc=no | |
| 830 | fi]) | |
| 831 | ||
| 832 | if test "x$br_cv_binreloc" = "xyes"; then | |
| 833 | BINRELOC_CFLAGS="-DENABLE_BINRELOC" | |
| 834 | AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) | |
| 835 | fi | |
| 836 | AC_SUBST(BINRELOC_CFLAGS) | |
| 837 | AC_SUBST(BINRELOC_LIBS) | |
| 838 | ]) |