« back to all changes in this revision
Viewing changes to aclocal.m4
- browse files at revision 1.1.26
- compare with another revision
- download diff
- download tarball
- view history from revision 1.1.26
- Committer: Bazaar Package Importer
- Author(s): Martin Pitt
- Date: 2011-08-22 14:39:00 UTC
- mto: (44.1.1 oneiric-proposed)
- mto: This revision was merged to the branch mainline in revision 40.
- Revision ID: james.westby@ubuntu.com-20110822143900-rh1uyhxyh6b61wqj
Tags: upstream-3.1.3
Import upstream version 3.1.3
- files added:
- compile
- files removed:
- data/simple-scan.schemas.in
- files modified:
- Makefile.in
added
removed
aclocal.m4
13
13
14
14
m4_ifndef([AC_AUTOCONF_VERSION],
15
15
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
17
[m4_warning([this file was generated for autoconf 2.67.
16
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
17
[m4_warning([this file was generated for autoconf 2.68.
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
21
22
dnl AM_GCONF_SOURCE_2
23
dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
24
dnl (i.e. pass to gconftool-2
25
dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
26
dnl you should install foo.schemas files
27
dnl
28
29
AC_DEFUN([AM_GCONF_SOURCE_2],
30
[
31
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
32
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
33
else
34
GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
35
fi
36
37
AC_ARG_WITH([gconf-source],
38
AC_HELP_STRING([--with-gconf-source=sourceaddress],
39
[Config database for installing schema files.]),
40
[GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
41
42
AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
43
AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
44
45
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
46
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
47
fi
48
49
AC_ARG_WITH([gconf-schema-file-dir],
50
AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
51
[Directory for installing schema files.]),
52
[GCONF_SCHEMA_FILE_DIR="$withval"],)
53
54
AC_SUBST(GCONF_SCHEMA_FILE_DIR)
55
AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
56
57
AC_ARG_ENABLE(schemas-install,
58
AC_HELP_STRING([--disable-schemas-install],
59
[Disable the schemas installation]),
60
[case ${enableval} in
61
yes|no) ;;
62
*) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
63
esac])
64
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
65
])
66
67
22
# gnome-common.m4
23
#
24
# serial 3
68
25
#
69
26
70
27
dnl GNOME_COMMON_INIT
71
28
72
AC_DEFUN([GNOME_COMMON_INIT],
29
AU_DEFUN([GNOME_COMMON_INIT],
73
30
[
74
31
dnl this macro should come after AC_CONFIG_MACRO_DIR
75
32
AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
82
39
fi
83
40
84
41
AC_SUBST([ACLOCAL_AMFLAGS])
85
])
42
],
43
[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
44
in your top-level Makefile.am, instead, where "m4" is the macro directory set
45
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
86
46
87
47
AC_DEFUN([GNOME_DEBUG_CHECK],
88
48
[
314
274
GNOME_DOC_DEFINES
315
275
])
316
276
277
dnl GLIB_GSETTINGS
278
dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
279
dnl the schema should be compiled
280
dnl
281
282
AC_DEFUN([GLIB_GSETTINGS],
283
[
284
m4_pattern_allow([AM_V_GEN])
285
AC_ARG_ENABLE(schemas-compile,
286
AS_HELP_STRING([--disable-schemas-compile],
287
[Disable regeneration of gschemas.compiled on install]),
288
[case ${enableval} in
289
yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
290
no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
291
*) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
292
esac])
293
AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
294
PKG_PROG_PKG_CONFIG([0.16])
295
AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
296
if test x$cross_compiling != xyes; then
297
GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
298
else
299
AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
300
fi
301
AC_SUBST(GLIB_COMPILE_SCHEMAS)
302
if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
303
ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
304
else
305
ifelse([$1],,[:],[$1])
306
fi
307
308
GSETTINGS_RULES='
309
.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
310
311
mostlyclean-am: clean-gsettings-schemas
312
313
gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
314
315
%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
316
$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
317
318
all-am: $(gsettings_SCHEMAS:.xml=.valid)
319
uninstall-am: uninstall-gsettings-schemas
320
install-data-am: install-gsettings-schemas
321
322
.SECONDARY: $(gsettings_SCHEMAS)
323
324
install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
325
@$(NORMAL_INSTALL)
326
if test -n "$^"; then \
327
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
328
$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
329
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
330
fi
331
332
uninstall-gsettings-schemas:
333
@$(NORMAL_UNINSTALL)
334
@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
335
files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
336
test -n "$$files" || exit 0; \
337
echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
338
cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
339
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
340
341
clean-gsettings-schemas:
342
rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
343
344
ifdef gsettings_ENUM_NAMESPACE
345
$(gsettings__enum_file): $(gsettings_ENUM_FILES)
346
$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
347
endif
348
'
349
_GSETTINGS_SUBST(GSETTINGS_RULES)
350
])
351
352
dnl _GSETTINGS_SUBST(VARIABLE)
353
dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
354
AC_DEFUN([_GSETTINGS_SUBST],
355
[
356
AC_SUBST([$1])
357
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
358
]
359
)
360
317
361
318
362
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
319
363
# serial 40 IT_PROG_INTLTOOL
569
613
# ----------------------------------
570
614
AC_DEFUN([PKG_PROG_PKG_CONFIG],
571
615
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
572
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
616
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
617
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
573
618
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
574
619
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
575
620
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
615
660
pkg_cv_[]$1="$$1"
616
661
elif test -n "$PKG_CONFIG"; then
617
662
PKG_CHECK_EXISTS([$3],
618
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
663
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
664
test "x$?" != "x0" && pkg_failed=yes ],
619
665
[pkg_failed=yes])
620
666
else
621
667
pkg_failed=untried
663
709
AC_MSG_RESULT([no])
664
710
_PKG_SHORT_ERRORS_SUPPORTED
665
711
if test $_pkg_short_errors_supported = yes; then
666
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
712
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
667
713
else
668
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
714
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
669
715
fi
670
716
# Put the nasty error message in config.log where it belongs
671
717
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
788
834
am_aux_dir=`cd $ac_aux_dir && pwd`
789
835
])
790
836
791
792
# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
793
# Free Software Foundation, Inc.
794
#
795
# This file is free software; the Free Software Foundation
796
# gives unlimited permission to copy and/or distribute it,
797
# with or without modifications, as long as this notice is preserved.
798
799
# serial 4
800
801
# This was merged into AC_PROG_CC in Autoconf.
802
803
AU_DEFUN([AM_PROG_CC_STDC],
804
[AC_PROG_CC
805
AC_DIAGNOSE([obsolete], [$0:
806
your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
807
`ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
808
you adjust the code. You can also remove the above call to
809
AC_PROG_CC if you already called it elsewhere.])
810
am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
811
])
812
AU_DEFUN([fp_PROG_CC_STDC])
813
814
837
# AM_CONDITIONAL -*- Autoconf -*-
815
838
816
839
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
1109
1132
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1110
1133
])
1111
1134
1135
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1136
# Free Software Foundation, Inc.
1137
#
1138
# This file is free software; the Free Software Foundation
1139
# gives unlimited permission to copy and/or distribute it,
1140
# with or without modifications, as long as this notice is preserved.
1141
1142
# serial 8
1143
1144
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
1145
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
1146
1112
1147
# Do all the work for Automake. -*- Autoconf -*-
1113
1148
1114
1149
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1382
1417
rm -f confinc confmf
1383
1418
])
1384
1419
1420
# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
1421
# Free Software Foundation, Inc.
1422
#
1423
# This file is free software; the Free Software Foundation
1424
# gives unlimited permission to copy and/or distribute it,
1425
# with or without modifications, as long as this notice is preserved.
1426
1427
# serial 6
1428
1429
# AM_PROG_CC_C_O
1430
# --------------
1431
# Like AC_PROG_CC_C_O, but changed for automake.
1432
AC_DEFUN([AM_PROG_CC_C_O],
1433
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
1434
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1435
AC_REQUIRE_AUX_FILE([compile])dnl
1436
# FIXME: we rely on the cache variable name because
1437
# there is no other way.
1438
set dummy $CC
1439
am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
1440
eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
1441
if test "$am_t" != yes; then
1442
# Losing compiler, so override with the script.
1443
# FIXME: It is wrong to rewrite CC.
1444
# But if we don't then we get into trouble of one sort or another.
1445
# A longer-term fix would be to have automake use am__CC in this case,
1446
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1447
CC="$am_aux_dir/compile $CC"
1448
fi
1449
dnl Make sure AC_PROG_CC is never called again, or it will override our
1450
dnl setting of CC.
1451
m4_define([AC_PROG_CC],
1452
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
1453
])
1454
1385
1455
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
1386
1456
1387
1457
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1719
1789
AC_SUBST([am__untar])
1720
1790
]) # _AM_PROG_TAR
1721
1791
1792
# Autoconf support for the Vala compiler
1793
1794
# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
1795
#
1796
# This file is free software; the Free Software Foundation
1797
# gives unlimited permission to copy and/or distribute it,
1798
# with or without modifications, as long as this notice is preserved.
1799
1800
# serial 4
1801
1802
# Check whether the Vala compiler exists in `PATH'. If it is found, the
1803
# variable VALAC is set. Optionally a minimum release number of the
1804
# compiler can be requested.
1805
#
1806
# AM_PROG_VALAC([MINIMUM-VERSION])
1807
# --------------------------------
1808
AC_DEFUN([AM_PROG_VALAC],
1809
[AC_PATH_PROG([VALAC], [valac], [])
1810
AS_IF([test -z "$VALAC"],
1811
[AC_MSG_WARN([No Vala compiler found. You will not be able to compile .vala source files.])],
1812
[AS_IF([test -n "$1"],
1813
[AC_MSG_CHECKING([$VALAC is at least version $1])
1814
am__vala_version=`$VALAC --version | sed 's/Vala *//'`
1815
AS_VERSION_COMPARE([$1], ["$am__vala_version"],
1816
[AC_MSG_RESULT([yes])],
1817
[AC_MSG_RESULT([yes])],
1818
[AC_MSG_RESULT([no])
1819
AC_MSG_ERROR([Vala $1 not found.])])])])
1820
])
1821
Loggerhead is a web-based interface for Breezy
Version: 2.0.1