Fixes memory leak in auglag/auglag.c

[nlopt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a6eedfd2b2238812737684f373990b3b0a72aacb..57dbaccac46399849af98ec6975e90e4020ec9fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(nlopt, 2.4, stevenj@alum.mit.edu)
+AC_INIT(nlopt, 2.5, stevenj@alum.mit.edu)
 AC_CONFIG_SRCDIR(api/nlopt.h)
-SHARED_VERSION_INFO="8:0:8" # CURRENT:REVISION:AGE
+SHARED_VERSION_INFO="9:0:9" # CURRENT:REVISION:AGE
 
 AM_INIT_AUTOMAKE(1.7)
 AM_CONFIG_HEADER(config.h)
@@ -86,6 +86,14 @@ if test "$ok" = "yes"; then
 fi
 AC_MSG_RESULT(${ok})
 
+AC_MSG_CHECKING([for fpclassify])
+AC_TRY_LINK([#include <math.h>
+], [if (!fpclassify(3.14159)) fpclassify(2.7183);], ok=yes, ok=no)
+if test "$ok" = "yes"; then
+       AC_DEFINE(HAVE_FPCLASSIFY,1,[Define if the fpclassify() function/macro is available.])
+fi
+AC_MSG_RESULT(${ok})
+
 AC_MSG_CHECKING([for copysign])
 AC_TRY_LINK([#include <math.h>
 ], [double x = copysign(3.14159, -2.7183);], ok=yes, ok=no)
@@ -138,8 +146,17 @@ if test "x$GUILE" = xunknown; then
    AC_MSG_WARN([can't find guile, disabling Guile wrapper])
    GUILE_CONFIG=unknown
 elif test x"$GUILE_INSTALL_DIR" = "x"; then
+   AC_CHECK_PROGS(GUILE_CONFIG, guile-config, echo)
+   AC_MSG_CHECKING(guile prefix)
+   GUILE_PREFIX=`$GUILE_CONFIG info prefix`
+   AC_MSG_RESULT($GUILE_PREFIX)
    AC_MSG_CHECKING([for Guile installation directory])
    GUILE_INSTALL_DIR=`guile -c '(display (%site-dir))'`
+   if test "$prefix" != "NONE"; then
+        # strip guile install path to honor prefix
+        GUILE_INSTALL_DIR=`echo "$GUILE_INSTALL_DIR" | sed "s|$GUILE_PREFIX|$prefix|g"`
+   fi
+
    AC_MSG_RESULT([$GUILE_INSTALL_DIR])
 fi
 
@@ -157,7 +174,7 @@ if test $have_python = yes; then
                 [unknown], [`dirname $PYTHON`:$PATH])
   AC_MSG_CHECKING([for Python include flags])
   if test "x$PYTHON_CONFIG" = "xunknown"; then
-      pinc=-I`echo "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()" | $PYTHON - 2>/dev/null`
+      pinc=-I`echo "import distutils.sysconfig; print (distutils.sysconfig.get_python_inc())" | $PYTHON - 2>/dev/null`
       test "x$pinc" = "x-I" && pinc=""
   else
       pinc=`$PYTHON_CONFIG --includes 2>/dev/null`
@@ -170,7 +187,7 @@ if test $have_python = yes; then
                                    have_python=no])
   if test $have_python = yes; then
     AC_MSG_CHECKING([for Numpy include directory])
-    pinc=`echo "import numpy; print numpy.get_include()" | $PYTHON - 2>/dev/null`
+    pinc=`echo "import numpy; print (numpy.get_include())" | $PYTHON - 2>/dev/null`
     AC_MSG_RESULT([${pinc:-unknown}])
     test -n "$pinc" && PYTHON_INCLUDES="$PYTHON_INCLUDES -I$pinc"
     CPPFLAGS="$save_CPPFLAGS $PYTHON_INCLUDES"
@@ -214,11 +231,15 @@ elif test x"$OCT_INSTALL_DIR" = "x"; then
        # try to find installation directory
        AC_CHECK_PROGS(OCTAVE, octave, echo)
        AC_CHECK_PROGS(OCTAVE_CONFIG, octave-config, echo)
-
+       
+       AC_MSG_CHECKING(octave prefix)
+       OCTAVE_PREFIX=`$OCTAVE_CONFIG --print PREFIX 2> /dev/null`
+       AC_MSG_RESULT($OCTAVE_PREFIX)
+       
        AC_MSG_CHECKING(where octave plugins go)
-       OCT_INSTALL_DIR=`octave-config --oct-site-dir 2> /dev/null | grep '/'`
+       OCT_INSTALL_DIR=`$OCTAVE_CONFIG --oct-site-dir 2> /dev/null | grep '/'`
        if test -z "$OCT_INSTALL_DIR"; then
-               OCT_INSTALL_DIR=`octave-config --print OCTFILEDIR 2> /dev/null | grep '/'`
+               OCT_INSTALL_DIR=`$OCTAVE_CONFIG --print OCTFILEDIR 2> /dev/null | grep '/'`
        fi
        if test -z "$OCT_INSTALL_DIR"; then
                OCT_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/oct/" | head -1`
@@ -227,6 +248,10 @@ elif test x"$OCT_INSTALL_DIR" = "x"; then
                OCT_INSTALL_DIR=`echo "DEFAULT_LOADPATH" | $OCTAVE -q 2> /dev/null | tr ':' '\n' | grep "site/oct" | head -1`
         fi
        if test -n "$OCT_INSTALL_DIR"; then
+               if test "$prefix" != "NONE"; then
+                       # strip octave install path to honor prefix
+                       OCT_INSTALL_DIR=`echo "$OCT_INSTALL_DIR" | sed "s|$OCTAVE_PREFIX|$prefix|g"`
+               fi
                AC_MSG_RESULT($OCT_INSTALL_DIR)
        else
                AC_MSG_RESULT(unknown)
@@ -234,9 +259,9 @@ elif test x"$OCT_INSTALL_DIR" = "x"; then
        fi
 
        AC_MSG_CHECKING(where octave scripts go)
-       M_INSTALL_DIR=`octave-config --m-site-dir 2> /dev/null | grep '/'`
+       M_INSTALL_DIR=`$OCTAVE_CONFIG --m-site-dir 2> /dev/null | grep '/'`
        if test -z "$M_INSTALL_DIR"; then
-               M_INSTALL_DIR=`octave-config --print FCNFILEDIR 2> /dev/null | grep '/'`
+               M_INSTALL_DIR=`$OCTAVE_CONFIG --print FCNFILEDIR 2> /dev/null | grep '/'`
        fi
        if test -z "$M_INSTALL_DIR"; then
                M_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/m" | head -1`
@@ -245,6 +270,10 @@ elif test x"$OCT_INSTALL_DIR" = "x"; then
                M_INSTALL_DIR=`echo "DEFAULT_LOADPATH" | $OCTAVE -q 2> /dev/null | tr ':' '\n' | grep "site/m" | head -1`
         fi
        if test -n "$M_INSTALL_DIR"; then
+               if test "$prefix" != "NONE"; then
+                       # strip octave install path to honor prefix
+                       M_INSTALL_DIR=`echo "$M_INSTALL_DIR" | sed "s|$OCTAVE_PREFIX|$prefix|g"`
+               fi
                AC_MSG_RESULT($M_INSTALL_DIR)
        else
                AC_MSG_RESULT(unknown)