ref: d5b699e15f5e81bfef1081ac7fb8896b18b6bd2d
parent: 36d3e923827632bbda2bb0326f95ea984a634810
author: Erik de Castro Lopo <erikd@mega-nerd.com>
date: Thu Dec 11 04:37:14 EST 2008
configure.ac : Various updates.
--- a/.bzrignore
+++ b/.bzrignore
@@ -9,6 +9,12 @@
.depend
.deps
.libs
+Cfg
+M4/libtool.m4
+M4/ltoptions.m4
+M4/ltsugar.m4
+M4/ltversion.m4
+M4/lt~obsolete.m4
Makefile
Makefile.in
Octave/*.h
@@ -39,4 +45,3 @@
tests/*_test
tests/benchmark
tests/src-evaluate
-Cfg
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-11 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
+
+ * reconfigure.mk autogen.sh
+ Remove the first, add the second.
+
+ * configure.ac
+ Various updates.
+
2008-11-11 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* doc/index.html
--- a/configure.ac
+++ b/configure.ac
@@ -1,14 +1,27 @@
-# Copyright (C) 2002-2004 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
+# Copyright (C) 2002-2008 Erik de Castro Lopo (erikd AT mega-nerd DOT com).
-dnl Require autoconf version >= 2.54)
-AC_PREREQ(2.54)
+dnl Require autoconf version >= 2.57)
+AC_PREREQ(2.57)
-AC_INIT
+AC_INIT([libsamplerate],[0.1.4pre1],[erikd@mega-nerd.com])
+
+# Put config stuff in Cfg.
+AC_CONFIG_AUX_DIR(Cfg)
+
AC_CONFIG_SRCDIR([src/samplerate.c])
AC_CANONICAL_TARGET([])
-AM_INIT_AUTOMAKE(libsamplerate,0.1.4)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_MACRO_DIR([M4])
+
+AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+AC_CONFIG_HEADER(src/config.h)
+
+
+dnl Add parameters for aclocal
+AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
+
+AC_LANG([C])
+
#------------------------------------------------------------------------------------
# Rules for library version information:
#
@@ -28,12 +41,17 @@
SHARED_VERSION_INFO="1:4:1"
AC_PROG_CC
+AM_PROG_CC_C_O
+
+# Do not check for F77.
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+
+AM_PROG_LIBTOOL
+
AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
AC_PROG_MKDIR_P
if test "x-$build_os-$host_os-$target_os" = x-mingw32-mingw32-mingw32 ; then