From c944b9977a5314fceeb539af35ad4a968a0424ce Mon Sep 17 00:00:00 2001
From: stevenj <stevenj@alum.mit.edu>
Date: Sat, 8 Nov 2008 01:20:03 -0500
Subject: [PATCH] fixes for latest autoconf version

darcs-hash:20081108062003-c8de0-5793892e3a4f77cbd51397325a5ddb747ab579ea.gz
---
 Makefile.am  | 2 +-
 configure.ac | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 144845f..7045113 100644
--- 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 2645ad2..b461fdc 100644
--- 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
-- 
2.30.2