It seems that gnome-autogen.sh does not support recent automake versions.
In the same time, it seems that a more standard tool exists: autoreconf.
Signed-off-by: Guilhem Bonnefille guilhem.bonnefi...@gmail.com
---
autogen.sh | 48
configure.ac | 4 +++-
2 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index a5b137d..e7faa52 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,24 +1,32 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z $srcdir srcdir=.
-
-PKG_NAME=viking
-
-(test -f $srcdir/configure.ac \
- test -f $srcdir/README \
- test -d $srcdir/src) || {
-echo -n **Error**: Directory \`$srcdir\' does not look like the
-echo top-level $PKG_NAME directory
-exit 1
-}
-
-which gnome-autogen.sh || {
-echo You need to install gnome-common module and make
-echo sure the gnome-autogen.sh script is in your \$PATH.
-exit 1
-}
-
-ACLOCAL_FLAGS=$ACLOCAL_FLAGS -I m4 REQUIRED_AUTOMAKE_VERSION=1.8
USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+test -n $srcdir || srcdir=`dirname $0`
+test -n $srcdir || srcdir=.
+
+olddir=`pwd`
+cd $srcdir
+
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+echo *** No intltoolize found, please install the intltool package
***
+exit 1
+fi
+
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+echo *** No autoreconf found, please install it ***
+exit 1
+fi
+
+if test -z `which autopoint`; then
+echo *** No autopoint found, please install it ***
+exit 1
+fi
+
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
--verbose
+
+cd $olddir
+test -n $NOCONFIGURE || $srcdir/configure $@
diff --git a/configure.ac b/configure.ac
index d1dad54..5e514d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,9 @@
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,$GETTEXT_PACKAGE,[Gettext package name])
AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
IT_PROG_INTLTOOL([0.35.0])
AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
--
tg: (4f55650..) t/build/update-autogen (depends on: master)
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60133471iu=/4140/ostg.clktrk
___
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
