Commit ddbf94d0 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Require Autoconf 2.58. (AC_CONFIG_MACRO_DIR): Specify m4 macro directory.

* configure.ac (AC_PREREQ): Require Autoconf 2.58.
(AC_CONFIG_MACRO_DIR): Specify m4 macro directory.
(IT_PROG_INTLTOOL): Replace obsolete AC_PROG_INTLTOOL().  Require
at least intltool 0.35 for full po/LINGUAS and po/Makevars support.
(ALL_LINGUAS): No longer set this environment variable, but rely
on po/LINGUAS support.  Get rid of the CONFIG_STATUS_DEPENDENCIES
substitution hack.
(GETTEXT_PACKAGE): Move the variable assignment to AC_SUBST().

* po/Makevars: Reintroduce this file, as it is finally properly
supported by intltool.  Set XGETTEXT_OPTIONS to the list of
keywords xgettext should recognize.

* autogen.sh: Get rid of the hack that appends XGETTEXT_KEYWORDS
to po/Makefile.in.in.  Also change the invocation order of the
various setup tools according to the recommendation found in the
gettext manual.  Delete some more cruft from the m4/ directory.

* ABOUT-NLS: Get rid of this both large and largely useless file.
Probably a left-over from the time before glib-gettextize.

svn path=/trunk/; revision=581
parent e620adaa
This diff is collapsed.
2007-01-05 Daniel Elstner <daniel.kitta@gmail.com>
* configure.ac (AC_PREREQ): Require Autoconf 2.58.
(AC_CONFIG_MACRO_DIR): Specify m4 macro directory.
(IT_PROG_INTLTOOL): Replace obsolete AC_PROG_INTLTOOL(). Require
at least intltool 0.35 for full po/LINGUAS and po/Makevars support.
(ALL_LINGUAS): No longer set this environment variable, but rely
on po/LINGUAS support. Get rid of the CONFIG_STATUS_DEPENDENCIES
substitution hack.
(GETTEXT_PACKAGE): Move the variable assignment to AC_SUBST().
* po/Makevars: Reintroduce this file, as it is finally properly
supported by intltool. Set XGETTEXT_OPTIONS to the list of
keywords xgettext should recognize.
* autogen.sh: Get rid of the hack that appends XGETTEXT_KEYWORDS
to po/Makefile.in.in. Also change the invocation order of the
various setup tools according to the recommendation found in the
gettext manual. Delete some more cruft from the m4/ directory.
* ABOUT-NLS: Get rid of this both large and largely useless file.
Probably a left-over from the time before glib-gettextize.
2007-01-05 Daniel Elstner <daniel.kitta@gmail.com>
* m4/export.m4: New file. Defines generalized replacements in the
......
......@@ -58,23 +58,22 @@ test -n "$automake" || automake=automake
# Explicitely delete some old cruft, which seems to be
# more reliable than --force options and the like.
rm -f m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intltool.m4 m4/isc-posix.m4
rm -f m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/progtest.m4
rm -f intltool-extract.in intltool-merge.in intltool-update.in po/Makefile.in.in
rm -f acconfig.h config.cache config.guess config.rpath config.sub
rm -f ABOUT-NLS acconfig.h config.cache config.guess config.rpath config.sub
rm -f depcomp install-sh missing mkinstalldirs
rm -rf autom4te.cache
XGETTEXT_KEYWORDS='--keyword=_ --keyword=N_ --keyword=translate --qt'
#WARNINGS=all; export WARNINGS
(set -x) </dev/null >/dev/null 2>&1 && set -x
glib-gettextize --copy || exit 1
intltoolize --automake --copy --force || exit 1
(echo; echo "XGETTEXT_KEYWORDS = $XGETTEXT_KEYWORDS") >>po/Makefile.in.in || exit 1
intltoolize --automake --copy --force || exit 1
$aclocal -I m4 $ACLOCAL_FLAGS || exit 1
$autoconf || exit 1
$autoheader || exit 1
$automake --add-missing --copy $AUTOMAKE_FLAGS || exit 1
$autoconf || exit 1
) || exit 1
if test -z "$NOCONFIGURE"
......
......@@ -17,9 +17,10 @@
## 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
AC_INIT([regexxer], [0.9], [daniel.kitta@gmail.com], [regexxer])
AC_PREREQ([2.55])
AC_PREREQ([2.58])
AC_CONFIG_SRCDIR([src/pcreshell.cc])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.8 -Wall gnu no-define nostdinc check-news])
......@@ -28,11 +29,8 @@ AC_SUBST([ACLOCAL_AMFLAGS], ['-I m4 ${ACLOCAL_FLAGS}'])
AC_PROG_CC()
AC_PROG_CXX()
AC_PROG_INTLTOOL([0.23])
ALL_LINGUAS=`cat "$srcdir/po/LINGUAS"`
GETTEXT_PACKAGE=regexxer
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/po/LINGUAS'])
AC_SUBST([GETTEXT_PACKAGE])
IT_PROG_INTLTOOL([0.35])
AC_SUBST([GETTEXT_PACKAGE], [regexxer])
AM_GLIB_GNU_GETTEXT()
PKG_CHECK_MODULES([REGEXXER_MODULES],
......
## Copyright (c) 2007 Daniel Elstner <daniel.kitta@gmail.com>
##
## This file is part of regexxer.
##
## regexxer is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## the Free Software Foundation; either version 2 of the License, or
## (at your option) any later version.
##
## regexxer is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with regexxer; if not, write to the Free Software Foundation, Inc.,
## 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
DOMAIN = $(PACKAGE)
subdir = po
top_builddir = ..
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=translate --qt
MSGID_BUGS_ADDRESS = http://regexxer.sourceforge.net/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment