diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-04-01 02:19:21 +0200 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-04-01 02:21:56 +0200 |
| commit | e4337019ebf4d1166a91d9f6efd8f00230aaa9e0 (patch) | |
| tree | 2fdc39a7933749715cee8d5148541e5a014aea63 | |
| parent | 5d37afe296b287a73c9f4004ab00fec1437eefb9 (diff) | |
| download | yelp-xsl-e4337019ebf4d1166a91d9f6efd8f00230aaa9e0.tar.gz | |
Modernize autotools configuration
Use the configure.ac instead configure.in
New requirements:
automake >= 1.10
intltool >= 0.40
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index cfcb1667..99604b9f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = icons xslt doc po -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} pkgconfigdir = $(datadir)/pkgconfig pkgconfig_DATA = yelp-xsl.pc @@ -7,7 +7,7 @@ abs_srcdir=`(cd $srcdir && pwd)` PKG_NAME="yelp-xsl" -(test -f $srcdir/configure.in \ +(test -f $srcdir/configure.ac \ && test -f $srcdir/README \ && test -d $srcdir/xslt) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" @@ -20,4 +20,4 @@ which gnome-autogen.sh || { exit 1 } -REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.ac index 3b7f6024..dc28452e 100644 --- a/configure.in +++ b/configure.ac @@ -1,10 +1,10 @@ AC_INIT([yelp-xsl],[0.99.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=yelp-xsl]) -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2]) +# Check for programs dnl In the interest of portability, we don't use GNU awk extensions, dnl even though they rule. To prevent accidental use and subsequent dnl bug reports after busted tarballs were shipped, we use -W compat @@ -17,22 +17,24 @@ else fi AC_SUBST(YELP_XSL_AWK) +# Dependecies PKG_CHECK_MODULES(YELP_XSL, [ libxml-2.0 >= 2.6.12 libxslt >= 1.1.8 ]) +# i18n stuff GETTEXT_PACKAGE=yelp-xsl AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.40.0]) AC_ARG_ENABLE(doc, [AS_HELP_STRING([--enable-doc],[build and install developer documentation [default=no]])],, enable_doc=no) -AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" != "xno") +AM_CONDITIONAL(ENABLE_DOC, test "x$enable_doc" != "xno") AC_CONFIG_FILES([ Makefile |