fixes for latest autoconf version

darcs-hash:20081108062003-c8de0-5793892e3a4f77cbd51397325a5ddb747ab579ea.gz

diff --git a/Makefile.am b/Makefile.am
index 144845fe6c2e6cda0df8d3708abe89d3b2206ae7..704511300f98e14b90ad0567c15d803f31fcfcfe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 OPTIONS_AUTOMAKE=gnu
 lib_LTLIBRARIES = libnlopt@NLOPT_SUFFIX@.la
 
-ACLOCAL_AMFLAGS=-I ./m4
+ACLOCAL_AMFLAGS=-I m4
 
 if WITH_CXX
 CXX_DIRS = stogo

diff --git a/configure.ac b/configure.ac
index 2645ad227f27d1d11cf798730d87b82b8ac5f36f..b461fdc7b16c2cb9005fb612e1a9a5e87b711a69 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ SHARED_VERSION_INFO="0:0:0" # CURRENT:REVISION:AGE
 
 AM_INIT_AUTOMAKE(1.7)
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 AC_SUBST(SHARED_VERSION_INFO)
 AC_DISABLE_SHARED dnl to hell with shared libraries
@@ -23,8 +24,8 @@ AC_ARG_WITH(cxx,
        [AC_HELP_STRING([--with-cxx], [include C++-based routines])],
         with_cxx=$withval,with_cxx=no)
 AM_CONDITIONAL(WITH_CXX, test "x$with_cxx" = xyes)
+AC_PROG_CXX
 if test "x$with_cxx" = xyes; then
-   AC_PROG_CXX
    AC_DEFINE([WITH_CXX], 1, [Define if compiled including C++-based routines])
    NLOPT_SUFFIX="_cxx"
 fi