~ubuntu-branches/ubuntu/lucid/libgweather/lucid-updates
» Revision
39
: debian/patches/99_autoreconf.patch
« back to all changes in this revision
Viewing changes to debian/patches/99_autoreconf.patch
- browse files at revision 39
- compare with another revision
- download diff
- download tarball
- view history from revision 39
- Committer: Bazaar Package Importer
- Author(s): Sebastien Bacher
- Date: 2010-03-30 11:02:50 UTC
- mfrom: (1.1.25 upstream)
- Revision ID: james.westby@ubuntu.com-20100330110250-x31ubgbuop62twtr
Tags: 2.30.0-0ubuntu1
* New upstream version
* debian/patches/99_autoreconf.patch:
- new version update
* debian/patches/99_autoreconf.patch:
- new version update
- files modified:
- NEWS
added
removed
debian/patches/99_autoreconf.patch
1
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/aclocal.m4 libgweather-2.29.92.new/aclocal.m4
2
--- libgweather-2.29.92/aclocal.m4 2010-03-09 04:44:34.000000000 +0100
3
+++ libgweather-2.29.92.new/aclocal.m4 2010-03-09 11:14:50.000000000 +0100
1
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/aclocal.m4 libgweather-2.30.0.new/aclocal.m4
2
--- libgweather-2.30.0/aclocal.m4 2010-03-30 05:24:15.000000000 +0200
3
+++ libgweather-2.30.0.new/aclocal.m4 2010-03-30 11:25:57.000000000 +0200
4
4
@@ -1,4 +1,4 @@
5
5
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
6
6
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
7
7
8
8
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
9
9
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
10
@@ -13,8 +13,8 @@
10
@@ -13,2317 +13,2333 @@
11
11
12
12
m4_ifndef([AC_AUTOCONF_VERSION],
13
13
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
18
18
You have another version of autoconf. It may work, but is not guaranteed to.
19
19
If you have problems, you may need to regenerate the build system entirely.
20
20
To do so, use the procedure documented by the package, typically `autoreconf'.])])
21
@@ -159,9 +159,8 @@
22
{
23
int major, minor, micro;
24
char *tmp_version;
25
- int ignored;
26
27
- ignored = system ("touch conf.glibtest");
28
+ fclose (fopen ("conf.glibtest", "w"));
29
30
/* HP/UX 9 (%@#!) writes to sscanf strings */
31
tmp_version = g_strdup("$min_glib_version");
32
@@ -1108,7 +1107,7 @@
33
[am__api_version='1.11'
34
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
35
dnl require some minimum version. Point them to the right macro.
21
22
-# nls.m4 serial 3 (gettext-0.15)
23
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
24
-dnl This file is free software; the Free Software Foundation
25
-dnl gives unlimited permission to copy and/or distribute it,
26
-dnl with or without modifications, as long as this notice is preserved.
27
+dnl AM_GCONF_SOURCE_2
28
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
29
+dnl (i.e. pass to gconftool-2
30
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
31
+dnl you should install foo.schemas files
32
dnl
33
-dnl This file can can be used in projects which are not available under
34
-dnl the GNU General Public License or the GNU Library General Public
35
-dnl License but which still want to provide support for the GNU gettext
36
-dnl functionality.
37
-dnl Please note that the actual code of the GNU gettext library is covered
38
-dnl by the GNU Library General Public License, and the rest of the GNU
39
-dnl gettext package package is covered by the GNU General Public License.
40
-dnl They are *not* in the public domain.
41
-
42
-dnl Authors:
43
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
44
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
45
-
46
-AC_PREREQ(2.50)
47
48
-AC_DEFUN([AM_NLS],
49
+AC_DEFUN([AM_GCONF_SOURCE_2],
50
[
51
- AC_MSG_CHECKING([whether NLS is requested])
52
- dnl Default is enabled NLS
53
- AC_ARG_ENABLE(nls,
54
- [ --disable-nls do not use Native Language Support],
55
- USE_NLS=$enableval, USE_NLS=yes)
56
- AC_MSG_RESULT($USE_NLS)
57
- AC_SUBST(USE_NLS)
58
-])
59
-
60
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
61
-#
62
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
63
-#
64
-# This program is free software; you can redistribute it and/or modify
65
-# it under the terms of the GNU General Public License as published by
66
-# the Free Software Foundation; either version 2 of the License, or
67
-# (at your option) any later version.
68
-#
69
-# This program is distributed in the hope that it will be useful, but
70
-# WITHOUT ANY WARRANTY; without even the implied warranty of
71
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
72
-# General Public License for more details.
73
-#
74
-# You should have received a copy of the GNU General Public License
75
-# along with this program; if not, write to the Free Software
76
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
77
-#
78
-# As a special exception to the GNU General Public License, if you
79
-# distribute this file as part of a program that contains a
80
-# configuration script generated by Autoconf, you may include it under
81
-# the same distribution terms that you use for the rest of that program.
82
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
83
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
84
+ else
85
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
86
+ fi
87
88
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
89
-# ----------------------------------
90
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
91
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
92
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
93
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
94
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
95
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
96
-fi
97
-if test -n "$PKG_CONFIG"; then
98
- _pkg_min_version=m4_default([$1], [0.9.0])
99
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
100
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
101
- AC_MSG_RESULT([yes])
102
- else
103
- AC_MSG_RESULT([no])
104
- PKG_CONFIG=""
105
- fi
106
-
107
-fi[]dnl
108
-])# PKG_PROG_PKG_CONFIG
109
+ AC_ARG_WITH([gconf-source],
110
+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
111
+ [Config database for installing schema files.]),
112
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
113
114
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
115
-#
116
-# Check to see whether a particular set of modules exists. Similar
117
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
118
-#
119
-#
120
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
121
-# this or PKG_CHECK_MODULES is called, or make sure to call
122
-# PKG_CHECK_EXISTS manually
123
-# --------------------------------------------------------------
124
-AC_DEFUN([PKG_CHECK_EXISTS],
125
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
126
-if test -n "$PKG_CONFIG" && \
127
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
128
- m4_ifval([$2], [$2], [:])
129
-m4_ifvaln([$3], [else
130
- $3])dnl
131
-fi])
132
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
133
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
134
135
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
136
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
137
+ fi
138
139
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
140
-# ---------------------------------------------
141
-m4_define([_PKG_CONFIG],
142
-[if test -n "$PKG_CONFIG"; then
143
- if test -n "$$1"; then
144
- pkg_cv_[]$1="$$1"
145
- else
146
- PKG_CHECK_EXISTS([$3],
147
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
148
- [pkg_failed=yes])
149
- fi
150
-else
151
- pkg_failed=untried
152
-fi[]dnl
153
-])# _PKG_CONFIG
154
+ AC_ARG_WITH([gconf-schema-file-dir],
155
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
156
+ [Directory for installing schema files.]),
157
+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
158
159
-# _PKG_SHORT_ERRORS_SUPPORTED
160
-# -----------------------------
161
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
162
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
163
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
164
- _pkg_short_errors_supported=yes
165
-else
166
- _pkg_short_errors_supported=no
167
-fi[]dnl
168
-])# _PKG_SHORT_ERRORS_SUPPORTED
169
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
170
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
171
172
+ AC_ARG_ENABLE(schemas-install,
173
+ AC_HELP_STRING([--disable-schemas-install],
174
+ [Disable the schemas installation]),
175
+ [case ${enableval} in
176
+ yes|no) ;;
177
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
178
+ esac])
179
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
180
+])
181
182
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
183
-# [ACTION-IF-NOT-FOUND])
184
-#
185
-#
186
-# Note that if there is a possibility the first call to
187
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
188
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
189
-#
190
-#
191
-# --------------------------------------------------------------
192
-AC_DEFUN([PKG_CHECK_MODULES],
193
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
194
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
195
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
196
+# Configure paths for GLIB
197
+# Owen Taylor 1997-2001
198
199
-pkg_failed=no
200
-AC_MSG_CHECKING([for $1])
201
+dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
202
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
203
+dnl gthread, or gio is specified in MODULES, pass to pkg-config
204
+dnl
205
+AC_DEFUN([AM_PATH_GLIB_2_0],
206
+[dnl
207
+dnl Get the cflags and libraries from pkg-config
208
+dnl
209
+AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
210
+ , enable_glibtest=yes)
211
212
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
213
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
214
+ pkg_config_args=glib-2.0
215
+ for module in . $4
216
+ do
217
+ case "$module" in
218
+ gmodule)
219
+ pkg_config_args="$pkg_config_args gmodule-2.0"
220
+ ;;
221
+ gmodule-no-export)
222
+ pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
223
+ ;;
224
+ gobject)
225
+ pkg_config_args="$pkg_config_args gobject-2.0"
226
+ ;;
227
+ gthread)
228
+ pkg_config_args="$pkg_config_args gthread-2.0"
229
+ ;;
230
+ gio*)
231
+ pkg_config_args="$pkg_config_args $module-2.0"
232
+ ;;
233
+ esac
234
+ done
235
236
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
237
-and $1[]_LIBS to avoid the need to call pkg-config.
238
-See the pkg-config man page for more details.])
239
+ PKG_PROG_PKG_CONFIG([0.16])
240
241
-if test $pkg_failed = yes; then
242
- _PKG_SHORT_ERRORS_SUPPORTED
243
- if test $_pkg_short_errors_supported = yes; then
244
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
245
- else
246
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
247
- fi
248
- # Put the nasty error message in config.log where it belongs
249
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
250
+ no_glib=""
251
252
- ifelse([$4], , [AC_MSG_ERROR(dnl
253
-[Package requirements ($2) were not met:
254
+ if test "x$PKG_CONFIG" = x ; then
255
+ no_glib=yes
256
+ PKG_CONFIG=no
257
+ fi
258
259
-$$1_PKG_ERRORS
260
+ min_glib_version=ifelse([$1], ,2.0.0,$1)
261
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
262
263
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
264
-installed software in a non-standard prefix.
265
+ if test x$PKG_CONFIG != xno ; then
266
+ ## don't try to run the test against uninstalled libtool libs
267
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
268
+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
269
+ enable_glibtest=no
270
+ fi
271
272
-_PKG_TEXT
273
-])],
274
- [AC_MSG_RESULT([no])
275
- $4])
276
-elif test $pkg_failed = untried; then
277
- ifelse([$4], , [AC_MSG_FAILURE(dnl
278
-[The pkg-config script could not be found or is too old. Make sure it
279
-is in your PATH or set the PKG_CONFIG environment variable to the full
280
-path to pkg-config.
281
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
282
+ :
283
+ else
284
+ no_glib=yes
285
+ fi
286
+ fi
287
288
-_PKG_TEXT
289
+ if test x"$no_glib" = x ; then
290
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
291
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
292
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
293
294
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
295
- [$4])
296
-else
297
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
298
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
299
- AC_MSG_RESULT([yes])
300
- ifelse([$3], , :, [$3])
301
-fi[]dnl
302
-])# PKG_CHECK_MODULES
303
-
304
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
305
-#
306
-# This file is free software; the Free Software Foundation
307
-# gives unlimited permission to copy and/or distribute it,
308
-# with or without modifications, as long as this notice is preserved.
309
+ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
310
+ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
311
+ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
312
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
313
+ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
314
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
315
+ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
316
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
317
+ if test "x$enable_glibtest" = "xyes" ; then
318
+ ac_save_CFLAGS="$CFLAGS"
319
+ ac_save_LIBS="$LIBS"
320
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
321
+ LIBS="$GLIB_LIBS $LIBS"
322
+dnl
323
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
324
+dnl checks the results of pkg-config to some extent)
325
+dnl
326
+ rm -f conf.glibtest
327
+ AC_TRY_RUN([
328
+#include <glib.h>
329
+#include <stdio.h>
330
+#include <stdlib.h>
331
332
-# AM_AUTOMAKE_VERSION(VERSION)
333
-# ----------------------------
334
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
335
-# generated from the m4 files accompanying Automake X.Y.
336
-# (This private macro should not be called outside this file.)
337
-AC_DEFUN([AM_AUTOMAKE_VERSION],
338
-[am__api_version='1.11'
339
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
340
-dnl require some minimum version. Point them to the right macro.
36
341
-m4_if([$1], [1.11], [],
342
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
343
-])
344
+int
345
+main ()
346
+{
347
+ int major, minor, micro;
348
+ char *tmp_version;
349
350
-# _AM_AUTOCONF_VERSION(VERSION)
351
-# -----------------------------
352
-# aclocal traces this macro to find the Autoconf version.
353
-# This is a private macro too. Using m4_define simplifies
354
-# the logic in aclocal, which can simply ignore this definition.
355
-m4_define([_AM_AUTOCONF_VERSION], [])
356
+ fclose (fopen ("conf.glibtest", "w"));
357
358
-# AM_SET_CURRENT_AUTOMAKE_VERSION
359
-# -------------------------------
360
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
361
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
362
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
363
-[AM_AUTOMAKE_VERSION([1.11])dnl
364
-m4_ifndef([AC_AUTOCONF_VERSION],
365
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
366
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
367
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
368
+ tmp_version = g_strdup("$min_glib_version");
369
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
370
+ printf("%s, bad version string\n", "$min_glib_version");
371
+ exit(1);
372
+ }
373
374
-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
375
+ if ((glib_major_version != $glib_config_major_version) ||
376
+ (glib_minor_version != $glib_config_minor_version) ||
377
+ (glib_micro_version != $glib_config_micro_version))
378
+ {
379
+ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
380
+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
381
+ glib_major_version, glib_minor_version, glib_micro_version);
382
+ printf ("*** was found! If pkg-config was correct, then it is best\n");
383
+ printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
384
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
385
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
386
+ printf("*** required on your system.\n");
387
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
388
+ printf("*** to point to the correct configuration files\n");
389
+ }
390
+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
391
+ (glib_minor_version != GLIB_MINOR_VERSION) ||
392
+ (glib_micro_version != GLIB_MICRO_VERSION))
393
+ {
394
+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
395
+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
396
+ printf("*** library (version %d.%d.%d)\n",
397
+ glib_major_version, glib_minor_version, glib_micro_version);
398
+ }
399
+ else
400
+ {
401
+ if ((glib_major_version > major) ||
402
+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
403
+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
404
+ {
405
+ return 0;
406
+ }
407
+ else
408
+ {
409
+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
410
+ glib_major_version, glib_minor_version, glib_micro_version);
411
+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
412
+ major, minor, micro);
413
+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
414
+ printf("***\n");
415
+ printf("*** If you have already installed a sufficiently new version, this error\n");
416
+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
417
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
418
+ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
419
+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
420
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
421
+ printf("*** so that the correct libraries are found at run-time))\n");
422
+ }
423
+ }
424
+ return 1;
425
+}
426
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
427
+ CFLAGS="$ac_save_CFLAGS"
428
+ LIBS="$ac_save_LIBS"
429
+ fi
430
+ fi
431
+ if test "x$no_glib" = x ; then
432
+ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
433
+ ifelse([$2], , :, [$2])
434
+ else
435
+ AC_MSG_RESULT(no)
436
+ if test "$PKG_CONFIG" = "no" ; then
437
+ echo "*** A new enough version of pkg-config was not found."
438
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/"
439
+ else
440
+ if test -f conf.glibtest ; then
441
+ :
442
+ else
443
+ echo "*** Could not run GLIB test program, checking why..."
444
+ ac_save_CFLAGS="$CFLAGS"
445
+ ac_save_LIBS="$LIBS"
446
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
447
+ LIBS="$LIBS $GLIB_LIBS"
448
+ AC_TRY_LINK([
449
+#include <glib.h>
450
+#include <stdio.h>
451
+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
452
+ [ echo "*** The test program compiled, but did not run. This usually means"
453
+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
454
+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
455
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
456
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
457
+ echo "*** is required on your system"
458
+ echo "***"
459
+ echo "*** If you have an old version installed, it is best to remove it, although"
460
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
461
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
462
+ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
463
+ CFLAGS="$ac_save_CFLAGS"
464
+ LIBS="$ac_save_LIBS"
465
+ fi
466
+ fi
467
+ GLIB_CFLAGS=""
468
+ GLIB_LIBS=""
469
+ GLIB_GENMARSHAL=""
470
+ GOBJECT_QUERY=""
471
+ GLIB_MKENUMS=""
472
+ ifelse([$3], , :, [$3])
473
+ fi
474
+ AC_SUBST(GLIB_CFLAGS)
475
+ AC_SUBST(GLIB_LIBS)
476
+ AC_SUBST(GLIB_GENMARSHAL)
477
+ AC_SUBST(GOBJECT_QUERY)
478
+ AC_SUBST(GLIB_MKENUMS)
479
+ rm -f conf.glibtest
480
+])
481
482
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
483
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
484
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
485
#
486
-# This file is free software; the Free Software Foundation
487
-# gives unlimited permission to copy and/or distribute it,
488
-# with or without modifications, as long as this notice is preserved.
489
-
490
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
491
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
492
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
493
+# This file is free software, distributed under the terms of the GNU
494
+# General Public License. As a special exception to the GNU General
495
+# Public License, this file may be distributed as part of a program
496
+# that contains a configuration script generated by Autoconf, under
497
+# the same distribution terms as the rest of that program.
498
#
499
-# Of course, Automake must honor this variable whenever it calls a
500
-# tool from the auxiliary directory. The problem is that $srcdir (and
501
-# therefore $ac_aux_dir as well) can be either absolute or relative,
502
-# depending on how configure is run. This is pretty annoying, since
503
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
504
-# source directory, any form will work fine, but in subdirectories a
505
-# relative path needs to be adjusted first.
506
+# This file can be copied and used freely without restrictions. It can
507
+# be used in projects which are not available under the GNU Public License
508
+# but which still want to provide support for the GNU gettext functionality.
509
#
510
-# $ac_aux_dir/missing
511
-# fails when called from a subdirectory if $ac_aux_dir is relative
512
-# $top_srcdir/$ac_aux_dir/missing
513
-# fails if $ac_aux_dir is absolute,
514
-# fails when called from a subdirectory in a VPATH build with
515
-# a relative $ac_aux_dir
516
+# Macro to add for using GNU gettext.
517
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
518
#
519
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
520
-# are both prefixed by $srcdir. In an in-source build this is usually
521
-# harmless because $srcdir is `.', but things will broke when you
522
-# start a VPATH build or use an absolute $srcdir.
523
+# Modified to never use included libintl.
524
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
525
#
526
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
527
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
528
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
529
-# and then we would define $MISSING as
530
-# MISSING="\${SHELL} $am_aux_dir/missing"
531
-# This will work as long as MISSING is not called from configure, because
532
-# unfortunately $(top_srcdir) has no meaning in configure.
533
-# However there are other variables, like CC, which are often used in
534
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
535
+# Major rework to remove unused code
536
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
537
#
538
-# Another solution, used here, is to always expand $ac_aux_dir to an
539
-# absolute PATH. The drawback is that using absolute paths prevent a
540
-# configured tree to be moved without reconfiguration.
541
-
542
-AC_DEFUN([AM_AUX_DIR_EXPAND],
543
-[dnl Rely on autoconf to set up CDPATH properly.
544
-AC_PREREQ([2.50])dnl
545
-# expand $ac_aux_dir to an absolute path
546
-am_aux_dir=`cd $ac_aux_dir && pwd`
547
-])
548
-
549
-# AM_CONDITIONAL -*- Autoconf -*-
550
-
551
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
552
-# Free Software Foundation, Inc.
553
+# Added better handling of ALL_LINGUAS from GNU gettext version
554
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
555
#
556
-# This file is free software; the Free Software Foundation
557
-# gives unlimited permission to copy and/or distribute it,
558
-# with or without modifications, as long as this notice is preserved.
559
-
560
-# serial 9
561
+# Modified to require ngettext
562
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
563
+#
564
+# We need this here as well, since someone might use autoconf-2.5x
565
+# to configure GLib then an older version to configure a package
566
+# using AM_GLIB_GNU_GETTEXT
567
+AC_PREREQ(2.53)
568
569
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
570
-# -------------------------------------
571
-# Define a conditional.
572
-AC_DEFUN([AM_CONDITIONAL],
573
-[AC_PREREQ(2.52)dnl
574
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
575
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
576
-AC_SUBST([$1_TRUE])dnl
577
-AC_SUBST([$1_FALSE])dnl
578
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
579
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
580
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
581
-if $2; then
582
- $1_TRUE=
583
- $1_FALSE='#'
584
-else
585
- $1_TRUE='#'
586
- $1_FALSE=
587
-fi
588
-AC_CONFIG_COMMANDS_PRE(
589
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
590
- AC_MSG_ERROR([[conditional "$1" was never defined.
591
-Usually this means the macro was only invoked conditionally.]])
592
-fi])])
593
-
594
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
595
-# Free Software Foundation, Inc.
596
-#
597
-# This file is free software; the Free Software Foundation
598
-# gives unlimited permission to copy and/or distribute it,
599
-# with or without modifications, as long as this notice is preserved.
600
-
601
-# serial 10
602
-
603
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
604
-# written in clear, in which case automake, when reading aclocal.m4,
605
-# will think it sees a *use*, and therefore will trigger all it's
606
-# C support machinery. Also note that it means that autoscan, seeing
607
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
608
-
609
-
610
-# _AM_DEPENDENCIES(NAME)
611
-# ----------------------
612
-# See how the compiler implements dependency checking.
613
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
614
-# We try a few techniques and use that to set a single cache variable.
615
-#
616
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
617
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
618
-# dependency, and given that the user is not expected to run this macro,
619
-# just rely on AC_PROG_CC.
620
-AC_DEFUN([_AM_DEPENDENCIES],
621
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
622
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
623
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
624
-AC_REQUIRE([AM_DEP_TRACK])dnl
625
-
626
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
627
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
628
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
629
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
630
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
631
- [depcc="$$1" am_compiler_list=])
632
-
633
-AC_CACHE_CHECK([dependency style of $depcc],
634
- [am_cv_$1_dependencies_compiler_type],
635
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
636
- # We make a subdir and do the tests there. Otherwise we can end up
637
- # making bogus files that we don't know about and never remove. For
638
- # instance it was reported that on HP-UX the gcc test will end up
639
- # making a dummy file named `D' -- because `-MD' means `put the output
640
- # in D'.
641
- mkdir conftest.dir
642
- # Copy depcomp to subdir because otherwise we won't find it if we're
643
- # using a relative directory.
644
- cp "$am_depcomp" conftest.dir
645
- cd conftest.dir
646
- # We will build objects and dependencies in a subdirectory because
647
- # it helps to detect inapplicable dependency modes. For instance
648
- # both Tru64's cc and ICC support -MD to output dependencies as a
649
- # side effect of compilation, but ICC will put the dependencies in
650
- # the current directory while Tru64 will put them in the object
651
- # directory.
652
- mkdir sub
653
-
654
- am_cv_$1_dependencies_compiler_type=none
655
- if test "$am_compiler_list" = ""; then
656
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
657
- fi
658
- am__universal=false
659
- m4_case([$1], [CC],
660
- [case " $depcc " in #(
661
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
662
- esac],
663
- [CXX],
664
- [case " $depcc " in #(
665
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
666
- esac])
667
+dnl
668
+dnl We go to great lengths to make sure that aclocal won't
669
+dnl try to pull in the installed version of these macros
670
+dnl when running aclocal in the glib directory.
671
+dnl
672
+m4_copy([AC_DEFUN],[glib_DEFUN])
673
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
674
+dnl
675
+dnl At the end, if we're not within glib, we'll define the public
676
+dnl definitions in terms of our private definitions.
677
+dnl
678
679
- for depmode in $am_compiler_list; do
680
- # Setup a source with many dependencies, because some compilers
681
- # like to wrap large dependency lists on column 80 (with \), and
682
- # we should not choose a depcomp mode which is confused by this.
683
- #
684
- # We need to recreate these files for each test, as the compiler may
685
- # overwrite some of them when testing with obscure command lines.
686
- # This happens at least with the AIX C compiler.
687
- : > sub/conftest.c
688
- for i in 1 2 3 4 5 6; do
689
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
690
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
691
- # Solaris 8's {/usr,}/bin/sh.
692
- touch sub/conftst$i.h
693
- done
694
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
695
+# GLIB_LC_MESSAGES
696
+#--------------------
697
+glib_DEFUN([GLIB_LC_MESSAGES],
698
+ [AC_CHECK_HEADERS([locale.h])
699
+ if test $ac_cv_header_locale_h = yes; then
700
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
701
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
702
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
703
+ if test $am_cv_val_LC_MESSAGES = yes; then
704
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
705
+ [Define if your <locale.h> file defines LC_MESSAGES.])
706
+ fi
707
+ fi])
708
709
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
710
- # mode. It turns out that the SunPro C++ compiler does not properly
711
- # handle `-M -o', and we need to detect this. Also, some Intel
712
- # versions had trouble with output in subdirs
713
- am__obj=sub/conftest.${OBJEXT-o}
714
- am__minus_obj="-o $am__obj"
715
- case $depmode in
716
- gcc)
717
- # This depmode causes a compiler race in universal mode.
718
- test "$am__universal" = false || continue
719
- ;;
720
- nosideeffect)
721
- # after this tag, mechanisms are not by side-effect, so they'll
722
- # only be used when explicitly requested
723
- if test "x$enable_dependency_tracking" = xyes; then
724
- continue
725
- else
726
+# GLIB_PATH_PROG_WITH_TEST
727
+#----------------------------
728
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
729
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
730
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
731
+[# Extract the first word of "$2", so it can be a program name with args.
732
+set dummy $2; ac_word=[$]2
733
+AC_MSG_CHECKING([for $ac_word])
734
+AC_CACHE_VAL(ac_cv_path_$1,
735
+[case "[$]$1" in
736
+ /*)
737
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
738
+ ;;
739
+ *)
740
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
741
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
742
+ test -z "$ac_dir" && ac_dir=.
743
+ if test -f $ac_dir/$ac_word; then
744
+ if [$3]; then
745
+ ac_cv_path_$1="$ac_dir/$ac_word"
746
break
747
fi
748
- ;;
749
- msvisualcpp | msvcmsys)
750
- # This compiler won't grok `-c -o', but also, the minuso test has
751
- # not run yet. These depmodes are late enough in the game, and
752
- # so weak that their functioning should not be impacted.
753
- am__obj=conftest.${OBJEXT-o}
754
- am__minus_obj=
755
- ;;
756
- none) break ;;
757
- esac
758
- if depmode=$depmode \
759
- source=sub/conftest.c object=$am__obj \
760
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
761
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
762
- >/dev/null 2>conftest.err &&
763
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
764
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
765
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
766
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
767
- # icc doesn't choke on unknown options, it will just issue warnings
768
- # or remarks (even with -Werror). So we grep stderr for any message
769
- # that says an option was ignored or not supported.
770
- # When given -MP, icc 7.0 and 7.1 complain thusly:
771
- # icc: Command line warning: ignoring option '-M'; no argument required
772
- # The diagnosis changed in icc 8.0:
773
- # icc: Command line remark: option '-MP' not supported
774
- if (grep 'ignoring option' conftest.err ||
775
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
776
- am_cv_$1_dependencies_compiler_type=$depmode
777
- break
778
- fi
779
fi
780
done
781
-
782
- cd ..
783
- rm -rf conftest.dir
784
+ IFS="$ac_save_ifs"
785
+dnl If no 4th arg is given, leave the cache variable unset,
786
+dnl so AC_PATH_PROGS will keep looking.
787
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
788
+])dnl
789
+ ;;
790
+esac])dnl
791
+$1="$ac_cv_path_$1"
792
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
793
+ AC_MSG_RESULT([$]$1)
794
else
795
- am_cv_$1_dependencies_compiler_type=none
796
+ AC_MSG_RESULT(no)
797
fi
798
-])
799
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
800
-AM_CONDITIONAL([am__fastdep$1], [
801
- test "x$enable_dependency_tracking" != xno \
802
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
803
+AC_SUBST($1)dnl
804
])
805
806
+# GLIB_WITH_NLS
807
+#-----------------
808
+glib_DEFUN([GLIB_WITH_NLS],
809
+ dnl NLS is obligatory
810
+ [USE_NLS=yes
811
+ AC_SUBST(USE_NLS)
812
813
-# AM_SET_DEPDIR
814
-# -------------
815
-# Choose a directory name for dependency files.
816
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
817
-AC_DEFUN([AM_SET_DEPDIR],
818
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
819
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
820
-])
821
+ gt_cv_have_gettext=no
822
823
+ CATOBJEXT=NONE
824
+ XGETTEXT=:
825
+ INTLLIBS=
826
827
-# AM_DEP_TRACK
828
-# ------------
829
-AC_DEFUN([AM_DEP_TRACK],
830
-[AC_ARG_ENABLE(dependency-tracking,
831
-[ --disable-dependency-tracking speeds up one-time build
832
- --enable-dependency-tracking do not reject slow dependency extractors])
833
-if test "x$enable_dependency_tracking" != xno; then
834
- am_depcomp="$ac_aux_dir/depcomp"
835
- AMDEPBACKSLASH='\'
836
-fi
837
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
838
-AC_SUBST([AMDEPBACKSLASH])dnl
839
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
840
-])
841
-
842
-# Generate code to set up dependency tracking. -*- Autoconf -*-
843
-
844
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
845
-# Free Software Foundation, Inc.
846
-#
847
-# This file is free software; the Free Software Foundation
848
-# gives unlimited permission to copy and/or distribute it,
849
-# with or without modifications, as long as this notice is preserved.
850
-
851
-#serial 5
852
+ AC_CHECK_HEADER(libintl.h,
853
+ [gt_cv_func_dgettext_libintl="no"
854
+ libintl_extra_libs=""
855
856
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
857
-# ------------------------------
858
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
859
-[{
860
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
861
- # are listed without --file. Let's play safe and only enable the eval
862
- # if we detect the quoting.
863
- case $CONFIG_FILES in
864
- *\'*) eval set x "$CONFIG_FILES" ;;
865
- *) set x $CONFIG_FILES ;;
866
- esac
867
- shift
868
- for mf
869
- do
870
- # Strip MF so we end up with the name of the file.
871
- mf=`echo "$mf" | sed -e 's/:.*$//'`
872
- # Check whether this is an Automake generated Makefile or not.
873
- # We used to match only the files named `Makefile.in', but
874
- # some people rename them; so instead we look at the file content.
875
- # Grep'ing the first line is not enough: some people post-process
876
- # each Makefile.in and add a new line on top of each file to say so.
877
- # Grep'ing the whole file is not good either: AIX grep has a line
878
- # limit of 2048, but all sed's we know have understand at least 4000.
879
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
880
- dirpart=`AS_DIRNAME("$mf")`
881
- else
882
- continue
883
- fi
884
- # Extract the definition of DEPDIR, am__include, and am__quote
885
- # from the Makefile without running `make'.
886
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
887
- test -z "$DEPDIR" && continue
888
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
889
- test -z "am__include" && continue
890
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
891
- # When using ansi2knr, U may be empty or an underscore; expand it
892
- U=`sed -n 's/^U = //p' < "$mf"`
893
- # Find all dependency output files, they are included files with
894
- # $(DEPDIR) in their names. We invoke sed twice because it is the
895
- # simplest approach to changing $(DEPDIR) to its actual value in the
896
- # expansion.
897
- for file in `sed -n "
898
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
899
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
900
- # Make sure the directory exists.
901
- test -f "$dirpart/$file" && continue
902
- fdir=`AS_DIRNAME(["$file"])`
903
- AS_MKDIR_P([$dirpart/$fdir])
904
- # echo "creating $dirpart/$file"
905
- echo '# dummy' > "$dirpart/$file"
906
- done
907
- done
908
-}
909
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
910
+ #
911
+ # First check in libc
912
+ #
913
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
914
+ [AC_TRY_LINK([
915
+#include <libintl.h>
916
+],
917
+ [return !ngettext ("","", 1)],
918
+ gt_cv_func_ngettext_libc=yes,
919
+ gt_cv_func_ngettext_libc=no)
920
+ ])
921
+
922
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
923
+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
924
+ [AC_TRY_LINK([
925
+#include <libintl.h>
926
+],
927
+ [return !dgettext ("","")],
928
+ gt_cv_func_dgettext_libc=yes,
929
+ gt_cv_func_dgettext_libc=no)
930
+ ])
931
+ fi
932
+
933
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
934
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
935
+ fi
936
937
+ #
938
+ # If we don't have everything we want, check in libintl
939
+ #
940
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
941
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
942
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
943
+
944
+ AC_CHECK_LIB(intl, bindtextdomain,
945
+ [AC_CHECK_LIB(intl, ngettext,
946
+ [AC_CHECK_LIB(intl, dgettext,
947
+ gt_cv_func_dgettext_libintl=yes)])])
948
949
-# AM_OUTPUT_DEPENDENCY_COMMANDS
950
-# -----------------------------
951
-# This macro should only be invoked once -- use via AC_REQUIRE.
952
-#
953
-# This code is only required when automatic dependency tracking
954
-# is enabled. FIXME. This creates each `.P' file that we will
955
-# need in order to bootstrap the dependency handling code.
956
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
957
-[AC_CONFIG_COMMANDS([depfiles],
958
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
959
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
960
-])
961
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
962
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
963
+ AC_MSG_RESULT([])
964
+ AC_CHECK_LIB(intl, ngettext,
965
+ [AC_CHECK_LIB(intl, dcgettext,
966
+ [gt_cv_func_dgettext_libintl=yes
967
+ libintl_extra_libs=-liconv],
968
+ :,-liconv)],
969
+ :,-liconv)
970
+ fi
971
972
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
973
-# Free Software Foundation, Inc.
974
-#
975
-# This file is free software; the Free Software Foundation
976
-# gives unlimited permission to copy and/or distribute it,
977
-# with or without modifications, as long as this notice is preserved.
978
+ #
979
+ # If we found libintl, then check in it for bind_textdomain_codeset();
980
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
981
+ # and both have dgettext and ngettext
982
+ #
983
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
984
+ glib_save_LIBS="$LIBS"
985
+ LIBS="$LIBS -lintl $libintl_extra_libs"
986
+ unset ac_cv_func_bind_textdomain_codeset
987
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
988
+ LIBS="$glib_save_LIBS"
989
990
-# serial 8
991
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
992
+ gt_cv_func_dgettext_libc=no
993
+ else
994
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
995
+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
996
+ gt_cv_func_dgettext_libintl=no
997
+ fi
998
+ fi
999
+ fi
1000
+ fi
1001
1002
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
1003
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
1004
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
1005
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
1006
+ gt_cv_have_gettext=yes
1007
+ fi
1008
+
1009
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
1010
+ INTLLIBS="-lintl $libintl_extra_libs"
1011
+ fi
1012
+
1013
+ if test "$gt_cv_have_gettext" = "yes"; then
1014
+ AC_DEFINE(HAVE_GETTEXT,1,
1015
+ [Define if the GNU gettext() function is already present or preinstalled.])
1016
+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
1017
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
1018
+ if test "$MSGFMT" != "no"; then
1019
+ glib_save_LIBS="$LIBS"
1020
+ LIBS="$LIBS $INTLLIBS"
1021
+ AC_CHECK_FUNCS(dcgettext)
1022
+ MSGFMT_OPTS=
1023
+ AC_MSG_CHECKING([if msgfmt accepts -c])
1024
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
1025
+msgid ""
1026
+msgstr ""
1027
+"Content-Type: text/plain; charset=UTF-8\n"
1028
+"Project-Id-Version: test 1.0\n"
1029
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
1030
+"Last-Translator: test <foo@bar.xx>\n"
1031
+"Language-Team: C <LL@li.org>\n"
1032
+"MIME-Version: 1.0\n"
1033
+"Content-Transfer-Encoding: 8bit\n"
1034
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
1035
+ AC_SUBST(MSGFMT_OPTS)
1036
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
1037
+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
1038
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
1039
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
1040
+ return _nl_msg_cat_cntr],
1041
+ [CATOBJEXT=.gmo
1042
+ DATADIRNAME=share],
1043
+ [case $host in
1044
+ *-*-solaris*)
1045
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
1046
+ dnl GNU format message catalog is always supported,
1047
+ dnl since both are added to the libc all together.
1048
+ dnl Hence, we'd like to go with DATADIRNAME=share and
1049
+ dnl and CATOBJEXT=.gmo in this case.
1050
+ AC_CHECK_FUNC(bind_textdomain_codeset,
1051
+ [CATOBJEXT=.gmo
1052
+ DATADIRNAME=share],
1053
+ [CATOBJEXT=.mo
1054
+ DATADIRNAME=lib])
1055
+ ;;
1056
+ *)
1057
+ CATOBJEXT=.mo
1058
+ DATADIRNAME=lib
1059
+ ;;
1060
+ esac])
1061
+ LIBS="$glib_save_LIBS"
1062
+ INSTOBJEXT=.mo
1063
+ else
1064
+ gt_cv_have_gettext=no
1065
+ fi
1066
+ fi
1067
+ ])
1068
1069
-# Do all the work for Automake. -*- Autoconf -*-
1070
+ if test "$gt_cv_have_gettext" = "yes" ; then
1071
+ AC_DEFINE(ENABLE_NLS, 1,
1072
+ [always defined to indicate that i18n is enabled])
1073
+ fi
1074
1075
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1076
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
1077
-#
1078
-# This file is free software; the Free Software Foundation
1079
-# gives unlimited permission to copy and/or distribute it,
1080
-# with or without modifications, as long as this notice is preserved.
1081
+ dnl Test whether we really found GNU xgettext.
1082
+ if test "$XGETTEXT" != ":"; then
1083
+ dnl If it is not GNU xgettext we define it as : so that the
1084
+ dnl Makefiles still can work.
1085
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
1086
+ : ;
1087
+ else
1088
+ AC_MSG_RESULT(
1089
+ [found xgettext program is not GNU xgettext; ignore it])
1090
+ XGETTEXT=":"
1091
+ fi
1092
+ fi
1093
1094
-# serial 16
1095
+ # We need to process the po/ directory.
1096
+ POSUB=po
1097
1098
-# This macro actually does too much. Some checks are only needed if
1099
-# your package does certain things. But this isn't really a big deal.
1100
+ AC_OUTPUT_COMMANDS(
1101
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
1102
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
1103
+ esac])
1104
1105
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
1106
-# AM_INIT_AUTOMAKE([OPTIONS])
1107
-# -----------------------------------------------
1108
-# The call with PACKAGE and VERSION arguments is the old style
1109
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
1110
-# and VERSION should now be passed to AC_INIT and removed from
1111
-# the call to AM_INIT_AUTOMAKE.
1112
-# We support both call styles for the transition. After
1113
-# the next Automake release, Autoconf can make the AC_INIT
1114
-# arguments mandatory, and then we can depend on a new Autoconf
1115
-# release and drop the old call support.
1116
-AC_DEFUN([AM_INIT_AUTOMAKE],
1117
-[AC_PREREQ([2.62])dnl
1118
-dnl Autoconf wants to disallow AM_ names. We explicitly allow
1119
-dnl the ones we care about.
1120
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1121
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
1122
-AC_REQUIRE([AC_PROG_INSTALL])dnl
1123
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
1124
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
1125
- # is not polluted with repeated "-I."
1126
- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
1127
- # test to see if srcdir already configured
1128
- if test -f $srcdir/config.status; then
1129
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
1130
- fi
1131
-fi
1132
-
1133
-# test whether we have cygpath
1134
-if test -z "$CYGPATH_W"; then
1135
- if (cygpath --version) >/dev/null 2>/dev/null; then
1136
- CYGPATH_W='cygpath -w'
1137
- else
1138
- CYGPATH_W=echo
1139
- fi
1140
-fi
1141
-AC_SUBST([CYGPATH_W])
1142
-
1143
-# Define the identity of the package.
1144
-dnl Distinguish between old-style and new-style calls.
1145
-m4_ifval([$2],
1146
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1147
- AC_SUBST([PACKAGE], [$1])dnl
1148
- AC_SUBST([VERSION], [$2])],
1149
-[_AM_SET_OPTIONS([$1])dnl
1150
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1151
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
1152
- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1153
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1154
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1155
-
1156
-_AM_IF_OPTION([no-define],,
1157
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1158
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
1159
+ dnl These rules are solely for the distribution goal. While doing this
1160
+ dnl we only have to keep exactly one list of the available catalogs
1161
+ dnl in configure.in.
1162
+ for lang in $ALL_LINGUAS; do
1163
+ GMOFILES="$GMOFILES $lang.gmo"
1164
+ POFILES="$POFILES $lang.po"
1165
+ done
1166
1167
-# Some tools Automake needs.
1168
-AC_REQUIRE([AM_SANITY_CHECK])dnl
1169
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
1170
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1171
-AM_MISSING_PROG(AUTOCONF, autoconf)
1172
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1173
-AM_MISSING_PROG(AUTOHEADER, autoheader)
1174
-AM_MISSING_PROG(MAKEINFO, makeinfo)
1175
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1176
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1177
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
1178
-# We need awk for the "check" target. The system "awk" is bad on
1179
-# some platforms.
1180
-AC_REQUIRE([AC_PROG_AWK])dnl
1181
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1182
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1183
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
1184
- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
1185
- [_AM_PROG_TAR([v7])])])
1186
-_AM_IF_OPTION([no-dependencies],,
1187
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
1188
- [_AM_DEPENDENCIES(CC)],
1189
- [define([AC_PROG_CC],
1190
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
1191
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
1192
- [_AM_DEPENDENCIES(CXX)],
1193
- [define([AC_PROG_CXX],
1194
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
1195
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1196
- [_AM_DEPENDENCIES(OBJC)],
1197
- [define([AC_PROG_OBJC],
1198
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
1199
-])
1200
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
1201
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
1202
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
1203
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
1204
-AC_CONFIG_COMMANDS_PRE(dnl
1205
-[m4_provide_if([_AM_COMPILER_EXEEXT],
1206
- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1207
-])
1208
+ dnl Make all variables we use known to autoconf.
1209
+ AC_SUBST(CATALOGS)
1210
+ AC_SUBST(CATOBJEXT)
1211
+ AC_SUBST(DATADIRNAME)
1212
+ AC_SUBST(GMOFILES)
1213
+ AC_SUBST(INSTOBJEXT)
1214
+ AC_SUBST(INTLLIBS)
1215
+ AC_SUBST(PO_IN_DATADIR_TRUE)
1216
+ AC_SUBST(PO_IN_DATADIR_FALSE)
1217
+ AC_SUBST(POFILES)
1218
+ AC_SUBST(POSUB)
1219
+ ])
1220
1221
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1222
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1223
-dnl mangled by Autoconf and run in a shell conditional statement.
1224
-m4_define([_AC_COMPILER_EXEEXT],
1225
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
1226
+# AM_GLIB_GNU_GETTEXT
1227
+# -------------------
1228
+# Do checks necessary for use of gettext. If a suitable implementation
1229
+# of gettext is found in either in libintl or in the C library,
1230
+# it will set INTLLIBS to the libraries needed for use of gettext
1231
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
1232
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
1233
+# on various variables needed by the Makefile.in.in installed by
1234
+# glib-gettextize.
1235
+dnl
1236
+glib_DEFUN([GLIB_GNU_GETTEXT],
1237
+ [AC_REQUIRE([AC_PROG_CC])dnl
1238
+ AC_REQUIRE([AC_HEADER_STDC])dnl
1239
+
1240
+ GLIB_LC_MESSAGES
1241
+ GLIB_WITH_NLS
1242
1243
+ if test "$gt_cv_have_gettext" = "yes"; then
1244
+ if test "x$ALL_LINGUAS" = "x"; then
1245
+ LINGUAS=
1246
+ else
1247
+ AC_MSG_CHECKING(for catalogs to be installed)
1248
+ NEW_LINGUAS=
1249
+ for presentlang in $ALL_LINGUAS; do
1250
+ useit=no
1251
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
1252
+ desiredlanguages="$LINGUAS"
1253
+ else
1254
+ desiredlanguages="$ALL_LINGUAS"
1255
+ fi
1256
+ for desiredlang in $desiredlanguages; do
1257
+ # Use the presentlang catalog if desiredlang is
1258
+ # a. equal to presentlang, or
1259
+ # b. a variant of presentlang (because in this case,
1260
+ # presentlang can be used as a fallback for messages
1261
+ # which are not translated in the desiredlang catalog).
1262
+ case "$desiredlang" in
1263
+ "$presentlang"*) useit=yes;;
1264
+ esac
1265
+ done
1266
+ if test $useit = yes; then
1267
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
1268
+ fi
1269
+ done
1270
+ LINGUAS=$NEW_LINGUAS
1271
+ AC_MSG_RESULT($LINGUAS)
1272
+ fi
1273
1274
-# When config.status generates a header, we must update the stamp-h file.
1275
-# This file resides in the same directory as the config header
1276
-# that is generated. The stamp files are numbered to have different names.
1277
+ dnl Construct list of names of catalog files to be constructed.
1278
+ if test -n "$LINGUAS"; then
1279
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
1280
+ fi
1281
+ fi
1282
1283
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
1284
-# loop where config.status creates the headers, so we can generate
1285
-# our stamp files there.
1286
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
1287
-[# Compute $1's index in $config_headers.
1288
-_am_arg=$1
1289
-_am_stamp_count=1
1290
-for _am_header in $config_headers :; do
1291
- case $_am_header in
1292
- $_am_arg | $_am_arg:* )
1293
- break ;;
1294
- * )
1295
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
1296
- esac
1297
-done
1298
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1299
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
1300
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
1301
+ dnl Try to locate is.
1302
+ MKINSTALLDIRS=
1303
+ if test -n "$ac_aux_dir"; then
1304
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
1305
+ fi
1306
+ if test -z "$MKINSTALLDIRS"; then
1307
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
1308
+ fi
1309
+ AC_SUBST(MKINSTALLDIRS)
1310
1311
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
1312
-#
1313
-# This file is free software; the Free Software Foundation
1314
-# gives unlimited permission to copy and/or distribute it,
1315
-# with or without modifications, as long as this notice is preserved.
1316
+ dnl Generate list of files to be processed by xgettext which will
1317
+ dnl be included in po/Makefile.
1318
+ test -d po || mkdir po
1319
+ if test "x$srcdir" != "x."; then
1320
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
1321
+ posrcprefix="$srcdir/"
1322
+ else
1323
+ posrcprefix="../$srcdir/"
1324
+ fi
1325
+ else
1326
+ posrcprefix="../"
1327
+ fi
1328
+ rm -f po/POTFILES
1329
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
1330
+ < $srcdir/po/POTFILES.in > po/POTFILES
1331
+ ])
1332
1333
-# AM_PROG_INSTALL_SH
1334
-# ------------------
1335
-# Define $install_sh.
1336
-AC_DEFUN([AM_PROG_INSTALL_SH],
1337
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1338
-if test x"${install_sh}" != xset; then
1339
- case $am_aux_dir in
1340
- *\ * | *\ *)
1341
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
1342
- *)
1343
- install_sh="\${SHELL} $am_aux_dir/install-sh"
1344
- esac
1345
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
1346
+# -------------------------------
1347
+# Define VARIABLE to the location where catalog files will
1348
+# be installed by po/Makefile.
1349
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
1350
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
1351
+glib_save_prefix="$prefix"
1352
+glib_save_exec_prefix="$exec_prefix"
1353
+glib_save_datarootdir="$datarootdir"
1354
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
1355
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
1356
+datarootdir=`eval echo "${datarootdir}"`
1357
+if test "x$CATOBJEXT" = "x.mo" ; then
1358
+ localedir=`eval echo "${libdir}/locale"`
1359
+else
1360
+ localedir=`eval echo "${datadir}/locale"`
1361
fi
1362
-AC_SUBST(install_sh)])
1363
+prefix="$glib_save_prefix"
1364
+exec_prefix="$glib_save_exec_prefix"
1365
+datarootdir="$glib_save_datarootdir"
1366
+AC_DEFINE_UNQUOTED($1, "$localedir",
1367
+ [Define the location where the catalogs will be installed])
1368
+])
1369
1370
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
1371
-#
1372
-# This file is free software; the Free Software Foundation
1373
-# gives unlimited permission to copy and/or distribute it,
1374
-# with or without modifications, as long as this notice is preserved.
1375
-
1376
-# serial 2
1377
-
1378
-# Check whether the underlying file-system supports filenames
1379
-# with a leading dot. For instance MS-DOS doesn't.
1380
-AC_DEFUN([AM_SET_LEADING_DOT],
1381
-[rm -rf .tst 2>/dev/null
1382
-mkdir .tst 2>/dev/null
1383
-if test -d .tst; then
1384
- am__leading_dot=.
1385
-else
1386
- am__leading_dot=_
1387
-fi
1388
-rmdir .tst 2>/dev/null
1389
-AC_SUBST([am__leading_dot])])
1390
-
1391
-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
1392
-# From Jim Meyering
1393
-
1394
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
1395
-# Free Software Foundation, Inc.
1396
-#
1397
-# This file is free software; the Free Software Foundation
1398
-# gives unlimited permission to copy and/or distribute it,
1399
-# with or without modifications, as long as this notice is preserved.
1400
+dnl
1401
+dnl Now the definitions that aclocal will find
1402
+dnl
1403
+ifdef(glib_configure_in,[],[
1404
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
1405
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
1406
+])dnl
1407
1408
-# serial 5
1409
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
1410
+#
1411
+# Create a temporary file with TEST-FILE as its contents and pass the
1412
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
1413
+# 0 and perform ACTION-IF-FAIL for any other exit status.
1414
+AC_DEFUN([GLIB_RUN_PROG],
1415
+[cat >conftest.foo <<_ACEOF
1416
+$2
1417
+_ACEOF
1418
+if AC_RUN_LOG([$1 conftest.foo]); then
1419
+ m4_ifval([$3], [$3], [:])
1420
+m4_ifvaln([$4], [else $4])dnl
1421
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
1422
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
1423
+fi])
1424
1425
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
1426
-# ----------------------------------
1427
-# Control maintainer-specific portions of Makefiles.
1428
-# Default is to disable them, unless `enable' is passed literally.
1429
-# For symmetry, `disable' may be passed as well. Anyway, the user
1430
-# can override the default with the --enable/--disable switch.
1431
-AC_DEFUN([AM_MAINTAINER_MODE],
1432
-[m4_case(m4_default([$1], [disable]),
1433
- [enable], [m4_define([am_maintainer_other], [disable])],
1434
- [disable], [m4_define([am_maintainer_other], [enable])],
1435
- [m4_define([am_maintainer_other], [enable])
1436
- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
1437
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
1438
- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
1439
- AC_ARG_ENABLE([maintainer-mode],
1440
-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
1441
- (and sometimes confusing) to the casual installer],
1442
- [USE_MAINTAINER_MODE=$enableval],
1443
- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
1444
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
1445
- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
1446
- MAINT=$MAINTAINER_MODE_TRUE
1447
- AC_SUBST([MAINT])dnl
1448
-]
1449
-)
1450
1451
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
1452
+# gnome-common.m4
1453
+#
1454
1455
-# Check to see how 'make' treats includes. -*- Autoconf -*-
1456
+dnl GNOME_COMMON_INIT
1457
1458
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
1459
-#
1460
-# This file is free software; the Free Software Foundation
1461
-# gives unlimited permission to copy and/or distribute it,
1462
-# with or without modifications, as long as this notice is preserved.
1463
+AC_DEFUN([GNOME_COMMON_INIT],
1464
+[
1465
+ dnl this macro should come after AC_CONFIG_MACRO_DIR
1466
+ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
1467
1468
-# serial 4
1469
+ dnl ensure that when the Automake generated makefile calls aclocal,
1470
+ dnl it honours the $ACLOCAL_FLAGS environment variable
1471
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
1472
+ if test -n "$ac_macro_dir"; then
1473
+ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
1474
+ fi
1475
1476
-# AM_MAKE_INCLUDE()
1477
-# -----------------
1478
-# Check to see how make treats includes.
1479
-AC_DEFUN([AM_MAKE_INCLUDE],
1480
-[am_make=${MAKE-make}
1481
-cat > confinc << 'END'
1482
-am__doit:
1483
- @echo this is the am__doit target
1484
-.PHONY: am__doit
1485
-END
1486
-# If we don't find an include directive, just comment out the code.
1487
-AC_MSG_CHECKING([for style of include used by $am_make])
1488
-am__include="#"
1489
-am__quote=
1490
-_am_result=none
1491
-# First try GNU make style include.
1492
-echo "include confinc" > confmf
1493
-# Ignore all kinds of additional output from `make'.
1494
-case `$am_make -s -f confmf 2> /dev/null` in #(
1495
-*the\ am__doit\ target*)
1496
- am__include=include
1497
- am__quote=
1498
- _am_result=GNU
1499
- ;;
1500
-esac
1501
-# Now try BSD make style include.
1502
-if test "$am__include" = "#"; then
1503
- echo '.include "confinc"' > confmf
1504
- case `$am_make -s -f confmf 2> /dev/null` in #(
1505
- *the\ am__doit\ target*)
1506
- am__include=.include
1507
- am__quote="\""
1508
- _am_result=BSD
1509
- ;;
1510
- esac
1511
-fi
1512
-AC_SUBST([am__include])
1513
-AC_SUBST([am__quote])
1514
-AC_MSG_RESULT([$_am_result])
1515
-rm -f confinc confmf
1516
+ AC_SUBST([ACLOCAL_AMFLAGS])
1517
])
1518
1519
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
1520
-# Free Software Foundation, Inc.
1521
-#
1522
-# This file is free software; the Free Software Foundation
1523
-# gives unlimited permission to copy and/or distribute it,
1524
-# with or without modifications, as long as this notice is preserved.
1525
-
1526
-# serial 6
1527
+AC_DEFUN([GNOME_DEBUG_CHECK],
1528
+[
1529
+ AC_ARG_ENABLE([debug],
1530
+ AC_HELP_STRING([--enable-debug],
1531
+ [turn on debugging]),,
1532
+ [enable_debug=no])
1533
1534
-# AM_PROG_CC_C_O
1535
-# --------------
1536
-# Like AC_PROG_CC_C_O, but changed for automake.
1537
-AC_DEFUN([AM_PROG_CC_C_O],
1538
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
1539
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1540
-AC_REQUIRE_AUX_FILE([compile])dnl
1541
-# FIXME: we rely on the cache variable name because
1542
-# there is no other way.
1543
-set dummy $CC
1544
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
1545
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
1546
-if test "$am_t" != yes; then
1547
- # Losing compiler, so override with the script.
1548
- # FIXME: It is wrong to rewrite CC.
1549
- # But if we don't then we get into trouble of one sort or another.
1550
- # A longer-term fix would be to have automake use am__CC in this case,
1551
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1552
- CC="$am_aux_dir/compile $CC"
1553
-fi
1554
-dnl Make sure AC_PROG_CC is never called again, or it will override our
1555
-dnl setting of CC.
1556
-m4_define([AC_PROG_CC],
1557
- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
1558
+ if test x$enable_debug = xyes ; then
1559
+ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
1560
+ [Enable additional debugging at the expense of performance and size])
1561
+ fi
1562
])
1563
1564
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1565
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
1566
+dnl define DISABLE_DEPRECATED
1567
+dnl
1568
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
1569
+[
1570
+ AC_REQUIRE([AM_MAINTAINER_MODE])
1571
1572
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1573
-# Free Software Foundation, Inc.
1574
-#
1575
-# This file is free software; the Free Software Foundation
1576
-# gives unlimited permission to copy and/or distribute it,
1577
-# with or without modifications, as long as this notice is preserved.
1578
+ DISABLE_DEPRECATED=""
1579
+ if test $USE_MAINTAINER_MODE = yes; then
1580
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
1581
+ for DOMAIN in $DOMAINS; do
1582
+ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
1583
+ done
1584
+ fi
1585
1586
-# serial 6
1587
+ AC_SUBST(DISABLE_DEPRECATED)
1588
+])
1589
1590
-# AM_MISSING_PROG(NAME, PROGRAM)
1591
-# ------------------------------
1592
-AC_DEFUN([AM_MISSING_PROG],
1593
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
1594
-$1=${$1-"${am_missing_run}$2"}
1595
-AC_SUBST($1)])
1596
+dnl GNOME_COMPILE_WARNINGS
1597
+dnl Turn on many useful compiler warnings
1598
+dnl For now, only works on GCC
1599
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
1600
+ dnl ******************************
1601
+ dnl More compiler warnings
1602
+ dnl ******************************
1603
1604
+ AC_ARG_ENABLE(compile-warnings,
1605
+ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
1606
+ [Turn on compiler warnings]),,
1607
+ [enable_compile_warnings="m4_default([$1],[yes])"])
1608
1609
-# AM_MISSING_HAS_RUN
1610
-# ------------------
1611
-# Define MISSING if not defined so far and test if it supports --run.
1612
-# If it does, set am_missing_run to use it, otherwise, to nothing.
1613
-AC_DEFUN([AM_MISSING_HAS_RUN],
1614
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1615
-AC_REQUIRE_AUX_FILE([missing])dnl
1616
-if test x"${MISSING+set}" != xset; then
1617
- case $am_aux_dir in
1618
- *\ * | *\ *)
1619
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
1620
- *)
1621
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
1622
- esac
1623
-fi
1624
-# Use eval to expand $SHELL
1625
-if eval "$MISSING --run true"; then
1626
- am_missing_run="$MISSING --run "
1627
-else
1628
- am_missing_run=
1629
- AC_MSG_WARN([`missing' script is too old or missing])
1630
-fi
1631
-])
1632
+ warnCFLAGS=
1633
+ if test "x$GCC" != xyes; then
1634
+ enable_compile_warnings=no
1635
+ fi
1636
1637
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
1638
-#
1639
-# This file is free software; the Free Software Foundation
1640
-# gives unlimited permission to copy and/or distribute it,
1641
-# with or without modifications, as long as this notice is preserved.
1642
+ warning_flags=
1643
+ realsave_CFLAGS="$CFLAGS"
1644
1645
-# AM_PROG_MKDIR_P
1646
-# ---------------
1647
-# Check for `mkdir -p'.
1648
-AC_DEFUN([AM_PROG_MKDIR_P],
1649
-[AC_PREREQ([2.60])dnl
1650
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1651
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
1652
-dnl while keeping a definition of mkdir_p for backward compatibility.
1653
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1654
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1655
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
1656
-dnl adjustment using top_builddir (which is defined more often than
1657
-dnl MKDIR_P).
1658
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1659
-case $mkdir_p in
1660
- [[\\/$]]* | ?:[[\\/]]*) ;;
1661
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1662
-esac
1663
-])
1664
-
1665
-# Helper functions for option handling. -*- Autoconf -*-
1666
-
1667
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
1668
-#
1669
-# This file is free software; the Free Software Foundation
1670
-# gives unlimited permission to copy and/or distribute it,
1671
-# with or without modifications, as long as this notice is preserved.
1672
-
1673
-# serial 4
1674
+ case "$enable_compile_warnings" in
1675
+ no)
1676
+ warning_flags=
1677
+ ;;
1678
+ minimum)
1679
+ warning_flags="-Wall"
1680
+ ;;
1681
+ yes)
1682
+ warning_flags="-Wall -Wmissing-prototypes"
1683
+ ;;
1684
+ maximum|error)
1685
+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
1686
+ CFLAGS="$warning_flags $CFLAGS"
1687
+ for option in -Wno-sign-compare; do
1688
+ SAVE_CFLAGS="$CFLAGS"
1689
+ CFLAGS="$CFLAGS $option"
1690
+ AC_MSG_CHECKING([whether gcc understands $option])
1691
+ AC_TRY_COMPILE([], [],
1692
+ has_option=yes,
1693
+ has_option=no,)
1694
+ CFLAGS="$SAVE_CFLAGS"
1695
+ AC_MSG_RESULT($has_option)
1696
+ if test $has_option = yes; then
1697
+ warning_flags="$warning_flags $option"
1698
+ fi
1699
+ unset has_option
1700
+ unset SAVE_CFLAGS
1701
+ done
1702
+ unset option
1703
+ if test "$enable_compile_warnings" = "error" ; then
1704
+ warning_flags="$warning_flags -Werror"
1705
+ fi
1706
+ ;;
1707
+ *)
1708
+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
1709
+ ;;
1710
+ esac
1711
+ CFLAGS="$realsave_CFLAGS"
1712
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
1713
+ AC_MSG_RESULT($warning_flags)
1714
1715
-# _AM_MANGLE_OPTION(NAME)
1716
-# -----------------------
1717
-AC_DEFUN([_AM_MANGLE_OPTION],
1718
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1719
+ AC_ARG_ENABLE(iso-c,
1720
+ AC_HELP_STRING([--enable-iso-c],
1721
+ [Try to warn if code is not ISO C ]),,
1722
+ [enable_iso_c=no])
1723
1724
-# _AM_SET_OPTION(NAME)
1725
-# ------------------------------
1726
-# Set option NAME. Presently that only means defining a flag for this option.
1727
-AC_DEFUN([_AM_SET_OPTION],
1728
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1729
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
1730
+ complCFLAGS=
1731
+ if test "x$enable_iso_c" != "xno"; then
1732
+ if test "x$GCC" = "xyes"; then
1733
+ case " $CFLAGS " in
1734
+ *[\ \ ]-ansi[\ \ ]*) ;;
1735
+ *) complCFLAGS="$complCFLAGS -ansi" ;;
1736
+ esac
1737
+ case " $CFLAGS " in
1738
+ *[\ \ ]-pedantic[\ \ ]*) ;;
1739
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
1740
+ esac
1741
+ fi
1742
+ fi
1743
+ AC_MSG_RESULT($complCFLAGS)
1744
1745
-# _AM_SET_OPTIONS(OPTIONS)
1746
-# ----------------------------------
1747
-# OPTIONS is a space-separated list of Automake options.
1748
-AC_DEFUN([_AM_SET_OPTIONS],
1749
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1750
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
1751
+ AC_SUBST(WARN_CFLAGS)
1752
+])
1753
1754
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1755
-# -------------------------------------------
1756
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
1757
-AC_DEFUN([_AM_IF_OPTION],
1758
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1759
+dnl For C++, do basically the same thing.
1760
1761
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
1762
-# Free Software Foundation, Inc.
1763
-#
1764
-# This file is free software; the Free Software Foundation
1765
-# gives unlimited permission to copy and/or distribute it,
1766
-# with or without modifications, as long as this notice is preserved.
1767
+AC_DEFUN([GNOME_CXX_WARNINGS],[
1768
+ AC_ARG_ENABLE(cxx-warnings,
1769
+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
1770
+ [Turn on compiler warnings.]),,
1771
+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
1772
1773
-# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1774
-# ---------------------------------------------------------------------------
1775
-# Adds support for distributing Python modules and packages. To
1776
-# install modules, copy them to $(pythondir), using the python_PYTHON
1777
-# automake variable. To install a package with the same name as the
1778
-# automake package, install to $(pkgpythondir), or use the
1779
-# pkgpython_PYTHON automake variable.
1780
-#
1781
-# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
1782
-# locations to install python extension modules (shared libraries).
1783
-# Another macro is required to find the appropriate flags to compile
1784
-# extension modules.
1785
-#
1786
-# If your package is configured with a different prefix to python,
1787
-# users will have to add the install directory to the PYTHONPATH
1788
-# environment variable, or create a .pth file (see the python
1789
-# documentation for details).
1790
-#
1791
-# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
1792
-# cause an error if the version of python installed on the system
1793
-# doesn't meet the requirement. MINIMUM-VERSION should consist of
1794
-# numbers and dots only.
1795
-AC_DEFUN([AM_PATH_PYTHON],
1796
- [
1797
- dnl Find a Python interpreter. Python versions prior to 2.0 are not
1798
- dnl supported. (2.0 was released on October 16, 2000).
1799
- m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
1800
- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
1801
-python2.1 python2.0])
1802
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
1803
+ warnCXXFLAGS=
1804
+ if test "x$GXX" != xyes; then
1805
+ enable_cxx_warnings=no
1806
+ fi
1807
+ if test "x$enable_cxx_warnings" != "xno"; then
1808
+ if test "x$GXX" = "xyes"; then
1809
+ case " $CXXFLAGS " in
1810
+ *[\ \ ]-Wall[\ \ ]*) ;;
1811
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
1812
+ esac
1813
1814
- m4_if([$1],[],[
1815
- dnl No version check is needed.
1816
- # Find any Python interpreter.
1817
- if test -z "$PYTHON"; then
1818
- AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
1819
- fi
1820
- am_display_PYTHON=python
1821
- ], [
1822
- dnl A version check is needed.
1823
- if test -n "$PYTHON"; then
1824
- # If the user set $PYTHON, use it and don't search something else.
1825
- AC_MSG_CHECKING([whether $PYTHON version >= $1])
1826
- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
1827
- [AC_MSG_RESULT(yes)],
1828
- [AC_MSG_ERROR(too old)])
1829
- am_display_PYTHON=$PYTHON
1830
- else
1831
- # Otherwise, try each interpreter until we find one that satisfies
1832
- # VERSION.
1833
- AC_CACHE_CHECK([for a Python interpreter with version >= $1],
1834
- [am_cv_pathless_PYTHON],[
1835
- for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
1836
- test "$am_cv_pathless_PYTHON" = none && break
1837
- AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
1838
- done])
1839
- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
1840
- if test "$am_cv_pathless_PYTHON" = none; then
1841
- PYTHON=:
1842
- else
1843
- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
1844
+ ## -W is not all that useful. And it cannot be controlled
1845
+ ## with individual -Wno-xxx flags, unlike -Wall
1846
+ if test "x$enable_cxx_warnings" = "xyes"; then
1847
+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
1848
fi
1849
- am_display_PYTHON=$am_cv_pathless_PYTHON
1850
fi
1851
- ])
1852
-
1853
- if test "$PYTHON" = :; then
1854
- dnl Run any user-specified action, or abort.
1855
- m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
1856
- else
1857
+ fi
1858
+ AC_MSG_RESULT($warnCXXFLAGS)
1859
1860
- dnl Query Python for its version number. Getting [:3] seems to be
1861
- dnl the best way to do this; it's what "site.py" does in the standard
1862
- dnl library.
1863
+ AC_ARG_ENABLE(iso-cxx,
1864
+ AC_HELP_STRING([--enable-iso-cxx],
1865
+ [Try to warn if code is not ISO C++ ]),,
1866
+ [enable_iso_cxx=no])
1867
1868
- AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
1869
- [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
1870
- AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
1871
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
1872
+ complCXXFLAGS=
1873
+ if test "x$enable_iso_cxx" != "xno"; then
1874
+ if test "x$GXX" = "xyes"; then
1875
+ case " $CXXFLAGS " in
1876
+ *[\ \ ]-ansi[\ \ ]*) ;;
1877
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
1878
+ esac
1879
1880
- dnl Use the values of $prefix and $exec_prefix for the corresponding
1881
- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
1882
- dnl distinct variables so they can be overridden if need be. However,
1883
- dnl general consensus is that you shouldn't need this ability.
1884
+ case " $CXXFLAGS " in
1885
+ *[\ \ ]-pedantic[\ \ ]*) ;;
1886
+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
1887
+ esac
1888
+ fi
1889
+ fi
1890
+ AC_MSG_RESULT($complCXXFLAGS)
1891
1892
- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
1893
- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
1894
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
1895
+ AC_SUBST(WARN_CXXFLAGS)
1896
+])
1897
1898
- dnl At times (like when building shared libraries) you may want
1899
- dnl to know which OS platform Python thinks this is.
1900
+# nls.m4 serial 3 (gettext-0.15)
1901
+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
1902
+dnl This file is free software; the Free Software Foundation
1903
+dnl gives unlimited permission to copy and/or distribute it,
1904
+dnl with or without modifications, as long as this notice is preserved.
1905
+dnl
1906
+dnl This file can can be used in projects which are not available under
1907
+dnl the GNU General Public License or the GNU Library General Public
1908
+dnl License but which still want to provide support for the GNU gettext
1909
+dnl functionality.
1910
+dnl Please note that the actual code of the GNU gettext library is covered
1911
+dnl by the GNU Library General Public License, and the rest of the GNU
1912
+dnl gettext package package is covered by the GNU General Public License.
1913
+dnl They are *not* in the public domain.
1914
1915
- AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
1916
- [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
1917
- AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
1918
+dnl Authors:
1919
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1920
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1921
1922
+AC_PREREQ(2.50)
1923
1924
- dnl Set up 4 directories:
1925
+AC_DEFUN([AM_NLS],
1926
+[
1927
+ AC_MSG_CHECKING([whether NLS is requested])
1928
+ dnl Default is enabled NLS
1929
+ AC_ARG_ENABLE(nls,
1930
+ [ --disable-nls do not use Native Language Support],
1931
+ USE_NLS=$enableval, USE_NLS=yes)
1932
+ AC_MSG_RESULT($USE_NLS)
1933
+ AC_SUBST(USE_NLS)
1934
+])
1935
1936
- dnl pythondir -- where to install python scripts. This is the
1937
- dnl site-packages directory, not the python standard library
1938
- dnl directory like in previous automake betas. This behavior
1939
- dnl is more consistent with lispdir.m4 for example.
1940
- dnl Query distutils for this directory. distutils does not exist in
1941
- dnl Python 1.5, so we fall back to the hardcoded directory if it
1942
- dnl doesn't work.
1943
- AC_CACHE_CHECK([for $am_display_PYTHON script directory],
1944
- [am_cv_python_pythondir],
1945
- [if test "x$prefix" = xNONE
1946
- then
1947
- am_py_prefix=$ac_default_prefix
1948
- else
1949
- am_py_prefix=$prefix
1950
- fi
1951
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
1952
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
1953
- case $am_cv_python_pythondir in
1954
- $am_py_prefix*)
1955
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
1956
- am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
1957
- ;;
1958
- esac
1959
- ])
1960
- AC_SUBST([pythondir], [$am_cv_python_pythondir])
1961
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1962
+#
1963
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1964
+#
1965
+# This program is free software; you can redistribute it and/or modify
1966
+# it under the terms of the GNU General Public License as published by
1967
+# the Free Software Foundation; either version 2 of the License, or
1968
+# (at your option) any later version.
1969
+#
1970
+# This program is distributed in the hope that it will be useful, but
1971
+# WITHOUT ANY WARRANTY; without even the implied warranty of
1972
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1973
+# General Public License for more details.
1974
+#
1975
+# You should have received a copy of the GNU General Public License
1976
+# along with this program; if not, write to the Free Software
1977
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1978
+#
1979
+# As a special exception to the GNU General Public License, if you
1980
+# distribute this file as part of a program that contains a
1981
+# configuration script generated by Autoconf, you may include it under
1982
+# the same distribution terms that you use for the rest of that program.
1983
1984
- dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
1985
- dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
1986
- dnl more consistent with the rest of automake.
1987
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1988
+# ----------------------------------
1989
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
1990
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1991
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
1992
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
1993
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1994
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
1995
+fi
1996
+if test -n "$PKG_CONFIG"; then
1997
+ _pkg_min_version=m4_default([$1], [0.9.0])
1998
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
1999
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
2000
+ AC_MSG_RESULT([yes])
2001
+ else
2002
+ AC_MSG_RESULT([no])
2003
+ PKG_CONFIG=""
2004
+ fi
2005
+
2006
+fi[]dnl
2007
+])# PKG_PROG_PKG_CONFIG
2008
2009
- AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
2010
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
2011
+#
2012
+# Check to see whether a particular set of modules exists. Similar
2013
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
2014
+#
2015
+#
2016
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
2017
+# this or PKG_CHECK_MODULES is called, or make sure to call
2018
+# PKG_CHECK_EXISTS manually
2019
+# --------------------------------------------------------------
2020
+AC_DEFUN([PKG_CHECK_EXISTS],
2021
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2022
+if test -n "$PKG_CONFIG" && \
2023
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
2024
+ m4_ifval([$2], [$2], [:])
2025
+m4_ifvaln([$3], [else
2026
+ $3])dnl
2027
+fi])
2028
2029
- dnl pyexecdir -- directory for installing python extension modules
2030
- dnl (shared libraries)
2031
- dnl Query distutils for this directory. distutils does not exist in
2032
- dnl Python 1.5, so we fall back to the hardcoded directory if it
2033
- dnl doesn't work.
2034
- AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
2035
- [am_cv_python_pyexecdir],
2036
- [if test "x$exec_prefix" = xNONE
2037
- then
2038
- am_py_exec_prefix=$am_py_prefix
2039
- else
2040
- am_py_exec_prefix=$exec_prefix
2041
- fi
2042
- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
2043
- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
2044
- case $am_cv_python_pyexecdir in
2045
- $am_py_exec_prefix*)
2046
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
2047
- am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
2048
- ;;
2049
- esac
2050
- ])
2051
- AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
2052
2053
- dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
2054
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
2055
+# ---------------------------------------------
2056
+m4_define([_PKG_CONFIG],
2057
+[if test -n "$PKG_CONFIG"; then
2058
+ if test -n "$$1"; then
2059
+ pkg_cv_[]$1="$$1"
2060
+ else
2061
+ PKG_CHECK_EXISTS([$3],
2062
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
2063
+ [pkg_failed=yes])
2064
+ fi
2065
+else
2066
+ pkg_failed=untried
2067
+fi[]dnl
2068
+])# _PKG_CONFIG
2069
2070
- AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
2071
+# _PKG_SHORT_ERRORS_SUPPORTED
2072
+# -----------------------------
2073
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
2074
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
2075
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2076
+ _pkg_short_errors_supported=yes
2077
+else
2078
+ _pkg_short_errors_supported=no
2079
+fi[]dnl
2080
+])# _PKG_SHORT_ERRORS_SUPPORTED
2081
2082
- dnl Run any user-specified action.
2083
- $2
2084
- fi
2085
2086
-])
2087
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
2088
+# [ACTION-IF-NOT-FOUND])
2089
+#
2090
+#
2091
+# Note that if there is a possibility the first call to
2092
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
2093
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
2094
+#
2095
+#
2096
+# --------------------------------------------------------------
2097
+AC_DEFUN([PKG_CHECK_MODULES],
2098
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2099
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
2100
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
2101
2102
+pkg_failed=no
2103
+AC_MSG_CHECKING([for $1])
2104
2105
-# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
2106
-# ---------------------------------------------------------------------------
2107
-# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
2108
-# Run ACTION-IF-FALSE otherwise.
2109
-# This test uses sys.hexversion instead of the string equivalent (first
2110
-# word of sys.version), in order to cope with versions such as 2.2c1.
2111
-# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
2112
-AC_DEFUN([AM_PYTHON_CHECK_VERSION],
2113
- [prog="import sys
2114
-# split strings by '.' and convert to numeric. Append some zeros
2115
-# because we need at least 4 digits for the hex conversion.
2116
-# map returns an iterator in Python 3.0 and a list in 2.x
2117
-minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
2118
-minverhex = 0
2119
-# xrange is not present in Python 3.0 and range returns an iterator
2120
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
2121
-sys.exit(sys.hexversion < minverhex)"
2122
- AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
2123
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
2124
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
2125
2126
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
2127
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
2128
+and $1[]_LIBS to avoid the need to call pkg-config.
2129
+See the pkg-config man page for more details.])
2130
2131
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
2132
-# Free Software Foundation, Inc.
2133
+if test $pkg_failed = yes; then
2134
+ _PKG_SHORT_ERRORS_SUPPORTED
2135
+ if test $_pkg_short_errors_supported = yes; then
2136
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
2137
+ else
2138
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
2139
+ fi
2140
+ # Put the nasty error message in config.log where it belongs
2141
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
2142
+
2143
+ ifelse([$4], , [AC_MSG_ERROR(dnl
2144
+[Package requirements ($2) were not met:
2145
+
2146
+$$1_PKG_ERRORS
2147
+
2148
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
2149
+installed software in a non-standard prefix.
2150
+
2151
+_PKG_TEXT
2152
+])],
2153
+ [AC_MSG_RESULT([no])
2154
+ $4])
2155
+elif test $pkg_failed = untried; then
2156
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
2157
+[The pkg-config script could not be found or is too old. Make sure it
2158
+is in your PATH or set the PKG_CONFIG environment variable to the full
2159
+path to pkg-config.
2160
+
2161
+_PKG_TEXT
2162
+
2163
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
2164
+ [$4])
2165
+else
2166
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
2167
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
2168
+ AC_MSG_RESULT([yes])
2169
+ ifelse([$3], , :, [$3])
2170
+fi[]dnl
2171
+])# PKG_CHECK_MODULES
2172
+
2173
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
2174
#
2175
# This file is free software; the Free Software Foundation
2176
# gives unlimited permission to copy and/or distribute it,
2177
# with or without modifications, as long as this notice is preserved.
2178
2179
-# serial 5
2180
+# AM_AUTOMAKE_VERSION(VERSION)
2181
+# ----------------------------
2182
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
2183
+# generated from the m4 files accompanying Automake X.Y.
2184
+# (This private macro should not be called outside this file.)
2185
+AC_DEFUN([AM_AUTOMAKE_VERSION],
2186
+[am__api_version='1.11'
2187
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2188
+dnl require some minimum version. Point them to the right macro.
37
2189
+m4_if([$1], [1.11.1], [],
38
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39
])
40
41
@@ -1124,7 +1123,7 @@
42
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
43
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
44
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
45
-[AM_AUTOMAKE_VERSION([1.11])dnl
2190
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2191
+])
2192
2193
-# AM_SANITY_CHECK
2194
-# ---------------
2195
-AC_DEFUN([AM_SANITY_CHECK],
2196
-[AC_MSG_CHECKING([whether build environment is sane])
2197
-# Just in case
2198
-sleep 1
2199
-echo timestamp > conftest.file
2200
-# Reject unsafe characters in $srcdir or the absolute working directory
2201
-# name. Accept space and tab only in the latter.
2202
-am_lf='
2203
-'
2204
-case `pwd` in
2205
- *[[\\\"\#\$\&\'\`$am_lf]]*)
2206
- AC_MSG_ERROR([unsafe absolute working directory name]);;
2207
-esac
2208
-case $srcdir in
2209
- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
2210
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
2211
-esac
2212
-
2213
-# Do `set' in a subshell so we don't clobber the current shell's
2214
-# arguments. Must try -L first in case configure is actually a
2215
-# symlink; some systems play weird games with the mod time of symlinks
2216
-# (eg FreeBSD returns the mod time of the symlink's containing
2217
-# directory).
2218
-if (
2219
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2220
- if test "$[*]" = "X"; then
2221
- # -L didn't work.
2222
- set X `ls -t "$srcdir/configure" conftest.file`
2223
- fi
2224
- rm -f conftest.file
2225
- if test "$[*]" != "X $srcdir/configure conftest.file" \
2226
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
2227
+# _AM_AUTOCONF_VERSION(VERSION)
2228
+# -----------------------------
2229
+# aclocal traces this macro to find the Autoconf version.
2230
+# This is a private macro too. Using m4_define simplifies
2231
+# the logic in aclocal, which can simply ignore this definition.
2232
+m4_define([_AM_AUTOCONF_VERSION], [])
2233
2234
- # If neither matched, then we have a broken ls. This can happen
2235
- # if, for instance, CONFIG_SHELL is bash and it inherits a
2236
- # broken ls alias from the environment. This has actually
2237
- # happened. Such a system could not be considered "sane".
2238
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
2239
-alias in your environment])
2240
- fi
2241
+# AM_SET_CURRENT_AUTOMAKE_VERSION
2242
+# -------------------------------
2243
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2244
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2245
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
46
2246
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
47
m4_ifndef([AC_AUTOCONF_VERSION],
48
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
49
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
50
@@ -2027,6 +2026,14 @@
51
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
52
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
53
;;
2247
+m4_ifndef([AC_AUTOCONF_VERSION],
2248
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2249
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2250
2251
- test "$[2]" = conftest.file
2252
- )
2253
-then
2254
- # Ok.
2255
- :
2256
-else
2257
- AC_MSG_ERROR([newly created file is older than distributed files!
2258
-Check your system clock])
2259
-fi
2260
-AC_MSG_RESULT(yes)])
2261
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
2262
2263
-# Copyright (C) 2009 Free Software Foundation, Inc.
2264
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
2265
#
2266
# This file is free software; the Free Software Foundation
2267
# gives unlimited permission to copy and/or distribute it,
2268
# with or without modifications, as long as this notice is preserved.
2269
2270
-# serial 1
2271
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
2272
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
2273
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
2274
+#
2275
+# Of course, Automake must honor this variable whenever it calls a
2276
+# tool from the auxiliary directory. The problem is that $srcdir (and
2277
+# therefore $ac_aux_dir as well) can be either absolute or relative,
2278
+# depending on how configure is run. This is pretty annoying, since
2279
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
2280
+# source directory, any form will work fine, but in subdirectories a
2281
+# relative path needs to be adjusted first.
2282
+#
2283
+# $ac_aux_dir/missing
2284
+# fails when called from a subdirectory if $ac_aux_dir is relative
2285
+# $top_srcdir/$ac_aux_dir/missing
2286
+# fails if $ac_aux_dir is absolute,
2287
+# fails when called from a subdirectory in a VPATH build with
2288
+# a relative $ac_aux_dir
2289
+#
2290
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
2291
+# are both prefixed by $srcdir. In an in-source build this is usually
2292
+# harmless because $srcdir is `.', but things will broke when you
2293
+# start a VPATH build or use an absolute $srcdir.
2294
+#
2295
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
2296
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
2297
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
2298
+# and then we would define $MISSING as
2299
+# MISSING="\${SHELL} $am_aux_dir/missing"
2300
+# This will work as long as MISSING is not called from configure, because
2301
+# unfortunately $(top_srcdir) has no meaning in configure.
2302
+# However there are other variables, like CC, which are often used in
2303
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
2304
+#
2305
+# Another solution, used here, is to always expand $ac_aux_dir to an
2306
+# absolute PATH. The drawback is that using absolute paths prevent a
2307
+# configured tree to be moved without reconfiguration.
2308
2309
-# AM_SILENT_RULES([DEFAULT])
2310
-# --------------------------
2311
-# Enable less verbose build rules; with the default set to DEFAULT
2312
-# (`yes' being less verbose, `no' or empty being verbose).
2313
-AC_DEFUN([AM_SILENT_RULES],
2314
-[AC_ARG_ENABLE([silent-rules],
2315
-[ --enable-silent-rules less verbose build output (undo: `make V=1')
2316
- --disable-silent-rules verbose build output (undo: `make V=0')])
2317
-case $enable_silent_rules in
2318
-yes) AM_DEFAULT_VERBOSITY=0;;
2319
-no) AM_DEFAULT_VERBOSITY=1;;
2320
-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
2321
-esac
2322
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
2323
-AM_BACKSLASH='\'
2324
-AC_SUBST([AM_BACKSLASH])dnl
2325
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
2326
+AC_DEFUN([AM_AUX_DIR_EXPAND],
2327
+[dnl Rely on autoconf to set up CDPATH properly.
2328
+AC_PREREQ([2.50])dnl
2329
+# expand $ac_aux_dir to an absolute path
2330
+am_aux_dir=`cd $ac_aux_dir && pwd`
2331
])
2332
2333
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
2334
+# AM_CONDITIONAL -*- Autoconf -*-
2335
+
2336
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
2337
+# Free Software Foundation, Inc.
2338
#
2339
# This file is free software; the Free Software Foundation
2340
# gives unlimited permission to copy and/or distribute it,
2341
# with or without modifications, as long as this notice is preserved.
2342
2343
-# AM_PROG_INSTALL_STRIP
2344
-# ---------------------
2345
-# One issue with vendor `install' (even GNU) is that you can't
2346
-# specify the program used to strip binaries. This is especially
2347
-# annoying in cross-compiling environments, where the build's strip
2348
-# is unlikely to handle the host's binaries.
2349
-# Fortunately install-sh will honor a STRIPPROG variable, so we
2350
-# always use install-sh in `make install-strip', and initialize
2351
-# STRIPPROG with the value of the STRIP variable (set by the user).
2352
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
2353
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2354
-# Installed binaries are usually stripped using `strip' when the user
2355
-# run `make install-strip'. However `strip' might not be the right
2356
-# tool to use in cross-compilation environments, therefore Automake
2357
-# will honor the `STRIP' environment variable to overrule this program.
2358
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
2359
-if test "$cross_compiling" != no; then
2360
- AC_CHECK_TOOL([STRIP], [strip], :)
2361
+# serial 9
2362
+
2363
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
2364
+# -------------------------------------
2365
+# Define a conditional.
2366
+AC_DEFUN([AM_CONDITIONAL],
2367
+[AC_PREREQ(2.52)dnl
2368
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
2369
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
2370
+AC_SUBST([$1_TRUE])dnl
2371
+AC_SUBST([$1_FALSE])dnl
2372
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
2373
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
2374
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
2375
+if $2; then
2376
+ $1_TRUE=
2377
+ $1_FALSE='#'
2378
+else
2379
+ $1_TRUE='#'
2380
+ $1_FALSE=
2381
fi
2382
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2383
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
2384
+AC_CONFIG_COMMANDS_PRE(
2385
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
2386
+ AC_MSG_ERROR([[conditional "$1" was never defined.
2387
+Usually this means the macro was only invoked conditionally.]])
2388
+fi])])
2389
2390
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
2391
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
2392
+# Free Software Foundation, Inc.
2393
#
2394
# This file is free software; the Free Software Foundation
2395
# gives unlimited permission to copy and/or distribute it,
2396
# with or without modifications, as long as this notice is preserved.
2397
2398
-# serial 2
2399
-
2400
-# _AM_SUBST_NOTMAKE(VARIABLE)
2401
-# ---------------------------
2402
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
2403
-# This macro is traced by Automake.
2404
-AC_DEFUN([_AM_SUBST_NOTMAKE])
2405
+# serial 10
2406
2407
-# AM_SUBST_NOTMAKE(VARIABLE)
2408
-# ---------------------------
2409
-# Public sister of _AM_SUBST_NOTMAKE.
2410
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
2411
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2412
+# written in clear, in which case automake, when reading aclocal.m4,
2413
+# will think it sees a *use*, and therefore will trigger all it's
2414
+# C support machinery. Also note that it means that autoscan, seeing
2415
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
2416
2417
-# Check how to create a tarball. -*- Autoconf -*-
2418
2419
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
2420
+# _AM_DEPENDENCIES(NAME)
2421
+# ----------------------
2422
+# See how the compiler implements dependency checking.
2423
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
2424
+# We try a few techniques and use that to set a single cache variable.
2425
#
2426
-# This file is free software; the Free Software Foundation
2427
-# gives unlimited permission to copy and/or distribute it,
2428
-# with or without modifications, as long as this notice is preserved.
2429
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
2430
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
2431
+# dependency, and given that the user is not expected to run this macro,
2432
+# just rely on AC_PROG_CC.
2433
+AC_DEFUN([_AM_DEPENDENCIES],
2434
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
2435
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
2436
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
2437
+AC_REQUIRE([AM_DEP_TRACK])dnl
2438
2439
-# serial 2
2440
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
2441
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
2442
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
2443
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
2444
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
2445
+ [depcc="$$1" am_compiler_list=])
2446
2447
-# _AM_PROG_TAR(FORMAT)
2448
-# --------------------
2449
-# Check how to create a tarball in format FORMAT.
2450
-# FORMAT should be one of `v7', `ustar', or `pax'.
2451
-#
2452
-# Substitute a variable $(am__tar) that is a command
2453
-# writing to stdout a FORMAT-tarball containing the directory
2454
-# $tardir.
2455
-# tardir=directory && $(am__tar) > result.tar
2456
-#
2457
-# Substitute a variable $(am__untar) that extract such
2458
-# a tarball read from stdin.
2459
-# $(am__untar) < result.tar
2460
-AC_DEFUN([_AM_PROG_TAR],
2461
-[# Always define AMTAR for backward compatibility.
2462
-AM_MISSING_PROG([AMTAR], [tar])
2463
-m4_if([$1], [v7],
2464
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
2465
- [m4_case([$1], [ustar],, [pax],,
2466
- [m4_fatal([Unknown tar format])])
2467
-AC_MSG_CHECKING([how to create a $1 tar archive])
2468
-# Loop over all known methods to create a tar archive until one works.
2469
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
2470
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
2471
-# Do not fold the above two line into one, because Tru64 sh and
2472
-# Solaris sh will not grok spaces in the rhs of `-'.
2473
-for _am_tool in $_am_tools
2474
-do
2475
- case $_am_tool in
2476
- gnutar)
2477
- for _am_tar in tar gnutar gtar;
2478
- do
2479
- AM_RUN_LOG([$_am_tar --version]) && break
2480
- done
2481
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
2482
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
2483
- am__untar="$_am_tar -xf -"
2484
- ;;
2485
- plaintar)
2486
- # Must skip GNU tar: if it does not support --format= it doesn't create
2487
- # ustar tarball either.
2488
- (tar --version) >/dev/null 2>&1 && continue
2489
- am__tar='tar chf - "$$tardir"'
2490
- am__tar_='tar chf - "$tardir"'
2491
- am__untar='tar xf -'
2492
- ;;
2493
- pax)
2494
- am__tar='pax -L -x $1 -w "$$tardir"'
2495
- am__tar_='pax -L -x $1 -w "$tardir"'
2496
- am__untar='pax -r'
2497
- ;;
2498
- cpio)
2499
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
2500
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
2501
- am__untar='cpio -i -H $1 -d'
2502
- ;;
2503
- none)
2504
- am__tar=false
2505
- am__tar_=false
2506
- am__untar=false
2507
- ;;
2508
- esac
2509
-
2510
- # If the value was cached, stop now. We just wanted to have am__tar
2511
- # and am__untar set.
2512
- test -n "${am_cv_prog_tar_$1}" && break
2513
-
2514
- # tar/untar a dummy directory, and stop if the command works
2515
- rm -rf conftest.dir
2516
+AC_CACHE_CHECK([dependency style of $depcc],
2517
+ [am_cv_$1_dependencies_compiler_type],
2518
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
2519
+ # We make a subdir and do the tests there. Otherwise we can end up
2520
+ # making bogus files that we don't know about and never remove. For
2521
+ # instance it was reported that on HP-UX the gcc test will end up
2522
+ # making a dummy file named `D' -- because `-MD' means `put the output
2523
+ # in D'.
2524
mkdir conftest.dir
2525
- echo GrepMe > conftest.dir/file
2526
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
2527
- rm -rf conftest.dir
2528
- if test -s conftest.tar; then
2529
- AM_RUN_LOG([$am__untar <conftest.tar])
2530
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
2531
- fi
2532
-done
2533
-rm -rf conftest.dir
2534
-
2535
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
2536
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
2537
-AC_SUBST([am__tar])
2538
-AC_SUBST([am__untar])
2539
-]) # _AM_PROG_TAR
2540
-
2541
-dnl AM_GCONF_SOURCE_2
2542
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
2543
-dnl (i.e. pass to gconftool-2
2544
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
2545
-dnl you should install foo.schemas files
2546
-dnl
2547
+ # Copy depcomp to subdir because otherwise we won't find it if we're
2548
+ # using a relative directory.
2549
+ cp "$am_depcomp" conftest.dir
2550
+ cd conftest.dir
2551
+ # We will build objects and dependencies in a subdirectory because
2552
+ # it helps to detect inapplicable dependency modes. For instance
2553
+ # both Tru64's cc and ICC support -MD to output dependencies as a
2554
+ # side effect of compilation, but ICC will put the dependencies in
2555
+ # the current directory while Tru64 will put them in the object
2556
+ # directory.
2557
+ mkdir sub
2558
2559
-AC_DEFUN([AM_GCONF_SOURCE_2],
2560
-[
2561
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
2562
- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
2563
- else
2564
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
2565
+ am_cv_$1_dependencies_compiler_type=none
2566
+ if test "$am_compiler_list" = ""; then
2567
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
2568
fi
2569
+ am__universal=false
2570
+ m4_case([$1], [CC],
2571
+ [case " $depcc " in #(
2572
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
2573
+ esac],
2574
+ [CXX],
2575
+ [case " $depcc " in #(
2576
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
2577
+ esac])
2578
2579
- AC_ARG_WITH([gconf-source],
2580
- AC_HELP_STRING([--with-gconf-source=sourceaddress],
2581
- [Config database for installing schema files.]),
2582
- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
2583
+ for depmode in $am_compiler_list; do
2584
+ # Setup a source with many dependencies, because some compilers
2585
+ # like to wrap large dependency lists on column 80 (with \), and
2586
+ # we should not choose a depcomp mode which is confused by this.
2587
+ #
2588
+ # We need to recreate these files for each test, as the compiler may
2589
+ # overwrite some of them when testing with obscure command lines.
2590
+ # This happens at least with the AIX C compiler.
2591
+ : > sub/conftest.c
2592
+ for i in 1 2 3 4 5 6; do
2593
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
2594
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
2595
+ # Solaris 8's {/usr,}/bin/sh.
2596
+ touch sub/conftst$i.h
2597
+ done
2598
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
2599
2600
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
2601
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
2602
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
2603
+ # mode. It turns out that the SunPro C++ compiler does not properly
2604
+ # handle `-M -o', and we need to detect this. Also, some Intel
2605
+ # versions had trouble with output in subdirs
2606
+ am__obj=sub/conftest.${OBJEXT-o}
2607
+ am__minus_obj="-o $am__obj"
2608
+ case $depmode in
2609
+ gcc)
2610
+ # This depmode causes a compiler race in universal mode.
2611
+ test "$am__universal" = false || continue
2612
+ ;;
2613
+ nosideeffect)
2614
+ # after this tag, mechanisms are not by side-effect, so they'll
2615
+ # only be used when explicitly requested
2616
+ if test "x$enable_dependency_tracking" = xyes; then
2617
+ continue
2618
+ else
2619
+ break
2620
+ fi
2621
+ ;;
2622
+ msvisualcpp | msvcmsys)
2623
+ # This compiler won't grok `-c -o', but also, the minuso test has
2624
+ # not run yet. These depmodes are late enough in the game, and
2625
+ # so weak that their functioning should not be impacted.
2626
+ am__obj=conftest.${OBJEXT-o}
2627
+ am__minus_obj=
2628
+ ;;
2629
+ none) break ;;
2630
+ esac
2631
+ if depmode=$depmode \
2632
+ source=sub/conftest.c object=$am__obj \
2633
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
2634
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
2635
+ >/dev/null 2>conftest.err &&
2636
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
2637
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
2638
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
2639
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
2640
+ # icc doesn't choke on unknown options, it will just issue warnings
2641
+ # or remarks (even with -Werror). So we grep stderr for any message
2642
+ # that says an option was ignored or not supported.
2643
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
2644
+ # icc: Command line warning: ignoring option '-M'; no argument required
2645
+ # The diagnosis changed in icc 8.0:
2646
+ # icc: Command line remark: option '-MP' not supported
2647
+ if (grep 'ignoring option' conftest.err ||
2648
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
2649
+ am_cv_$1_dependencies_compiler_type=$depmode
2650
+ break
2651
+ fi
2652
+ fi
2653
+ done
2654
2655
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
2656
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
2657
- fi
2658
+ cd ..
2659
+ rm -rf conftest.dir
2660
+else
2661
+ am_cv_$1_dependencies_compiler_type=none
2662
+fi
2663
+])
2664
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
2665
+AM_CONDITIONAL([am__fastdep$1], [
2666
+ test "x$enable_dependency_tracking" != xno \
2667
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
2668
+])
2669
2670
- AC_ARG_WITH([gconf-schema-file-dir],
2671
- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
2672
- [Directory for installing schema files.]),
2673
- [GCONF_SCHEMA_FILE_DIR="$withval"],)
2674
2675
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
2676
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
2677
+# AM_SET_DEPDIR
2678
+# -------------
2679
+# Choose a directory name for dependency files.
2680
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
2681
+AC_DEFUN([AM_SET_DEPDIR],
2682
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
2683
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
2684
+])
2685
2686
- AC_ARG_ENABLE(schemas-install,
2687
- AC_HELP_STRING([--disable-schemas-install],
2688
- [Disable the schemas installation]),
2689
- [case ${enableval} in
2690
- yes|no) ;;
2691
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
2692
- esac])
2693
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
2694
+
2695
+# AM_DEP_TRACK
2696
+# ------------
2697
+AC_DEFUN([AM_DEP_TRACK],
2698
+[AC_ARG_ENABLE(dependency-tracking,
2699
+[ --disable-dependency-tracking speeds up one-time build
2700
+ --enable-dependency-tracking do not reject slow dependency extractors])
2701
+if test "x$enable_dependency_tracking" != xno; then
2702
+ am_depcomp="$ac_aux_dir/depcomp"
2703
+ AMDEPBACKSLASH='\'
2704
+fi
2705
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
2706
+AC_SUBST([AMDEPBACKSLASH])dnl
2707
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
2708
])
2709
2710
-# Configure paths for GLIB
2711
-# Owen Taylor 1997-2001
2712
+# Generate code to set up dependency tracking. -*- Autoconf -*-
2713
2714
-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
2715
-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject,
2716
-dnl gthread, or gio is specified in MODULES, pass to pkg-config
2717
-dnl
2718
-AC_DEFUN([AM_PATH_GLIB_2_0],
2719
-[dnl
2720
-dnl Get the cflags and libraries from pkg-config
2721
-dnl
2722
-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
2723
- , enable_glibtest=yes)
2724
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
2725
+# Free Software Foundation, Inc.
2726
+#
2727
+# This file is free software; the Free Software Foundation
2728
+# gives unlimited permission to copy and/or distribute it,
2729
+# with or without modifications, as long as this notice is preserved.
2730
2731
- pkg_config_args=glib-2.0
2732
- for module in . $4
2733
+#serial 5
2734
+
2735
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
2736
+# ------------------------------
2737
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
2738
+[{
2739
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
2740
+ # are listed without --file. Let's play safe and only enable the eval
2741
+ # if we detect the quoting.
2742
+ case $CONFIG_FILES in
2743
+ *\'*) eval set x "$CONFIG_FILES" ;;
2744
+ *) set x $CONFIG_FILES ;;
2745
+ esac
2746
+ shift
2747
+ for mf
2748
do
2749
- case "$module" in
2750
- gmodule)
2751
- pkg_config_args="$pkg_config_args gmodule-2.0"
2752
- ;;
2753
- gmodule-no-export)
2754
- pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
2755
- ;;
2756
- gobject)
2757
- pkg_config_args="$pkg_config_args gobject-2.0"
2758
- ;;
2759
- gthread)
2760
- pkg_config_args="$pkg_config_args gthread-2.0"
2761
- ;;
2762
- gio*)
2763
- pkg_config_args="$pkg_config_args $module-2.0"
2764
- ;;
2765
- esac
2766
+ # Strip MF so we end up with the name of the file.
2767
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
2768
+ # Check whether this is an Automake generated Makefile or not.
2769
+ # We used to match only the files named `Makefile.in', but
2770
+ # some people rename them; so instead we look at the file content.
2771
+ # Grep'ing the first line is not enough: some people post-process
2772
+ # each Makefile.in and add a new line on top of each file to say so.
2773
+ # Grep'ing the whole file is not good either: AIX grep has a line
2774
+ # limit of 2048, but all sed's we know have understand at least 4000.
2775
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
2776
+ dirpart=`AS_DIRNAME("$mf")`
2777
+ else
2778
+ continue
2779
+ fi
2780
+ # Extract the definition of DEPDIR, am__include, and am__quote
2781
+ # from the Makefile without running `make'.
2782
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
2783
+ test -z "$DEPDIR" && continue
2784
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
2785
+ test -z "am__include" && continue
2786
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
2787
+ # When using ansi2knr, U may be empty or an underscore; expand it
2788
+ U=`sed -n 's/^U = //p' < "$mf"`
2789
+ # Find all dependency output files, they are included files with
2790
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
2791
+ # simplest approach to changing $(DEPDIR) to its actual value in the
2792
+ # expansion.
2793
+ for file in `sed -n "
2794
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
2795
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
2796
+ # Make sure the directory exists.
2797
+ test -f "$dirpart/$file" && continue
2798
+ fdir=`AS_DIRNAME(["$file"])`
2799
+ AS_MKDIR_P([$dirpart/$fdir])
2800
+ # echo "creating $dirpart/$file"
2801
+ echo '# dummy' > "$dirpart/$file"
2802
+ done
2803
done
2804
+}
2805
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
2806
2807
- PKG_PROG_PKG_CONFIG([0.16])
2808
-
2809
- no_glib=""
2810
2811
- if test "x$PKG_CONFIG" = x ; then
2812
- no_glib=yes
2813
- PKG_CONFIG=no
2814
- fi
2815
+# AM_OUTPUT_DEPENDENCY_COMMANDS
2816
+# -----------------------------
2817
+# This macro should only be invoked once -- use via AC_REQUIRE.
2818
+#
2819
+# This code is only required when automatic dependency tracking
2820
+# is enabled. FIXME. This creates each `.P' file that we will
2821
+# need in order to bootstrap the dependency handling code.
2822
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
2823
+[AC_CONFIG_COMMANDS([depfiles],
2824
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
2825
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
2826
+])
2827
2828
- min_glib_version=ifelse([$1], ,2.0.0,$1)
2829
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
2830
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
2831
+# Free Software Foundation, Inc.
2832
+#
2833
+# This file is free software; the Free Software Foundation
2834
+# gives unlimited permission to copy and/or distribute it,
2835
+# with or without modifications, as long as this notice is preserved.
2836
2837
- if test x$PKG_CONFIG != xno ; then
2838
- ## don't try to run the test against uninstalled libtool libs
2839
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
2840
- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
2841
- enable_glibtest=no
2842
- fi
2843
+# serial 8
2844
2845
- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
2846
- :
2847
- else
2848
- no_glib=yes
2849
- fi
2850
- fi
2851
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
2852
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
2853
2854
- if test x"$no_glib" = x ; then
2855
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
2856
- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
2857
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
2858
+# Do all the work for Automake. -*- Autoconf -*-
2859
2860
- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
2861
- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
2862
- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
2863
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
2864
- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
2865
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
2866
- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
2867
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
2868
- if test "x$enable_glibtest" = "xyes" ; then
2869
- ac_save_CFLAGS="$CFLAGS"
2870
- ac_save_LIBS="$LIBS"
2871
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
2872
- LIBS="$GLIB_LIBS $LIBS"
2873
-dnl
2874
-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
2875
-dnl checks the results of pkg-config to some extent)
2876
-dnl
2877
- rm -f conf.glibtest
2878
- AC_TRY_RUN([
2879
-#include <glib.h>
2880
-#include <stdio.h>
2881
-#include <stdlib.h>
2882
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2883
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
2884
+#
2885
+# This file is free software; the Free Software Foundation
2886
+# gives unlimited permission to copy and/or distribute it,
2887
+# with or without modifications, as long as this notice is preserved.
2888
2889
-int
2890
-main ()
2891
-{
2892
- int major, minor, micro;
2893
- char *tmp_version;
2894
+# serial 16
2895
2896
- fclose (fopen ("conf.glibtest", "w"));
2897
+# This macro actually does too much. Some checks are only needed if
2898
+# your package does certain things. But this isn't really a big deal.
2899
2900
- /* HP/UX 9 (%@#!) writes to sscanf strings */
2901
- tmp_version = g_strdup("$min_glib_version");
2902
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
2903
- printf("%s, bad version string\n", "$min_glib_version");
2904
- exit(1);
2905
- }
2906
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
2907
+# AM_INIT_AUTOMAKE([OPTIONS])
2908
+# -----------------------------------------------
2909
+# The call with PACKAGE and VERSION arguments is the old style
2910
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
2911
+# and VERSION should now be passed to AC_INIT and removed from
2912
+# the call to AM_INIT_AUTOMAKE.
2913
+# We support both call styles for the transition. After
2914
+# the next Automake release, Autoconf can make the AC_INIT
2915
+# arguments mandatory, and then we can depend on a new Autoconf
2916
+# release and drop the old call support.
2917
+AC_DEFUN([AM_INIT_AUTOMAKE],
2918
+[AC_PREREQ([2.62])dnl
2919
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
2920
+dnl the ones we care about.
2921
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
2922
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
2923
+AC_REQUIRE([AC_PROG_INSTALL])dnl
2924
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
2925
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2926
+ # is not polluted with repeated "-I."
2927
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
2928
+ # test to see if srcdir already configured
2929
+ if test -f $srcdir/config.status; then
2930
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
2931
+ fi
2932
+fi
2933
2934
- if ((glib_major_version != $glib_config_major_version) ||
2935
- (glib_minor_version != $glib_config_minor_version) ||
2936
- (glib_micro_version != $glib_config_micro_version))
2937
- {
2938
- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
2939
- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
2940
- glib_major_version, glib_minor_version, glib_micro_version);
2941
- printf ("*** was found! If pkg-config was correct, then it is best\n");
2942
- printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
2943
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
2944
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
2945
- printf("*** required on your system.\n");
2946
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
2947
- printf("*** to point to the correct configuration files\n");
2948
- }
2949
- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
2950
- (glib_minor_version != GLIB_MINOR_VERSION) ||
2951
- (glib_micro_version != GLIB_MICRO_VERSION))
2952
- {
2953
- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
2954
- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
2955
- printf("*** library (version %d.%d.%d)\n",
2956
- glib_major_version, glib_minor_version, glib_micro_version);
2957
- }
2958
+# test whether we have cygpath
2959
+if test -z "$CYGPATH_W"; then
2960
+ if (cygpath --version) >/dev/null 2>/dev/null; then
2961
+ CYGPATH_W='cygpath -w'
2962
else
2963
- {
2964
- if ((glib_major_version > major) ||
2965
- ((glib_major_version == major) && (glib_minor_version > minor)) ||
2966
- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
2967
- {
2968
- return 0;
2969
- }
2970
- else
2971
- {
2972
- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
2973
- glib_major_version, glib_minor_version, glib_micro_version);
2974
- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
2975
- major, minor, micro);
2976
- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
2977
- printf("***\n");
2978
- printf("*** If you have already installed a sufficiently new version, this error\n");
2979
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
2980
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
2981
- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
2982
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
2983
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
2984
- printf("*** so that the correct libraries are found at run-time))\n");
2985
- }
2986
- }
2987
- return 1;
2988
-}
2989
-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
2990
- CFLAGS="$ac_save_CFLAGS"
2991
- LIBS="$ac_save_LIBS"
2992
- fi
2993
+ CYGPATH_W=echo
2994
fi
2995
- if test "x$no_glib" = x ; then
2996
- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
2997
- ifelse([$2], , :, [$2])
2998
- else
2999
- AC_MSG_RESULT(no)
3000
- if test "$PKG_CONFIG" = "no" ; then
3001
- echo "*** A new enough version of pkg-config was not found."
3002
- echo "*** See http://www.freedesktop.org/software/pkgconfig/"
3003
- else
3004
- if test -f conf.glibtest ; then
3005
- :
3006
- else
3007
- echo "*** Could not run GLIB test program, checking why..."
3008
- ac_save_CFLAGS="$CFLAGS"
3009
- ac_save_LIBS="$LIBS"
3010
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
3011
- LIBS="$LIBS $GLIB_LIBS"
3012
- AC_TRY_LINK([
3013
-#include <glib.h>
3014
-#include <stdio.h>
3015
-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
3016
- [ echo "*** The test program compiled, but did not run. This usually means"
3017
- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
3018
- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
3019
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
3020
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
3021
- echo "*** is required on your system"
3022
- echo "***"
3023
- echo "*** If you have an old version installed, it is best to remove it, although"
3024
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
3025
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
3026
- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
3027
- CFLAGS="$ac_save_CFLAGS"
3028
- LIBS="$ac_save_LIBS"
3029
- fi
3030
- fi
3031
- GLIB_CFLAGS=""
3032
- GLIB_LIBS=""
3033
- GLIB_GENMARSHAL=""
3034
- GOBJECT_QUERY=""
3035
- GLIB_MKENUMS=""
3036
- ifelse([$3], , :, [$3])
3037
- fi
3038
- AC_SUBST(GLIB_CFLAGS)
3039
- AC_SUBST(GLIB_LIBS)
3040
- AC_SUBST(GLIB_GENMARSHAL)
3041
- AC_SUBST(GOBJECT_QUERY)
3042
- AC_SUBST(GLIB_MKENUMS)
3043
- rm -f conf.glibtest
3044
+fi
3045
+AC_SUBST([CYGPATH_W])
3046
+
3047
+# Define the identity of the package.
3048
+dnl Distinguish between old-style and new-style calls.
3049
+m4_ifval([$2],
3050
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
3051
+ AC_SUBST([PACKAGE], [$1])dnl
3052
+ AC_SUBST([VERSION], [$2])],
3053
+[_AM_SET_OPTIONS([$1])dnl
3054
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
3055
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
3056
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
3057
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
3058
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
3059
+
3060
+_AM_IF_OPTION([no-define],,
3061
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
3062
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
3063
+
3064
+# Some tools Automake needs.
3065
+AC_REQUIRE([AM_SANITY_CHECK])dnl
3066
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
3067
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
3068
+AM_MISSING_PROG(AUTOCONF, autoconf)
3069
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
3070
+AM_MISSING_PROG(AUTOHEADER, autoheader)
3071
+AM_MISSING_PROG(MAKEINFO, makeinfo)
3072
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
3073
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
3074
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
3075
+# We need awk for the "check" target. The system "awk" is bad on
3076
+# some platforms.
3077
+AC_REQUIRE([AC_PROG_AWK])dnl
3078
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
3079
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
3080
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
3081
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
3082
+ [_AM_PROG_TAR([v7])])])
3083
+_AM_IF_OPTION([no-dependencies],,
3084
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
3085
+ [_AM_DEPENDENCIES(CC)],
3086
+ [define([AC_PROG_CC],
3087
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
3088
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
3089
+ [_AM_DEPENDENCIES(CXX)],
3090
+ [define([AC_PROG_CXX],
3091
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
3092
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
3093
+ [_AM_DEPENDENCIES(OBJC)],
3094
+ [define([AC_PROG_OBJC],
3095
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
3096
+])
3097
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
3098
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
3099
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
3100
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
3101
+AC_CONFIG_COMMANDS_PRE(dnl
3102
+[m4_provide_if([_AM_COMPILER_EXEEXT],
3103
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
3104
+])
3105
+
3106
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
3107
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
3108
+dnl mangled by Autoconf and run in a shell conditional statement.
3109
+m4_define([_AC_COMPILER_EXEEXT],
3110
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
3111
+
3112
+
3113
+# When config.status generates a header, we must update the stamp-h file.
3114
+# This file resides in the same directory as the config header
3115
+# that is generated. The stamp files are numbered to have different names.
3116
+
3117
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
3118
+# loop where config.status creates the headers, so we can generate
3119
+# our stamp files there.
3120
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
3121
+[# Compute $1's index in $config_headers.
3122
+_am_arg=$1
3123
+_am_stamp_count=1
3124
+for _am_header in $config_headers :; do
3125
+ case $_am_header in
3126
+ $_am_arg | $_am_arg:* )
3127
+ break ;;
3128
+ * )
3129
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
3130
+ esac
3131
+done
3132
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
3133
+
3134
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
3135
+#
3136
+# This file is free software; the Free Software Foundation
3137
+# gives unlimited permission to copy and/or distribute it,
3138
+# with or without modifications, as long as this notice is preserved.
3139
+
3140
+# AM_PROG_INSTALL_SH
3141
+# ------------------
3142
+# Define $install_sh.
3143
+AC_DEFUN([AM_PROG_INSTALL_SH],
3144
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3145
+if test x"${install_sh}" != xset; then
3146
+ case $am_aux_dir in
3147
+ *\ * | *\ *)
3148
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
3149
+ *)
3150
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
3151
+ esac
3152
+fi
3153
+AC_SUBST(install_sh)])
3154
+
3155
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
3156
+#
3157
+# This file is free software; the Free Software Foundation
3158
+# gives unlimited permission to copy and/or distribute it,
3159
+# with or without modifications, as long as this notice is preserved.
3160
+
3161
+# serial 2
3162
+
3163
+# Check whether the underlying file-system supports filenames
3164
+# with a leading dot. For instance MS-DOS doesn't.
3165
+AC_DEFUN([AM_SET_LEADING_DOT],
3166
+[rm -rf .tst 2>/dev/null
3167
+mkdir .tst 2>/dev/null
3168
+if test -d .tst; then
3169
+ am__leading_dot=.
3170
+else
3171
+ am__leading_dot=_
3172
+fi
3173
+rmdir .tst 2>/dev/null
3174
+AC_SUBST([am__leading_dot])])
3175
+
3176
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
3177
+# From Jim Meyering
3178
+
3179
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
3180
+# Free Software Foundation, Inc.
3181
+#
3182
+# This file is free software; the Free Software Foundation
3183
+# gives unlimited permission to copy and/or distribute it,
3184
+# with or without modifications, as long as this notice is preserved.
3185
+
3186
+# serial 5
3187
+
3188
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
3189
+# ----------------------------------
3190
+# Control maintainer-specific portions of Makefiles.
3191
+# Default is to disable them, unless `enable' is passed literally.
3192
+# For symmetry, `disable' may be passed as well. Anyway, the user
3193
+# can override the default with the --enable/--disable switch.
3194
+AC_DEFUN([AM_MAINTAINER_MODE],
3195
+[m4_case(m4_default([$1], [disable]),
3196
+ [enable], [m4_define([am_maintainer_other], [disable])],
3197
+ [disable], [m4_define([am_maintainer_other], [enable])],
3198
+ [m4_define([am_maintainer_other], [enable])
3199
+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
3200
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
3201
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
3202
+ AC_ARG_ENABLE([maintainer-mode],
3203
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
3204
+ (and sometimes confusing) to the casual installer],
3205
+ [USE_MAINTAINER_MODE=$enableval],
3206
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
3207
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
3208
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
3209
+ MAINT=$MAINTAINER_MODE_TRUE
3210
+ AC_SUBST([MAINT])dnl
3211
+]
3212
+)
3213
+
3214
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
3215
+
3216
+# Check to see how 'make' treats includes. -*- Autoconf -*-
3217
+
3218
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
3219
+#
3220
+# This file is free software; the Free Software Foundation
3221
+# gives unlimited permission to copy and/or distribute it,
3222
+# with or without modifications, as long as this notice is preserved.
3223
+
3224
+# serial 4
3225
+
3226
+# AM_MAKE_INCLUDE()
3227
+# -----------------
3228
+# Check to see how make treats includes.
3229
+AC_DEFUN([AM_MAKE_INCLUDE],
3230
+[am_make=${MAKE-make}
3231
+cat > confinc << 'END'
3232
+am__doit:
3233
+ @echo this is the am__doit target
3234
+.PHONY: am__doit
3235
+END
3236
+# If we don't find an include directive, just comment out the code.
3237
+AC_MSG_CHECKING([for style of include used by $am_make])
3238
+am__include="#"
3239
+am__quote=
3240
+_am_result=none
3241
+# First try GNU make style include.
3242
+echo "include confinc" > confmf
3243
+# Ignore all kinds of additional output from `make'.
3244
+case `$am_make -s -f confmf 2> /dev/null` in #(
3245
+*the\ am__doit\ target*)
3246
+ am__include=include
3247
+ am__quote=
3248
+ _am_result=GNU
3249
+ ;;
3250
+esac
3251
+# Now try BSD make style include.
3252
+if test "$am__include" = "#"; then
3253
+ echo '.include "confinc"' > confmf
3254
+ case `$am_make -s -f confmf 2> /dev/null` in #(
3255
+ *the\ am__doit\ target*)
3256
+ am__include=.include
3257
+ am__quote="\""
3258
+ _am_result=BSD
3259
+ ;;
3260
+ esac
3261
+fi
3262
+AC_SUBST([am__include])
3263
+AC_SUBST([am__quote])
3264
+AC_MSG_RESULT([$_am_result])
3265
+rm -f confinc confmf
3266
+])
3267
+
3268
+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
3269
+# Free Software Foundation, Inc.
3270
+#
3271
+# This file is free software; the Free Software Foundation
3272
+# gives unlimited permission to copy and/or distribute it,
3273
+# with or without modifications, as long as this notice is preserved.
3274
+
3275
+# serial 6
3276
+
3277
+# AM_PROG_CC_C_O
3278
+# --------------
3279
+# Like AC_PROG_CC_C_O, but changed for automake.
3280
+AC_DEFUN([AM_PROG_CC_C_O],
3281
+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
3282
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3283
+AC_REQUIRE_AUX_FILE([compile])dnl
3284
+# FIXME: we rely on the cache variable name because
3285
+# there is no other way.
3286
+set dummy $CC
3287
+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
3288
+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
3289
+if test "$am_t" != yes; then
3290
+ # Losing compiler, so override with the script.
3291
+ # FIXME: It is wrong to rewrite CC.
3292
+ # But if we don't then we get into trouble of one sort or another.
3293
+ # A longer-term fix would be to have automake use am__CC in this case,
3294
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3295
+ CC="$am_aux_dir/compile $CC"
3296
+fi
3297
+dnl Make sure AC_PROG_CC is never called again, or it will override our
3298
+dnl setting of CC.
3299
+m4_define([AC_PROG_CC],
3300
+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
3301
])
3302
3303
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
3304
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
3305
-#
3306
-# This file is free software, distributed under the terms of the GNU
3307
-# General Public License. As a special exception to the GNU General
3308
-# Public License, this file may be distributed as part of a program
3309
-# that contains a configuration script generated by Autoconf, under
3310
-# the same distribution terms as the rest of that program.
3311
-#
3312
-# This file can be copied and used freely without restrictions. It can
3313
-# be used in projects which are not available under the GNU Public License
3314
-# but which still want to provide support for the GNU gettext functionality.
3315
-#
3316
-# Macro to add for using GNU gettext.
3317
-# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
3318
-#
3319
-# Modified to never use included libintl.
3320
-# Owen Taylor <otaylor@redhat.com>, 12/15/1998
3321
-#
3322
-# Major rework to remove unused code
3323
-# Owen Taylor <otaylor@redhat.com>, 12/11/2002
3324
-#
3325
-# Added better handling of ALL_LINGUAS from GNU gettext version
3326
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
3327
-#
3328
-# Modified to require ngettext
3329
-# Matthias Clasen <mclasen@redhat.com> 08/06/2004
3330
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
3331
+
3332
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
3333
+# Free Software Foundation, Inc.
3334
#
3335
-# We need this here as well, since someone might use autoconf-2.5x
3336
-# to configure GLib then an older version to configure a package
3337
-# using AM_GLIB_GNU_GETTEXT
3338
-AC_PREREQ(2.53)
3339
+# This file is free software; the Free Software Foundation
3340
+# gives unlimited permission to copy and/or distribute it,
3341
+# with or without modifications, as long as this notice is preserved.
3342
3343
-dnl
3344
-dnl We go to great lengths to make sure that aclocal won't
3345
-dnl try to pull in the installed version of these macros
3346
-dnl when running aclocal in the glib directory.
3347
-dnl
3348
-m4_copy([AC_DEFUN],[glib_DEFUN])
3349
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
3350
-dnl
3351
-dnl At the end, if we're not within glib, we'll define the public
3352
-dnl definitions in terms of our private definitions.
3353
-dnl
3354
+# serial 6
3355
3356
-# GLIB_LC_MESSAGES
3357
-#--------------------
3358
-glib_DEFUN([GLIB_LC_MESSAGES],
3359
- [AC_CHECK_HEADERS([locale.h])
3360
- if test $ac_cv_header_locale_h = yes; then
3361
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
3362
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
3363
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
3364
- if test $am_cv_val_LC_MESSAGES = yes; then
3365
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
3366
- [Define if your <locale.h> file defines LC_MESSAGES.])
3367
- fi
3368
- fi])
3369
+# AM_MISSING_PROG(NAME, PROGRAM)
3370
+# ------------------------------
3371
+AC_DEFUN([AM_MISSING_PROG],
3372
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
3373
+$1=${$1-"${am_missing_run}$2"}
3374
+AC_SUBST($1)])
3375
3376
-# GLIB_PATH_PROG_WITH_TEST
3377
-#----------------------------
3378
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
3379
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
3380
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
3381
-[# Extract the first word of "$2", so it can be a program name with args.
3382
-set dummy $2; ac_word=[$]2
3383
-AC_MSG_CHECKING([for $ac_word])
3384
-AC_CACHE_VAL(ac_cv_path_$1,
3385
-[case "[$]$1" in
3386
- /*)
3387
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
3388
- ;;
3389
+
3390
+# AM_MISSING_HAS_RUN
3391
+# ------------------
3392
+# Define MISSING if not defined so far and test if it supports --run.
3393
+# If it does, set am_missing_run to use it, otherwise, to nothing.
3394
+AC_DEFUN([AM_MISSING_HAS_RUN],
3395
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3396
+AC_REQUIRE_AUX_FILE([missing])dnl
3397
+if test x"${MISSING+set}" != xset; then
3398
+ case $am_aux_dir in
3399
+ *\ * | *\ *)
3400
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3401
*)
3402
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
3403
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
3404
- test -z "$ac_dir" && ac_dir=.
3405
- if test -f $ac_dir/$ac_word; then
3406
- if [$3]; then
3407
- ac_cv_path_$1="$ac_dir/$ac_word"
3408
- break
3409
- fi
3410
- fi
3411
- done
3412
- IFS="$ac_save_ifs"
3413
-dnl If no 4th arg is given, leave the cache variable unset,
3414
-dnl so AC_PATH_PROGS will keep looking.
3415
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
3416
-])dnl
3417
- ;;
3418
-esac])dnl
3419
-$1="$ac_cv_path_$1"
3420
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
3421
- AC_MSG_RESULT([$]$1)
3422
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
3423
+ esac
3424
+fi
3425
+# Use eval to expand $SHELL
3426
+if eval "$MISSING --run true"; then
3427
+ am_missing_run="$MISSING --run "
3428
else
3429
- AC_MSG_RESULT(no)
3430
+ am_missing_run=
3431
+ AC_MSG_WARN([`missing' script is too old or missing])
3432
fi
3433
-AC_SUBST($1)dnl
3434
])
3435
3436
-# GLIB_WITH_NLS
3437
-#-----------------
3438
-glib_DEFUN([GLIB_WITH_NLS],
3439
- dnl NLS is obligatory
3440
- [USE_NLS=yes
3441
- AC_SUBST(USE_NLS)
3442
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
3443
+#
3444
+# This file is free software; the Free Software Foundation
3445
+# gives unlimited permission to copy and/or distribute it,
3446
+# with or without modifications, as long as this notice is preserved.
3447
3448
- gt_cv_have_gettext=no
3449
+# AM_PROG_MKDIR_P
3450
+# ---------------
3451
+# Check for `mkdir -p'.
3452
+AC_DEFUN([AM_PROG_MKDIR_P],
3453
+[AC_PREREQ([2.60])dnl
3454
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3455
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3456
+dnl while keeping a definition of mkdir_p for backward compatibility.
3457
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3458
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3459
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
3460
+dnl adjustment using top_builddir (which is defined more often than
3461
+dnl MKDIR_P).
3462
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3463
+case $mkdir_p in
3464
+ [[\\/$]]* | ?:[[\\/]]*) ;;
3465
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3466
+esac
3467
+])
3468
3469
- CATOBJEXT=NONE
3470
- XGETTEXT=:
3471
- INTLLIBS=
3472
+# Helper functions for option handling. -*- Autoconf -*-
3473
3474
- AC_CHECK_HEADER(libintl.h,
3475
- [gt_cv_func_dgettext_libintl="no"
3476
- libintl_extra_libs=""
3477
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
3478
+#
3479
+# This file is free software; the Free Software Foundation
3480
+# gives unlimited permission to copy and/or distribute it,
3481
+# with or without modifications, as long as this notice is preserved.
3482
3483
- #
3484
- # First check in libc
3485
- #
3486
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
3487
- [AC_TRY_LINK([
3488
-#include <libintl.h>
3489
-],
3490
- [return !ngettext ("","", 1)],
3491
- gt_cv_func_ngettext_libc=yes,
3492
- gt_cv_func_ngettext_libc=no)
3493
- ])
3494
-
3495
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
3496
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
3497
- [AC_TRY_LINK([
3498
-#include <libintl.h>
3499
-],
3500
- [return !dgettext ("","")],
3501
- gt_cv_func_dgettext_libc=yes,
3502
- gt_cv_func_dgettext_libc=no)
3503
- ])
3504
- fi
3505
-
3506
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
3507
- AC_CHECK_FUNCS(bind_textdomain_codeset)
3508
- fi
3509
+# serial 4
3510
3511
- #
3512
- # If we don't have everything we want, check in libintl
3513
- #
3514
- if test "$gt_cv_func_dgettext_libc" != "yes" \
3515
- || test "$gt_cv_func_ngettext_libc" != "yes" \
3516
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
3517
-
3518
- AC_CHECK_LIB(intl, bindtextdomain,
3519
- [AC_CHECK_LIB(intl, ngettext,
3520
- [AC_CHECK_LIB(intl, dgettext,
3521
- gt_cv_func_dgettext_libintl=yes)])])
3522
+# _AM_MANGLE_OPTION(NAME)
3523
+# -----------------------
3524
+AC_DEFUN([_AM_MANGLE_OPTION],
3525
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
3526
3527
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
3528
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
3529
- AC_MSG_RESULT([])
3530
- AC_CHECK_LIB(intl, ngettext,
3531
- [AC_CHECK_LIB(intl, dcgettext,
3532
- [gt_cv_func_dgettext_libintl=yes
3533
- libintl_extra_libs=-liconv],
3534
- :,-liconv)],
3535
- :,-liconv)
3536
- fi
3537
+# _AM_SET_OPTION(NAME)
3538
+# ------------------------------
3539
+# Set option NAME. Presently that only means defining a flag for this option.
3540
+AC_DEFUN([_AM_SET_OPTION],
3541
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
3542
3543
- #
3544
- # If we found libintl, then check in it for bind_textdomain_codeset();
3545
- # we'll prefer libc if neither have bind_textdomain_codeset(),
3546
- # and both have dgettext and ngettext
3547
- #
3548
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
3549
- glib_save_LIBS="$LIBS"
3550
- LIBS="$LIBS -lintl $libintl_extra_libs"
3551
- unset ac_cv_func_bind_textdomain_codeset
3552
- AC_CHECK_FUNCS(bind_textdomain_codeset)
3553
- LIBS="$glib_save_LIBS"
3554
+# _AM_SET_OPTIONS(OPTIONS)
3555
+# ----------------------------------
3556
+# OPTIONS is a space-separated list of Automake options.
3557
+AC_DEFUN([_AM_SET_OPTIONS],
3558
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
3559
3560
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
3561
- gt_cv_func_dgettext_libc=no
3562
- else
3563
- if test "$gt_cv_func_dgettext_libc" = "yes" \
3564
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
3565
- gt_cv_func_dgettext_libintl=no
3566
- fi
3567
- fi
3568
- fi
3569
- fi
3570
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
3571
+# -------------------------------------------
3572
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
3573
+AC_DEFUN([_AM_IF_OPTION],
3574
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
3575
3576
- if test "$gt_cv_func_dgettext_libc" = "yes" \
3577
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
3578
- gt_cv_have_gettext=yes
3579
- fi
3580
-
3581
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
3582
- INTLLIBS="-lintl $libintl_extra_libs"
3583
- fi
3584
-
3585
- if test "$gt_cv_have_gettext" = "yes"; then
3586
- AC_DEFINE(HAVE_GETTEXT,1,
3587
- [Define if the GNU gettext() function is already present or preinstalled.])
3588
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
3589
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
3590
- if test "$MSGFMT" != "no"; then
3591
- glib_save_LIBS="$LIBS"
3592
- LIBS="$LIBS $INTLLIBS"
3593
- AC_CHECK_FUNCS(dcgettext)
3594
- MSGFMT_OPTS=
3595
- AC_MSG_CHECKING([if msgfmt accepts -c])
3596
- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
3597
-msgid ""
3598
-msgstr ""
3599
-"Content-Type: text/plain; charset=UTF-8\n"
3600
-"Project-Id-Version: test 1.0\n"
3601
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
3602
-"Last-Translator: test <foo@bar.xx>\n"
3603
-"Language-Team: C <LL@li.org>\n"
3604
-"MIME-Version: 1.0\n"
3605
-"Content-Transfer-Encoding: 8bit\n"
3606
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
3607
- AC_SUBST(MSGFMT_OPTS)
3608
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
3609
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
3610
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
3611
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
3612
- return _nl_msg_cat_cntr],
3613
- [CATOBJEXT=.gmo
3614
- DATADIRNAME=share],
3615
- [case $host in
3616
- *-*-solaris*)
3617
- dnl On Solaris, if bind_textdomain_codeset is in libc,
3618
- dnl GNU format message catalog is always supported,
3619
- dnl since both are added to the libc all together.
3620
- dnl Hence, we'd like to go with DATADIRNAME=share and
3621
- dnl and CATOBJEXT=.gmo in this case.
3622
- AC_CHECK_FUNC(bind_textdomain_codeset,
3623
- [CATOBJEXT=.gmo
3624
- DATADIRNAME=share],
3625
- [CATOBJEXT=.mo
3626
- DATADIRNAME=lib])
3627
- ;;
3628
- *)
3629
- CATOBJEXT=.mo
3630
- DATADIRNAME=lib
3631
- ;;
3632
- esac])
3633
- LIBS="$glib_save_LIBS"
3634
- INSTOBJEXT=.mo
3635
- else
3636
- gt_cv_have_gettext=no
3637
- fi
3638
- fi
3639
- ])
3640
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
3641
+# Free Software Foundation, Inc.
3642
+#
3643
+# This file is free software; the Free Software Foundation
3644
+# gives unlimited permission to copy and/or distribute it,
3645
+# with or without modifications, as long as this notice is preserved.
3646
3647
- if test "$gt_cv_have_gettext" = "yes" ; then
3648
- AC_DEFINE(ENABLE_NLS, 1,
3649
- [always defined to indicate that i18n is enabled])
3650
- fi
3651
+# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
3652
+# ---------------------------------------------------------------------------
3653
+# Adds support for distributing Python modules and packages. To
3654
+# install modules, copy them to $(pythondir), using the python_PYTHON
3655
+# automake variable. To install a package with the same name as the
3656
+# automake package, install to $(pkgpythondir), or use the
3657
+# pkgpython_PYTHON automake variable.
3658
+#
3659
+# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as
3660
+# locations to install python extension modules (shared libraries).
3661
+# Another macro is required to find the appropriate flags to compile
3662
+# extension modules.
3663
+#
3664
+# If your package is configured with a different prefix to python,
3665
+# users will have to add the install directory to the PYTHONPATH
3666
+# environment variable, or create a .pth file (see the python
3667
+# documentation for details).
3668
+#
3669
+# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will
3670
+# cause an error if the version of python installed on the system
3671
+# doesn't meet the requirement. MINIMUM-VERSION should consist of
3672
+# numbers and dots only.
3673
+AC_DEFUN([AM_PATH_PYTHON],
3674
+ [
3675
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
3676
+ dnl supported. (2.0 was released on October 16, 2000).
3677
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
3678
+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
3679
+python2.1 python2.0])
3680
3681
- dnl Test whether we really found GNU xgettext.
3682
- if test "$XGETTEXT" != ":"; then
3683
- dnl If it is not GNU xgettext we define it as : so that the
3684
- dnl Makefiles still can work.
3685
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
3686
- : ;
3687
+ m4_if([$1],[],[
3688
+ dnl No version check is needed.
3689
+ # Find any Python interpreter.
3690
+ if test -z "$PYTHON"; then
3691
+ AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :)
3692
+ fi
3693
+ am_display_PYTHON=python
3694
+ ], [
3695
+ dnl A version check is needed.
3696
+ if test -n "$PYTHON"; then
3697
+ # If the user set $PYTHON, use it and don't search something else.
3698
+ AC_MSG_CHECKING([whether $PYTHON version >= $1])
3699
+ AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
3700
+ [AC_MSG_RESULT(yes)],
3701
+ [AC_MSG_ERROR(too old)])
3702
+ am_display_PYTHON=$PYTHON
3703
+ else
3704
+ # Otherwise, try each interpreter until we find one that satisfies
3705
+ # VERSION.
3706
+ AC_CACHE_CHECK([for a Python interpreter with version >= $1],
3707
+ [am_cv_pathless_PYTHON],[
3708
+ for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do
3709
+ test "$am_cv_pathless_PYTHON" = none && break
3710
+ AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
3711
+ done])
3712
+ # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
3713
+ if test "$am_cv_pathless_PYTHON" = none; then
3714
+ PYTHON=:
3715
else
3716
- AC_MSG_RESULT(
3717
- [found xgettext program is not GNU xgettext; ignore it])
3718
- XGETTEXT=":"
3719
+ AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
3720
fi
3721
+ am_display_PYTHON=$am_cv_pathless_PYTHON
3722
fi
3723
+ ])
3724
3725
- # We need to process the po/ directory.
3726
- POSUB=po
3727
+ if test "$PYTHON" = :; then
3728
+ dnl Run any user-specified action, or abort.
3729
+ m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
3730
+ else
3731
3732
- AC_OUTPUT_COMMANDS(
3733
- [case "$CONFIG_FILES" in *po/Makefile.in*)
3734
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
3735
- esac])
3736
+ dnl Query Python for its version number. Getting [:3] seems to be
3737
+ dnl the best way to do this; it's what "site.py" does in the standard
3738
+ dnl library.
3739
3740
- dnl These rules are solely for the distribution goal. While doing this
3741
- dnl we only have to keep exactly one list of the available catalogs
3742
- dnl in configure.in.
3743
- for lang in $ALL_LINGUAS; do
3744
- GMOFILES="$GMOFILES $lang.gmo"
3745
- POFILES="$POFILES $lang.po"
3746
- done
3747
+ AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
3748
+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
3749
+ AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
3750
3751
- dnl Make all variables we use known to autoconf.
3752
- AC_SUBST(CATALOGS)
3753
- AC_SUBST(CATOBJEXT)
3754
- AC_SUBST(DATADIRNAME)
3755
- AC_SUBST(GMOFILES)
3756
- AC_SUBST(INSTOBJEXT)
3757
- AC_SUBST(INTLLIBS)
3758
- AC_SUBST(PO_IN_DATADIR_TRUE)
3759
- AC_SUBST(PO_IN_DATADIR_FALSE)
3760
- AC_SUBST(POFILES)
3761
- AC_SUBST(POSUB)
3762
- ])
3763
+ dnl Use the values of $prefix and $exec_prefix for the corresponding
3764
+ dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
3765
+ dnl distinct variables so they can be overridden if need be. However,
3766
+ dnl general consensus is that you shouldn't need this ability.
3767
3768
-# AM_GLIB_GNU_GETTEXT
3769
-# -------------------
3770
-# Do checks necessary for use of gettext. If a suitable implementation
3771
-# of gettext is found in either in libintl or in the C library,
3772
-# it will set INTLLIBS to the libraries needed for use of gettext
3773
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
3774
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
3775
-# on various variables needed by the Makefile.in.in installed by
3776
-# glib-gettextize.
3777
-dnl
3778
-glib_DEFUN([GLIB_GNU_GETTEXT],
3779
- [AC_REQUIRE([AC_PROG_CC])dnl
3780
- AC_REQUIRE([AC_HEADER_STDC])dnl
3781
-
3782
- GLIB_LC_MESSAGES
3783
- GLIB_WITH_NLS
3784
+ AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
3785
+ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
3786
3787
- if test "$gt_cv_have_gettext" = "yes"; then
3788
- if test "x$ALL_LINGUAS" = "x"; then
3789
- LINGUAS=
3790
+ dnl At times (like when building shared libraries) you may want
3791
+ dnl to know which OS platform Python thinks this is.
3792
+
3793
+ AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
3794
+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
3795
+ AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
3796
+
3797
+
3798
+ dnl Set up 4 directories:
3799
+
3800
+ dnl pythondir -- where to install python scripts. This is the
3801
+ dnl site-packages directory, not the python standard library
3802
+ dnl directory like in previous automake betas. This behavior
3803
+ dnl is more consistent with lispdir.m4 for example.
3804
+ dnl Query distutils for this directory. distutils does not exist in
3805
+ dnl Python 1.5, so we fall back to the hardcoded directory if it
3806
+ dnl doesn't work.
3807
+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
3808
+ [am_cv_python_pythondir],
3809
+ [if test "x$prefix" = xNONE
3810
+ then
3811
+ am_py_prefix=$ac_default_prefix
3812
else
3813
- AC_MSG_CHECKING(for catalogs to be installed)
3814
- NEW_LINGUAS=
3815
- for presentlang in $ALL_LINGUAS; do
3816
- useit=no
3817
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
3818
- desiredlanguages="$LINGUAS"
3819
- else
3820
- desiredlanguages="$ALL_LINGUAS"
3821
- fi
3822
- for desiredlang in $desiredlanguages; do
3823
- # Use the presentlang catalog if desiredlang is
3824
- # a. equal to presentlang, or
3825
- # b. a variant of presentlang (because in this case,
3826
- # presentlang can be used as a fallback for messages
3827
- # which are not translated in the desiredlang catalog).
3828
- case "$desiredlang" in
3829
- "$presentlang"*) useit=yes;;
3830
- esac
3831
- done
3832
- if test $useit = yes; then
3833
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
3834
- fi
3835
- done
3836
- LINGUAS=$NEW_LINGUAS
3837
- AC_MSG_RESULT($LINGUAS)
3838
+ am_py_prefix=$prefix
3839
fi
3840
+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
3841
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
3842
+ case $am_cv_python_pythondir in
3843
+ $am_py_prefix*)
3844
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
3845
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
3846
+ ;;
54
3847
+ *)
55
3848
+ case $am_py_prefix in
56
3849
+ /usr|/System*) ;;
59
3852
+ ;;
60
3853
+ esac
61
3854
+ ;;
62
esac
63
])
64
AC_SUBST([pythondir], [$am_cv_python_pythondir])
65
@@ -2057,6 +2064,14 @@
66
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
67
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
68
;;
3855
+ esac
3856
+ ])
3857
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
3858
3859
- dnl Construct list of names of catalog files to be constructed.
3860
- if test -n "$LINGUAS"; then
3861
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
3862
- fi
3863
- fi
3864
+ dnl pkgpythondir -- $PACKAGE directory under pythondir. Was
3865
+ dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is
3866
+ dnl more consistent with the rest of automake.
3867
3868
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
3869
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
3870
- dnl Try to locate is.
3871
- MKINSTALLDIRS=
3872
- if test -n "$ac_aux_dir"; then
3873
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
3874
- fi
3875
- if test -z "$MKINSTALLDIRS"; then
3876
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
3877
- fi
3878
- AC_SUBST(MKINSTALLDIRS)
3879
+ AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
3880
3881
- dnl Generate list of files to be processed by xgettext which will
3882
- dnl be included in po/Makefile.
3883
- test -d po || mkdir po
3884
- if test "x$srcdir" != "x."; then
3885
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
3886
- posrcprefix="$srcdir/"
3887
+ dnl pyexecdir -- directory for installing python extension modules
3888
+ dnl (shared libraries)
3889
+ dnl Query distutils for this directory. distutils does not exist in
3890
+ dnl Python 1.5, so we fall back to the hardcoded directory if it
3891
+ dnl doesn't work.
3892
+ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
3893
+ [am_cv_python_pyexecdir],
3894
+ [if test "x$exec_prefix" = xNONE
3895
+ then
3896
+ am_py_exec_prefix=$am_py_prefix
3897
else
3898
- posrcprefix="../$srcdir/"
3899
+ am_py_exec_prefix=$exec_prefix
3900
fi
3901
- else
3902
- posrcprefix="../"
3903
- fi
3904
- rm -f po/POTFILES
3905
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
3906
- < $srcdir/po/POTFILES.in > po/POTFILES
3907
- ])
3908
-
3909
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
3910
-# -------------------------------
3911
-# Define VARIABLE to the location where catalog files will
3912
-# be installed by po/Makefile.
3913
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
3914
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
3915
-glib_save_prefix="$prefix"
3916
-glib_save_exec_prefix="$exec_prefix"
3917
-glib_save_datarootdir="$datarootdir"
3918
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
3919
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
3920
-datarootdir=`eval echo "${datarootdir}"`
3921
-if test "x$CATOBJEXT" = "x.mo" ; then
3922
- localedir=`eval echo "${libdir}/locale"`
3923
-else
3924
- localedir=`eval echo "${datadir}/locale"`
3925
-fi
3926
-prefix="$glib_save_prefix"
3927
-exec_prefix="$glib_save_exec_prefix"
3928
-datarootdir="$glib_save_datarootdir"
3929
-AC_DEFINE_UNQUOTED($1, "$localedir",
3930
- [Define the location where the catalogs will be installed])
3931
-])
3932
+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
3933
+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
3934
+ case $am_cv_python_pyexecdir in
3935
+ $am_py_exec_prefix*)
3936
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
3937
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
3938
+ ;;
69
3939
+ *)
70
3940
+ case $am_py_exec_prefix in
71
3941
+ /usr|/System*) ;;
74
3944
+ ;;
75
3945
+ esac
76
3946
+ ;;
77
esac
78
])
79
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
80
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/configure libgweather-2.29.92.new/configure
81
--- libgweather-2.29.92/configure 2010-03-09 04:44:37.000000000 +0100
82
+++ libgweather-2.29.92.new/configure 2010-03-09 11:14:50.000000000 +0100
3947
+ esac
3948
+ ])
3949
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
3950
3951
-dnl
3952
-dnl Now the definitions that aclocal will find
3953
-dnl
3954
-ifdef(glib_configure_in,[],[
3955
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
3956
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
3957
-])dnl
3958
+ dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
3959
3960
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
3961
-#
3962
-# Create a temporary file with TEST-FILE as its contents and pass the
3963
-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
3964
-# 0 and perform ACTION-IF-FAIL for any other exit status.
3965
-AC_DEFUN([GLIB_RUN_PROG],
3966
-[cat >conftest.foo <<_ACEOF
3967
-$2
3968
-_ACEOF
3969
-if AC_RUN_LOG([$1 conftest.foo]); then
3970
- m4_ifval([$3], [$3], [:])
3971
-m4_ifvaln([$4], [else $4])dnl
3972
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
3973
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
3974
-fi])
3975
+ AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
3976
3977
+ dnl Run any user-specified action.
3978
+ $2
3979
+ fi
3980
3981
-# gnome-common.m4
3982
-#
3983
+])
3984
3985
-dnl GNOME_COMMON_INIT
3986
3987
-AC_DEFUN([GNOME_COMMON_INIT],
3988
-[
3989
- dnl this macro should come after AC_CONFIG_MACRO_DIR
3990
- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
3991
+# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
3992
+# ---------------------------------------------------------------------------
3993
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION.
3994
+# Run ACTION-IF-FALSE otherwise.
3995
+# This test uses sys.hexversion instead of the string equivalent (first
3996
+# word of sys.version), in order to cope with versions such as 2.2c1.
3997
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
3998
+AC_DEFUN([AM_PYTHON_CHECK_VERSION],
3999
+ [prog="import sys
4000
+# split strings by '.' and convert to numeric. Append some zeros
4001
+# because we need at least 4 digits for the hex conversion.
4002
+# map returns an iterator in Python 3.0 and a list in 2.x
4003
+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
4004
+minverhex = 0
4005
+# xrange is not present in Python 3.0 and range returns an iterator
4006
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
4007
+sys.exit(sys.hexversion < minverhex)"
4008
+ AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
4009
4010
- dnl ensure that when the Automake generated makefile calls aclocal,
4011
- dnl it honours the $ACLOCAL_FLAGS environment variable
4012
- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
4013
- if test -n "$ac_macro_dir"; then
4014
- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
4015
- fi
4016
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
4017
4018
- AC_SUBST([ACLOCAL_AMFLAGS])
4019
-])
4020
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
4021
+# Free Software Foundation, Inc.
4022
+#
4023
+# This file is free software; the Free Software Foundation
4024
+# gives unlimited permission to copy and/or distribute it,
4025
+# with or without modifications, as long as this notice is preserved.
4026
4027
-AC_DEFUN([GNOME_DEBUG_CHECK],
4028
-[
4029
- AC_ARG_ENABLE([debug],
4030
- AC_HELP_STRING([--enable-debug],
4031
- [turn on debugging]),,
4032
- [enable_debug=no])
4033
+# serial 5
4034
4035
- if test x$enable_debug = xyes ; then
4036
- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
4037
- [Enable additional debugging at the expense of performance and size])
4038
- fi
4039
-])
4040
+# AM_SANITY_CHECK
4041
+# ---------------
4042
+AC_DEFUN([AM_SANITY_CHECK],
4043
+[AC_MSG_CHECKING([whether build environment is sane])
4044
+# Just in case
4045
+sleep 1
4046
+echo timestamp > conftest.file
4047
+# Reject unsafe characters in $srcdir or the absolute working directory
4048
+# name. Accept space and tab only in the latter.
4049
+am_lf='
4050
+'
4051
+case `pwd` in
4052
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
4053
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
4054
+esac
4055
+case $srcdir in
4056
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
4057
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
4058
+esac
4059
4060
-dnl GNOME_MAINTAINER_MODE_DEFINES ()
4061
-dnl define DISABLE_DEPRECATED
4062
-dnl
4063
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
4064
-[
4065
- AC_REQUIRE([AM_MAINTAINER_MODE])
4066
+# Do `set' in a subshell so we don't clobber the current shell's
4067
+# arguments. Must try -L first in case configure is actually a
4068
+# symlink; some systems play weird games with the mod time of symlinks
4069
+# (eg FreeBSD returns the mod time of the symlink's containing
4070
+# directory).
4071
+if (
4072
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
4073
+ if test "$[*]" = "X"; then
4074
+ # -L didn't work.
4075
+ set X `ls -t "$srcdir/configure" conftest.file`
4076
+ fi
4077
+ rm -f conftest.file
4078
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
4079
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
4080
4081
- DISABLE_DEPRECATED=""
4082
- if test $USE_MAINTAINER_MODE = yes; then
4083
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
4084
- for DOMAIN in $DOMAINS; do
4085
- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
4086
- done
4087
- fi
4088
+ # If neither matched, then we have a broken ls. This can happen
4089
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
4090
+ # broken ls alias from the environment. This has actually
4091
+ # happened. Such a system could not be considered "sane".
4092
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
4093
+alias in your environment])
4094
+ fi
4095
4096
- AC_SUBST(DISABLE_DEPRECATED)
4097
-])
4098
+ test "$[2]" = conftest.file
4099
+ )
4100
+then
4101
+ # Ok.
4102
+ :
4103
+else
4104
+ AC_MSG_ERROR([newly created file is older than distributed files!
4105
+Check your system clock])
4106
+fi
4107
+AC_MSG_RESULT(yes)])
4108
4109
-dnl GNOME_COMPILE_WARNINGS
4110
-dnl Turn on many useful compiler warnings
4111
-dnl For now, only works on GCC
4112
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
4113
- dnl ******************************
4114
- dnl More compiler warnings
4115
- dnl ******************************
4116
+# Copyright (C) 2009 Free Software Foundation, Inc.
4117
+#
4118
+# This file is free software; the Free Software Foundation
4119
+# gives unlimited permission to copy and/or distribute it,
4120
+# with or without modifications, as long as this notice is preserved.
4121
4122
- AC_ARG_ENABLE(compile-warnings,
4123
- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
4124
- [Turn on compiler warnings]),,
4125
- [enable_compile_warnings="m4_default([$1],[yes])"])
4126
+# serial 1
4127
4128
- warnCFLAGS=
4129
- if test "x$GCC" != xyes; then
4130
- enable_compile_warnings=no
4131
- fi
4132
+# AM_SILENT_RULES([DEFAULT])
4133
+# --------------------------
4134
+# Enable less verbose build rules; with the default set to DEFAULT
4135
+# (`yes' being less verbose, `no' or empty being verbose).
4136
+AC_DEFUN([AM_SILENT_RULES],
4137
+[AC_ARG_ENABLE([silent-rules],
4138
+[ --enable-silent-rules less verbose build output (undo: `make V=1')
4139
+ --disable-silent-rules verbose build output (undo: `make V=0')])
4140
+case $enable_silent_rules in
4141
+yes) AM_DEFAULT_VERBOSITY=0;;
4142
+no) AM_DEFAULT_VERBOSITY=1;;
4143
+*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
4144
+esac
4145
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
4146
+AM_BACKSLASH='\'
4147
+AC_SUBST([AM_BACKSLASH])dnl
4148
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
4149
+])
4150
4151
- warning_flags=
4152
- realsave_CFLAGS="$CFLAGS"
4153
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
4154
+#
4155
+# This file is free software; the Free Software Foundation
4156
+# gives unlimited permission to copy and/or distribute it,
4157
+# with or without modifications, as long as this notice is preserved.
4158
4159
- case "$enable_compile_warnings" in
4160
- no)
4161
- warning_flags=
4162
- ;;
4163
- minimum)
4164
- warning_flags="-Wall"
4165
- ;;
4166
- yes)
4167
- warning_flags="-Wall -Wmissing-prototypes"
4168
- ;;
4169
- maximum|error)
4170
- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
4171
- CFLAGS="$warning_flags $CFLAGS"
4172
- for option in -Wno-sign-compare; do
4173
- SAVE_CFLAGS="$CFLAGS"
4174
- CFLAGS="$CFLAGS $option"
4175
- AC_MSG_CHECKING([whether gcc understands $option])
4176
- AC_TRY_COMPILE([], [],
4177
- has_option=yes,
4178
- has_option=no,)
4179
- CFLAGS="$SAVE_CFLAGS"
4180
- AC_MSG_RESULT($has_option)
4181
- if test $has_option = yes; then
4182
- warning_flags="$warning_flags $option"
4183
- fi
4184
- unset has_option
4185
- unset SAVE_CFLAGS
4186
- done
4187
- unset option
4188
- if test "$enable_compile_warnings" = "error" ; then
4189
- warning_flags="$warning_flags -Werror"
4190
- fi
4191
- ;;
4192
- *)
4193
- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
4194
- ;;
4195
- esac
4196
- CFLAGS="$realsave_CFLAGS"
4197
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
4198
- AC_MSG_RESULT($warning_flags)
4199
+# AM_PROG_INSTALL_STRIP
4200
+# ---------------------
4201
+# One issue with vendor `install' (even GNU) is that you can't
4202
+# specify the program used to strip binaries. This is especially
4203
+# annoying in cross-compiling environments, where the build's strip
4204
+# is unlikely to handle the host's binaries.
4205
+# Fortunately install-sh will honor a STRIPPROG variable, so we
4206
+# always use install-sh in `make install-strip', and initialize
4207
+# STRIPPROG with the value of the STRIP variable (set by the user).
4208
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
4209
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
4210
+# Installed binaries are usually stripped using `strip' when the user
4211
+# run `make install-strip'. However `strip' might not be the right
4212
+# tool to use in cross-compilation environments, therefore Automake
4213
+# will honor the `STRIP' environment variable to overrule this program.
4214
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
4215
+if test "$cross_compiling" != no; then
4216
+ AC_CHECK_TOOL([STRIP], [strip], :)
4217
+fi
4218
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
4219
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
4220
4221
- AC_ARG_ENABLE(iso-c,
4222
- AC_HELP_STRING([--enable-iso-c],
4223
- [Try to warn if code is not ISO C ]),,
4224
- [enable_iso_c=no])
4225
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
4226
+#
4227
+# This file is free software; the Free Software Foundation
4228
+# gives unlimited permission to copy and/or distribute it,
4229
+# with or without modifications, as long as this notice is preserved.
4230
4231
- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
4232
- complCFLAGS=
4233
- if test "x$enable_iso_c" != "xno"; then
4234
- if test "x$GCC" = "xyes"; then
4235
- case " $CFLAGS " in
4236
- *[\ \ ]-ansi[\ \ ]*) ;;
4237
- *) complCFLAGS="$complCFLAGS -ansi" ;;
4238
- esac
4239
- case " $CFLAGS " in
4240
- *[\ \ ]-pedantic[\ \ ]*) ;;
4241
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
4242
- esac
4243
- fi
4244
- fi
4245
- AC_MSG_RESULT($complCFLAGS)
4246
+# serial 2
4247
4248
- WARN_CFLAGS="$warning_flags $complCFLAGS"
4249
- AC_SUBST(WARN_CFLAGS)
4250
-])
4251
+# _AM_SUBST_NOTMAKE(VARIABLE)
4252
+# ---------------------------
4253
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
4254
+# This macro is traced by Automake.
4255
+AC_DEFUN([_AM_SUBST_NOTMAKE])
4256
4257
-dnl For C++, do basically the same thing.
4258
+# AM_SUBST_NOTMAKE(VARIABLE)
4259
+# ---------------------------
4260
+# Public sister of _AM_SUBST_NOTMAKE.
4261
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
4262
4263
-AC_DEFUN([GNOME_CXX_WARNINGS],[
4264
- AC_ARG_ENABLE(cxx-warnings,
4265
- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
4266
- [Turn on compiler warnings.]),,
4267
- [enable_cxx_warnings="m4_default([$1],[minimum])"])
4268
+# Check how to create a tarball. -*- Autoconf -*-
4269
4270
- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
4271
- warnCXXFLAGS=
4272
- if test "x$GXX" != xyes; then
4273
- enable_cxx_warnings=no
4274
- fi
4275
- if test "x$enable_cxx_warnings" != "xno"; then
4276
- if test "x$GXX" = "xyes"; then
4277
- case " $CXXFLAGS " in
4278
- *[\ \ ]-Wall[\ \ ]*) ;;
4279
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
4280
- esac
4281
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
4282
+#
4283
+# This file is free software; the Free Software Foundation
4284
+# gives unlimited permission to copy and/or distribute it,
4285
+# with or without modifications, as long as this notice is preserved.
4286
4287
- ## -W is not all that useful. And it cannot be controlled
4288
- ## with individual -Wno-xxx flags, unlike -Wall
4289
- if test "x$enable_cxx_warnings" = "xyes"; then
4290
- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
4291
- fi
4292
- fi
4293
- fi
4294
- AC_MSG_RESULT($warnCXXFLAGS)
4295
+# serial 2
4296
4297
- AC_ARG_ENABLE(iso-cxx,
4298
- AC_HELP_STRING([--enable-iso-cxx],
4299
- [Try to warn if code is not ISO C++ ]),,
4300
- [enable_iso_cxx=no])
4301
+# _AM_PROG_TAR(FORMAT)
4302
+# --------------------
4303
+# Check how to create a tarball in format FORMAT.
4304
+# FORMAT should be one of `v7', `ustar', or `pax'.
4305
+#
4306
+# Substitute a variable $(am__tar) that is a command
4307
+# writing to stdout a FORMAT-tarball containing the directory
4308
+# $tardir.
4309
+# tardir=directory && $(am__tar) > result.tar
4310
+#
4311
+# Substitute a variable $(am__untar) that extract such
4312
+# a tarball read from stdin.
4313
+# $(am__untar) < result.tar
4314
+AC_DEFUN([_AM_PROG_TAR],
4315
+[# Always define AMTAR for backward compatibility.
4316
+AM_MISSING_PROG([AMTAR], [tar])
4317
+m4_if([$1], [v7],
4318
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
4319
+ [m4_case([$1], [ustar],, [pax],,
4320
+ [m4_fatal([Unknown tar format])])
4321
+AC_MSG_CHECKING([how to create a $1 tar archive])
4322
+# Loop over all known methods to create a tar archive until one works.
4323
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
4324
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
4325
+# Do not fold the above two line into one, because Tru64 sh and
4326
+# Solaris sh will not grok spaces in the rhs of `-'.
4327
+for _am_tool in $_am_tools
4328
+do
4329
+ case $_am_tool in
4330
+ gnutar)
4331
+ for _am_tar in tar gnutar gtar;
4332
+ do
4333
+ AM_RUN_LOG([$_am_tar --version]) && break
4334
+ done
4335
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
4336
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
4337
+ am__untar="$_am_tar -xf -"
4338
+ ;;
4339
+ plaintar)
4340
+ # Must skip GNU tar: if it does not support --format= it doesn't create
4341
+ # ustar tarball either.
4342
+ (tar --version) >/dev/null 2>&1 && continue
4343
+ am__tar='tar chf - "$$tardir"'
4344
+ am__tar_='tar chf - "$tardir"'
4345
+ am__untar='tar xf -'
4346
+ ;;
4347
+ pax)
4348
+ am__tar='pax -L -x $1 -w "$$tardir"'
4349
+ am__tar_='pax -L -x $1 -w "$tardir"'
4350
+ am__untar='pax -r'
4351
+ ;;
4352
+ cpio)
4353
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
4354
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
4355
+ am__untar='cpio -i -H $1 -d'
4356
+ ;;
4357
+ none)
4358
+ am__tar=false
4359
+ am__tar_=false
4360
+ am__untar=false
4361
+ ;;
4362
+ esac
4363
4364
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
4365
- complCXXFLAGS=
4366
- if test "x$enable_iso_cxx" != "xno"; then
4367
- if test "x$GXX" = "xyes"; then
4368
- case " $CXXFLAGS " in
4369
- *[\ \ ]-ansi[\ \ ]*) ;;
4370
- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
4371
- esac
4372
+ # If the value was cached, stop now. We just wanted to have am__tar
4373
+ # and am__untar set.
4374
+ test -n "${am_cv_prog_tar_$1}" && break
4375
4376
- case " $CXXFLAGS " in
4377
- *[\ \ ]-pedantic[\ \ ]*) ;;
4378
- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
4379
- esac
4380
- fi
4381
- fi
4382
- AC_MSG_RESULT($complCXXFLAGS)
4383
+ # tar/untar a dummy directory, and stop if the command works
4384
+ rm -rf conftest.dir
4385
+ mkdir conftest.dir
4386
+ echo GrepMe > conftest.dir/file
4387
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
4388
+ rm -rf conftest.dir
4389
+ if test -s conftest.tar; then
4390
+ AM_RUN_LOG([$am__untar <conftest.tar])
4391
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
4392
+ fi
4393
+done
4394
+rm -rf conftest.dir
4395
4396
- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
4397
- AC_SUBST(WARN_CXXFLAGS)
4398
-])
4399
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
4400
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
4401
+AC_SUBST([am__tar])
4402
+AC_SUBST([am__untar])
4403
+]) # _AM_PROG_TAR
4404
4405
m4_include([m4/gtk-doc.m4])
4406
m4_include([m4/intltool.m4])
4407
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/configure libgweather-2.30.0.new/configure
4408
--- libgweather-2.30.0/configure 2010-03-30 05:24:16.000000000 +0200
4409
+++ libgweather-2.30.0.new/configure 2010-03-30 11:25:58.000000000 +0200
83
4410
@@ -1,10 +1,12 @@
84
4411
#! /bin/sh
85
4412
# Guess values for system-dependent variables and create Makefiles.
86
-# Generated by GNU Autoconf 2.64 for libgweather 2.29.92.
87
+# Generated by GNU Autoconf 2.65 for libgweather 2.29.92.
4413
-# Generated by GNU Autoconf 2.64 for libgweather 2.30.0.
4414
+# Generated by GNU Autoconf 2.65 for libgweather 2.30.0.
88
4415
+#
89
4416
#
90
4417
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
158
4485
@@ -1766,7 +1763,7 @@
159
4486
if $ac_init_version; then
160
4487
cat <<\_ACEOF
161
libgweather configure 2.29.92
4488
libgweather configure 2.30.0
162
4489
-generated by GNU Autoconf 2.64
163
4490
+generated by GNU Autoconf 2.65
164
4491
203
4530
@@ -2227,7 +2224,7 @@
204
4531
running configure, to aid debugging if configure makes a mistake.
205
4532
206
It was created by libgweather $as_me 2.29.92, which was
4533
It was created by libgweather $as_me 2.30.0, which was
207
4534
-generated by GNU Autoconf 2.64. Invocation command line was
208
4535
+generated by GNU Autoconf 2.65. Invocation command line was
209
4536
588
4915
# Check whether --enable-locations-compression was given.
589
4916
if test "${enable_locations_compression+set}" = set; then :
590
4917
enableval=$enable_locations_compression; enable_locations_compression=yes
591
@@ -13308,9 +13317,8 @@
592
{
593
int major, minor, micro;
594
char *tmp_version;
595
- int ignored;
596
597
- ignored = system ("touch conf.glibtest");
598
+ fclose (fopen ("conf.glibtest", "w"));
599
600
/* HP/UX 9 (%@#!) writes to sscanf strings */
601
tmp_version = g_strdup("$min_glib_version");
602
@@ -14085,7 +14093,7 @@
4918
@@ -14084,7 +14093,7 @@
603
4919
# We need to process the po/ directory.
604
4920
POSUB=po
605
4921
608
4924
609
4925
610
4926
for lang in $ALL_LINGUAS; do
611
@@ -14427,6 +14435,14 @@
4927
@@ -14426,6 +14435,14 @@
612
4928
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
613
4929
am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
614
4930
;;
623
4939
esac
624
4940
625
4941
fi
626
@@ -14457,6 +14473,14 @@
4942
@@ -14456,6 +14473,14 @@
627
4943
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
628
4944
am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
629
4945
;;
638
4954
esac
639
4955
640
4956
fi
641
@@ -14849,7 +14873,7 @@
4957
@@ -14848,7 +14873,7 @@
642
4958
643
4959
644
4960
647
4963
648
4964
cat >confcache <<\_ACEOF
649
4965
# This file is a shell script that caches the results of configure
650
@@ -14964,6 +14988,10 @@
4966
@@ -14963,6 +14988,10 @@
651
4967
as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
652
4968
Usually this means the macro was only invoked conditionally." "$LINENO" 5
653
4969
fi
658
4974
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
659
4975
as_fn_error "conditional \"AMDEP\" was never defined.
660
4976
Usually this means the macro was only invoked conditionally." "$LINENO" 5
661
@@ -14980,10 +15008,6 @@
4977
@@ -14979,10 +15008,6 @@
662
4978
as_fn_error "conditional \"am__fastdepCC\" was never defined.
663
4979
Usually this means the macro was only invoked conditionally." "$LINENO" 5
664
4980
fi
669
4985
if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
670
4986
as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
671
4987
Usually this means the macro was only invoked conditionally." "$LINENO" 5
672
@@ -15421,7 +15445,7 @@
4988
@@ -15420,7 +15445,7 @@
673
4989
# values after options handling.
674
4990
ac_log="
675
This file was extended by libgweather $as_me 2.29.92, which was
4991
This file was extended by libgweather $as_me 2.30.0, which was
676
4992
-generated by GNU Autoconf 2.64. Invocation command line was
677
4993
+generated by GNU Autoconf 2.65. Invocation command line was
678
4994
679
4995
CONFIG_FILES = $CONFIG_FILES
680
4996
CONFIG_HEADERS = $CONFIG_HEADERS
681
@@ -15461,6 +15485,7 @@
4997
@@ -15460,6 +15485,7 @@
682
4998
683
4999
-h, --help print this help, then exit
684
5000
-V, --version print version number and configuration settings, then exit
686
5002
-q, --quiet, --silent
687
5003
do not print progress messages
688
5004
-d, --debug don't remove temporary files
689
@@ -15483,10 +15508,11 @@
5005
@@ -15482,10 +15508,11 @@
690
5006
691
5007
_ACEOF
692
5008
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
693
5009
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
694
5010
ac_cs_version="\\
695
libgweather config.status 2.29.92
5011
libgweather config.status 2.30.0
696
5012
-configured by $0, generated by GNU Autoconf 2.64,
697
5013
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
698
5014
+configured by $0, generated by GNU Autoconf 2.65,
700
5016
701
5017
Copyright (C) 2009 Free Software Foundation, Inc.
702
5018
This config.status script is free software; the Free Software Foundation
703
@@ -15524,6 +15550,8 @@
5019
@@ -15523,6 +15550,8 @@
704
5020
ac_cs_recheck=: ;;
705
5021
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
706
5022
$as_echo "$ac_cs_version"; exit ;;
709
5025
--debug | --debu | --deb | --de | --d | -d )
710
5026
debug=: ;;
711
5027
--file | --fil | --fi | --f )
712
@@ -15595,6 +15623,7 @@
5028
@@ -15594,6 +15623,7 @@
713
5029
#
714
5030
# INIT-COMMANDS
715
5031
#
717
5033
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
718
5034
719
5035
720
@@ -15862,19 +15891,21 @@
5036
@@ -15861,19 +15891,21 @@
721
5037
do
722
5038
case $ac_config_target in
723
5039
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
741
5057
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
742
5058
743
5059
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
744
@@ -15979,7 +16010,7 @@
5060
@@ -15978,7 +16010,7 @@
745
5061
t delim
746
5062
:nl
747
5063
h
750
5066
t more1
751
5067
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
752
5068
p
753
@@ -15993,7 +16024,7 @@
5069
@@ -15992,7 +16024,7 @@
754
5070
t nl
755
5071
:delim
756
5072
h
759
5075
t more2
760
5076
s/["\\]/\\&/g; s/^/"/; s/$/"/
761
5077
p
762
@@ -16460,6 +16491,7 @@
5078
@@ -16459,6 +16491,7 @@
763
5079
764
5080
765
5081
case $ac_file$ac_mode in
767
5083
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
768
5084
# Autoconf 2.62 quotes --file arguments for eval, but not when files
769
5085
# are listed without --file. Let's play safe and only enable the eval
770
@@ -17190,9 +17222,29 @@
5086
@@ -17189,9 +17222,29 @@
771
5087
chmod +x "$ofile"
772
5088
773
5089
;;
798
5114
"po/stamp-it":C)
799
5115
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
800
5116
as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
801
@@ -17252,12 +17304,6 @@
5117
@@ -17251,12 +17304,6 @@
802
5118
fi
803
5119
804
5120
811
5127
echo "
812
5128
libgweather-$VERSION configure summary:
813
5129
814
@@ -17265,6 +17311,4 @@
5130
@@ -17264,6 +17311,4 @@
815
5131
Source code location: ${srcdir}
816
5132
Compiler: ${CC}
817
5133
Python bindings: ${enable_python}
818
5134
- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS}
819
5135
- Locations.xml compression: ${enable_locations_compression}
820
5136
" >&2
821
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/data/Makefile.in libgweather-2.29.92.new/data/Makefile.in
822
--- libgweather-2.29.92/data/Makefile.in 2010-03-09 04:44:36.000000000 +0100
823
+++ libgweather-2.29.92.new/data/Makefile.in 2010-03-09 11:14:51.000000000 +0100
5137
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/data/Makefile.in libgweather-2.30.0.new/data/Makefile.in
5138
--- libgweather-2.30.0/data/Makefile.in 2010-03-30 05:24:17.000000000 +0200
5139
+++ libgweather-2.30.0.new/data/Makefile.in 2010-03-30 11:25:59.000000000 +0200
824
5140
@@ -1,4 +1,4 @@
825
5141
-# Makefile.in generated by automake 1.11 from Makefile.am.
826
5142
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
887
5203
888
5204
check:
889
5205
xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
890
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/doc/Makefile.in libgweather-2.29.92.new/doc/Makefile.in
891
--- libgweather-2.29.92/doc/Makefile.in 2010-03-09 04:44:36.000000000 +0100
892
+++ libgweather-2.29.92.new/doc/Makefile.in 2010-03-09 11:14:51.000000000 +0100
893
@@ -1,4 +1,4 @@
894
-# Makefile.in generated by automake 1.11 from Makefile.am.
895
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
896
# @configure_input@
897
898
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
899
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/icons/Makefile.in libgweather-2.29.92.new/icons/Makefile.in
900
--- libgweather-2.29.92/icons/Makefile.in 2010-03-09 04:44:36.000000000 +0100
901
+++ libgweather-2.29.92.new/icons/Makefile.in 2010-03-09 11:14:51.000000000 +0100
902
@@ -1,4 +1,4 @@
903
-# Makefile.in generated by automake 1.11 from Makefile.am.
904
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
905
# @configure_input@
906
907
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
908
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/libgweather/Makefile.in libgweather-2.29.92.new/libgweather/Makefile.in
909
--- libgweather-2.29.92/libgweather/Makefile.in 2010-03-09 04:44:36.000000000 +0100
910
+++ libgweather-2.29.92.new/libgweather/Makefile.in 2010-03-09 11:14:51.000000000 +0100
911
@@ -1,4 +1,4 @@
912
-# Makefile.in generated by automake 1.11 from Makefile.am.
913
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
914
# @configure_input@
915
916
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
917
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/ltmain.sh libgweather-2.29.92.new/ltmain.sh
918
--- libgweather-2.29.92/ltmain.sh 2010-03-09 03:21:24.000000000 +0100
919
+++ libgweather-2.29.92.new/ltmain.sh 2010-03-09 11:14:47.000000000 +0100
5206
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/doc/Makefile.in libgweather-2.30.0.new/doc/Makefile.in
5207
--- libgweather-2.30.0/doc/Makefile.in 2010-03-30 05:24:17.000000000 +0200
5208
+++ libgweather-2.30.0.new/doc/Makefile.in 2010-03-30 11:25:59.000000000 +0200
5209
@@ -1,4 +1,4 @@
5210
-# Makefile.in generated by automake 1.11 from Makefile.am.
5211
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
5212
# @configure_input@
5213
5214
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5215
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/icons/Makefile.in libgweather-2.30.0.new/icons/Makefile.in
5216
--- libgweather-2.30.0/icons/Makefile.in 2010-03-30 05:24:17.000000000 +0200
5217
+++ libgweather-2.30.0.new/icons/Makefile.in 2010-03-30 11:25:59.000000000 +0200
5218
@@ -1,4 +1,4 @@
5219
-# Makefile.in generated by automake 1.11 from Makefile.am.
5220
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
5221
# @configure_input@
5222
5223
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5224
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/libgweather/Makefile.in libgweather-2.30.0.new/libgweather/Makefile.in
5225
--- libgweather-2.30.0/libgweather/Makefile.in 2010-03-30 05:24:18.000000000 +0200
5226
+++ libgweather-2.30.0.new/libgweather/Makefile.in 2010-03-30 11:25:59.000000000 +0200
5227
@@ -1,4 +1,4 @@
5228
-# Makefile.in generated by automake 1.11 from Makefile.am.
5229
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
5230
# @configure_input@
5231
5232
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5233
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/ltmain.sh libgweather-2.30.0.new/ltmain.sh
5234
--- libgweather-2.30.0/ltmain.sh 2010-03-30 05:24:12.000000000 +0200
5235
+++ libgweather-2.30.0.new/ltmain.sh 2010-03-30 11:25:54.000000000 +0200
920
5236
@@ -1,6 +1,6 @@
921
5237
# Generated from ltmain.m4sh.
922
5238
946
5262
947
5263
# Be Bourne compatible
948
5264
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
949
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/m4/ltversion.m4 libgweather-2.29.92.new/m4/ltversion.m4
950
--- libgweather-2.29.92/m4/ltversion.m4 2010-03-09 03:21:25.000000000 +0100
951
+++ libgweather-2.29.92.new/m4/ltversion.m4 2010-03-09 11:14:47.000000000 +0100
5265
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/m4/ltversion.m4 libgweather-2.30.0.new/m4/ltversion.m4
5266
--- libgweather-2.30.0/m4/ltversion.m4 2010-03-30 05:24:12.000000000 +0200
5267
+++ libgweather-2.30.0.new/m4/ltversion.m4 2010-03-30 11:25:54.000000000 +0200
952
5268
@@ -9,15 +9,15 @@
953
5269
954
5270
# Generated from ltversion.in.
970
5286
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
971
5287
_LT_DECL(, macro_revision, 0)
972
5288
])
973
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/Makefile.in libgweather-2.29.92.new/Makefile.in
974
--- libgweather-2.29.92/Makefile.in 2010-03-09 04:44:36.000000000 +0100
975
+++ libgweather-2.29.92.new/Makefile.in 2010-03-09 11:14:52.000000000 +0100
5289
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/Makefile.in libgweather-2.30.0.new/Makefile.in
5290
--- libgweather-2.30.0/Makefile.in 2010-03-30 05:24:18.000000000 +0200
5291
+++ libgweather-2.30.0.new/Makefile.in 2010-03-30 11:25:59.000000000 +0200
976
5292
@@ -1,4 +1,4 @@
977
5293
-# Makefile.in generated by automake 1.11 from Makefile.am.
978
5294
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1029
5345
*.zip*) \
1030
5346
unzip $(distdir).zip ;;\
1031
5347
esac
1032
diff -Nur -x '*.orig' -x '*~' libgweather-2.29.92/python/Makefile.in libgweather-2.29.92.new/python/Makefile.in
1033
--- libgweather-2.29.92/python/Makefile.in 2010-03-09 04:44:36.000000000 +0100
1034
+++ libgweather-2.29.92.new/python/Makefile.in 2010-03-09 11:14:52.000000000 +0100
5348
diff -Nur -x '*.orig' -x '*~' libgweather-2.30.0/python/Makefile.in libgweather-2.30.0.new/python/Makefile.in
5349
--- libgweather-2.30.0/python/Makefile.in 2010-03-30 05:24:18.000000000 +0200
5350
+++ libgweather-2.30.0.new/python/Makefile.in 2010-03-30 11:25:59.000000000 +0200
1035
5351
@@ -1,4 +1,4 @@
1036
5352
-# Makefile.in generated by automake 1.11 from Makefile.am.
1037
5353
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
Loggerhead is a web-based interface for Breezy
Version: 2.0.1