diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 9 |
3 files changed, 16 insertions, 3 deletions
@@ -36,6 +36,7 @@ stamp* /m4/ltoptions.m4 /m4/ltsugar.m4 /m4/ltversion.m4 +/m4/serial-tests.m4 .dirstamp # Gettext droppings @@ -32,6 +32,15 @@ if test -z "$NOCONFIGURE"; then echo "environment." fi +am_ver=`automake --version | grep -m 1 -o '[^ ]*$'` +# Autmake 1.11.x doesn't grasp the 'serial-tests' option. Add a m4 file which +# defines HAS_SERIAL_TESTS_OPTION so we can keep our configure.ac forward +# compatible +case $am_ver in + *\ 1.11*|*\ 1.12*) ;; + *) echo 'm4_define([HAS_SERIAL_TESTS_OPTION], [1])';; +esac > m4/serial-tests.m4 + # Run the actual tools to prepare the clean checkout gtkdocize || exit $? autoreconf -fi || exit $? diff --git a/configure.ac b/configure.ac index 524049b..74c167e 100644 --- a/configure.ac +++ b/configure.ac @@ -35,10 +35,13 @@ AC_INIT([Open Endless SDK], [_EOS_SDK_VERSION_MACRO], # Verify that the source directory can be found dnl AC_CONFIG_SRCDIR([src/hello.c]) # Initialize Automake: enable all warnings and do not insist on GNU standards -# Automake >= 1.13 required for serial-tests # no-portability suppresses warnings about syntax specific to GNU make -# serial-tests uses the old-style test suite -AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign 1.13 serial-tests]) +# If Automake >= 1.13 we need the serial-tests options +# We use an serial-test.m4 file set up in autogen.sh to test if we need it +m4_include([m4/serial-tests.m4]) +m4_ifdef([HAS_SERIAL_TESTS_OPTION], + [AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign 1.11 serial-tests])], + [AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign 1.11])]) # Avoid spewing garbage over the terminal ('make V=1' to see the garbage) AM_SILENT_RULES([yes]) # Initialize Libtool; don't build static libraries |