diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-03-11 21:09:56 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-03-11 21:09:56 +0000 |
| commit | c625314940a3e41c28aff7a311ccd7ad2d0bf8d7 (patch) | |
| tree | 9aee3b0cd72c8055992e038aa34c569ad92c53dd | |
| parent | 57563d06e9947380a2cf4a7f97ca5835c4bd8b2b (diff) | |
Make the configure script work with the latest autotools.
| -rw-r--r-- | configure.ac (renamed from configure.in) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.in b/configure.ac index 42d43af..cb8ac36 100644 --- a/configure.in +++ b/configure.ac @@ -1,20 +1,18 @@ -AC_INIT(configure.in) - dnl ---------------------------------------------------------------- dnl append SVN revision to the version number -OSIRIONVERSION='0.2.4' -SVNREVISION=`svnversion $srcdir` -if test ! -z "$SVNREVISION"; then - OSIRIONVERSION="${OSIRIONVERSION}-svn${SVNREVISION}" -fi +dnl determine the svn revision number +define([svnversion], esyscmd([sh -c "echo -n 'svn'; svnversion -q|tr -d '\n'"])) + +AC_INIT([osirion], [0.2.4-svnversion]) -AM_CONFIG_HEADER(src/config.h) -AM_INIT_AUTOMAKE(osirion, $OSIRIONVERSION) +AC_CONFIG_HEADERS(src/config.h) AC_LANG_CPLUSPLUS AC_PROG_CXX -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL + +AM_INIT_AUTOMAKE dnl KDE_FIND_PATH(programm-name, variable-name, list of directories, dnl if-not-found, test-parameter) @@ -508,7 +506,7 @@ dnl Write makefiles and config.h AM_CONDITIONAL(BUILD_CLIENT, test "x$BUILD_CLIENT" = xyes) AM_CONDITIONAL(BUILD_DEDICATED, test "x$BUILD_CLIENT" = xno) -AC_OUTPUT( \ +AC_CONFIG_FILES([ \ src/auxiliary/Makefile \ src/math/Makefile \ src/sys/Makefile \ @@ -525,8 +523,9 @@ AC_OUTPUT( \ src/game/intro/Makefile \ src/game/Makefile \ src/Makefile \ - Makefile -) + Makefile]) + +AC_OUTPUT dnl --------------------------------------------------------------- dnl Configuration summary |