X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=254580cf2e4ac6b86331e5ff62ee300ae58d87e7;hb=b966262b45e09a705d3e27be50af4d8a143c640e;hp=3ba0c877a246e5e0e55652b06fe3fed7cb641726;hpb=7618722e720eb2817fed1a0ddd696b515b28c74e;p=template.git

diff --git a/configure.ac b/configure.ac
index 3ba0c87..254580c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,29 @@ dnl
 dnl You should have received a copy of the GNU General Public License along
 dnl with this program; if not, write to the Free Software Foundation, Inc.,
 dnl 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+dnl OR:
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions
+dnl are met:
+dnl 1. Redistributions of source code must retain the above copyright
+dnl    notice, this list of conditions and the following disclaimer.
+dnl 2. Redistributions in binary form must reproduce the above copyright
+dnl    notice, this list of conditions and the following disclaimer in the
+dnl    documentation and/or other materials provided with the distribution.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+dnl ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+dnl TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+dnl PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+dnl CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+dnl EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+dnl PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+dnl OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+dnl WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+dnl ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 AC_INIT([foobar],[m4_esyscmd(./version-gen.sh)],
 		[Sebastian Harl <sh@tokkee.org>])
@@ -37,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() {}])
@@ -141,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
@@ -155,26 +186,9 @@ if test "x$enable_strict_checks" = "xyes"; then
 fi
 AC_SUBST([STRICT_CFLAGS])
 
-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;
@@ -187,7 +201,7 @@ install the package into $prefix.
 Configuration summary:
 
   package version: $PACKAGE_VERSION
-  build date: $build_date
+  build date: `date --utc '+%F %T'` (UTC)
 
 Please report bugs to $PACKAGE_BUGREPORT.