From e13593dceb74bfd7e94e22d8ac974e3e0c2bac0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 3 Aug 2014 11:56:38 +0200 Subject: [PATCH] core: fix build with autotools and gettext >= 0.19 --- autogen.sh | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/autogen.sh b/autogen.sh index daac11bbc..7136b33b1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -51,36 +51,20 @@ run () fi } -### -### cleanning part -### -# remove autotools stuff -run "rm -rf config" +# remove autotools stuff run "rm -f config.h.in" run "rm -f aclocal.m4 configure config.log config.status" run "rm -rf autom4te*.cache" + # remove libtool stuff run "rm -f libtool" + # remove gettext stuff run "rm -f ABOUT-NLS" run "rm -rf intl" -### -### configuration part -### -# create the config directory -run "mkdir -p config/m4" -run "mkdir intl" - -# execute autotools cmds -run "autopoint -f" -LIBTOOLIZE=libtoolize -test `uname` = "Darwin" && LIBTOOLIZE=glibtoolize -run "$LIBTOOLIZE --automake --force --copy" -run "aclocal --force -I config/m4" -run "autoheader" -run "autoconf" -run "automake --add-missing --copy --gnu" +# execute autoreconf cmds +run "autoreconf -fvi" # ending rm -f $AUTOGEN_LOG