Moved generation of fb_features.h from configure to src/Makefile.

[template.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 26bfa8a0d49cce4482a3d7676248ee06dc71b973..e1c988f7603ce830c7f0a801b0bbee58ab48da69 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,7 +60,16 @@ AC_PROG_MAKE_SET
 
 AM_PROG_CC_C_O
 
-AC_PROG_LIBTOOL
+m4_ifdef([LT_INIT],
+       [
+        LT_INIT
+       ],
+       # else
+       # (older libtools)
+       [
+        AC_PROG_LIBTOOL
+       ]
+)
 
 test_cc_flags() {
        AC_LANG_CONFTEST([int main() {}])
@@ -164,8 +173,7 @@ if test "x$enable_strict_checks" = "xyes"; then
                        -Wpointer-arith \
                        -Wshadow \
                        -Wstrict-prototypes \
-                       -Wunreachable-code \
-                       -Wvla; do
+                       -Wunreachable-code; do
                AC_MSG_CHECKING([whether $CC accepts $flag])
 
                if test_cc_flags $flag; then
@@ -182,22 +190,9 @@ build_date="`date --utc '+%F %T'` (UTC)"
 AC_DEFINE_UNQUOTED([BUILD_DATE], ["$build_date"],
                [Define to the date the package has been built on.])
 
-dnl Version information provided by fb_features.h.
-FB_VERSION_MAJOR=`echo $PACKAGE_VERSION | cut -d'.' -f1`
-FB_VERSION_MINOR=`echo $PACKAGE_VERSION | cut -d'.' -f2`
-FB_VERSION_PATCH=`echo $PACKAGE_VERSION | cut -d'.' -f3`
-FB_VERSION_EXTRA=`echo $PACKAGE_VERSION | cut -d'.' -f4-`
-FB_VERSION_STRING="$FB_VERSION_MAJOR.$FB_VERSION_MINOR.$FB_VERSION_PATCH"
-
-AC_SUBST(FB_VERSION_MAJOR)
-AC_SUBST(FB_VERSION_MINOR)
-AC_SUBST(FB_VERSION_PATCH)
-AC_SUBST(FB_VERSION_EXTRA)
-AC_SUBST(FB_VERSION_STRING)
-
 AC_CHECK_HEADERS(libgen.h)
 
-AC_CONFIG_FILES([Makefile src/Makefile src/fb_features.h])
+AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT
 
 cat <<EOF;