This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 32dfd49e516f74c5b113e862c939f5d155f8156f
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Fri Sep 14 14:32:48 2012 +0200
introduced --enable-nlopt in configure.ac and pkgetchandlier and
pksetchandelier in src/apps
---
Makefile.in | 2 +
configure | 123 +++++++++++++++++++++++++++++++++++++++++++
configure.ac | 15 +++++-
src/algorithms/Makefile.in | 2 +
src/apps/Makefile.in | 2 +
src/base/Makefile.in | 2 +
src/fileclasses/Makefile.in | 2 +
src/imageclasses/Makefile.in | 2 +
8 files changed, 149 insertions(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index bcd156b..7146fbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,6 +148,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/configure b/configure
index 8d67c8c..c890d6e 100755
--- a/configure
+++ b/configure
@@ -605,6 +605,10 @@ USE_GSL_FALSE
USE_GSL_TRUE
GSL_LIBS
GSL_CFLAGS
+USE_NLOPT_FALSE
+USE_NLOPT_TRUE
+NLOPT_LIBS
+NLOPT_CFLAGS
FILECLASSES_OPT
USE_LAS_FALSE
USE_LAS_TRUE
@@ -715,6 +719,7 @@ with_gdal
enable_dependency_tracking
enable_fann
enable_las
+enable_nlopt
'
ac_precious_vars='build_alias
host_alias
@@ -733,6 +738,8 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
FANN_CFLAGS
FANN_LIBS
+NLOPT_CFLAGS
+NLOPT_LIBS
GSL_CFLAGS
GSL_LIBS
CXXCPP'
@@ -1356,6 +1363,7 @@ Optional Features:
--enable-dependency-tracking do not reject slow dependency extractors
--enable-fann Enable feature fann
--enable-las Enable feature las
+ --enable-nlopt Enable feature nlopt
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1380,6 +1388,9 @@ Some influential environment variables:
path overriding pkg-config's built-in search path
FANN_CFLAGS C compiler flags for FANN, overriding pkg-config
FANN_LIBS linker flags for FANN, overriding pkg-config
+ NLOPT_CFLAGS
+ C compiler flags for NLOPT, overriding pkg-config
+ NLOPT_LIBS linker flags for NLOPT, overriding pkg-config
GSL_CFLAGS C compiler flags for GSL, overriding pkg-config
GSL_LIBS linker flags for GSL, overriding pkg-config
CXXCPP C++ preprocessor
@@ -5347,6 +5358,110 @@ $as_echo "$as_me: WARNING: \"USE_LAS=false\"" >&2;}
fi
+# Check whether --enable-nlopt was given.
+if test "${enable_nlopt+set}" = set; then :
+ enableval=$enable_nlopt;
+fi
+
+
+if test "x$enable_nlopt" = "xyes"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NLOPT" >&5
+$as_echo_n "checking for NLOPT... " >&6; }
+
+if test -n "$NLOPT_CFLAGS"; then
+ pkg_cv_NLOPT_CFLAGS="$NLOPT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"nlopt >= 2.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nlopt >= 2.1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NLOPT_CFLAGS=`$PKG_CONFIG --cflags "nlopt >= 2.1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NLOPT_LIBS"; then
+ pkg_cv_NLOPT_LIBS="$NLOPT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"nlopt >= 2.1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "nlopt >= 2.1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NLOPT_LIBS=`$PKG_CONFIG --libs "nlopt >= 2.1.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NLOPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"nlopt >= 2.1.0" 2>&1`
+ else
+ NLOPT_PKG_ERRORS=`$PKG_CONFIG --print-errors "nlopt >= 2.1.0"
2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NLOPT_PKG_ERRORS" >&5
+
+ HAVE_NLOPT=0
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_NLOPT=0
+else
+ NLOPT_CFLAGS=$pkg_cv_NLOPT_CFLAGS
+ NLOPT_LIBS=$pkg_cv_NLOPT_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_NLOPT=1
+fi
+ if test "$HAVE_NLOPT" -eq 1; then
+ USE_NLOPT_TRUE=
+ USE_NLOPT_FALSE='#'
+else
+ USE_NLOPT_TRUE='#'
+ USE_NLOPT_FALSE=
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_NLOPT=true\""
>&5
+$as_echo "$as_me: WARNING: \"USE_NLOPT=true\"" >&2;}
+
+else
+
+ if false; then
+ USE_NLOPT_TRUE=
+ USE_NLOPT_FALSE='#'
+else
+ USE_NLOPT_TRUE='#'
+ USE_NLOPT_FALSE=
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_NLOPT=false\""
>&5
+$as_echo "$as_me: WARNING: \"USE_NLOPT=false\"" >&2;}
+
+fi
+
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSL" >&5
@@ -5866,6 +5981,14 @@ if test -z "${USE_LAS_TRUE}" && test -z
"${USE_LAS_FALSE}"; then
as_fn_error $? "conditional \"USE_LAS\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${USE_NLOPT_TRUE}" && test -z "${USE_NLOPT_FALSE}"; then
+ as_fn_error $? "conditional \"USE_NLOPT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_NLOPT_TRUE}" && test -z "${USE_NLOPT_FALSE}"; then
+ as_fn_error $? "conditional \"USE_NLOPT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${USE_GSL_TRUE}" && test -z "${USE_GSL_FALSE}"; then
as_fn_error $? "conditional \"USE_GSL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index 8ad32a5..538c9ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pktools], [2.3], [kempe...@gmail.com])
+AC_INIT([pktools], [2.2], [kempe...@gmail.com])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_CONFIG_MACRO_DIR([m4])
AX_LIB_GDAL()
@@ -48,6 +48,19 @@ AS_IF([test "x$enable_las" = "xyes"], [
AC_MSG_WARN("USE_LAS=false")
])
+AC_ARG_ENABLE([nlopt],
+ AS_HELP_STRING([--enable-nlopt], [Enable feature nlopt]))
+
+AS_IF([test "x$enable_nlopt" = "xyes"], [
+ PKG_CHECK_MODULES(NLOPT, nlopt >= 2.1.0, [HAVE_NLOPT=1], [HAVE_NLOPT=0])
+ AM_CONDITIONAL([USE_NLOPT], [test "$HAVE_NLOPT" -eq 1])
+ AC_MSG_WARN("USE_NLOPT=true")
+ ], [
+ AM_CONDITIONAL(USE_NLOPT, false)
+ AC_MSG_WARN("USE_NLOPT=false")
+ ])
+
+
PKG_CHECK_MODULES(GSL, gsl >= 1.14, [HAVE_GSL=1], [HAVE_GSL=0])
AM_CONDITIONAL([USE_GSL], [test "$HAVE_GSL" -eq 1])
diff --git a/src/algorithms/Makefile.in b/src/algorithms/Makefile.in
index cbca0ca..cb28be7 100644
--- a/src/algorithms/Makefile.in
+++ b/src/algorithms/Makefile.in
@@ -144,6 +144,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/src/apps/Makefile.in b/src/apps/Makefile.in
index 4a93c87..de51310 100644
--- a/src/apps/Makefile.in
+++ b/src/apps/Makefile.in
@@ -269,6 +269,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/src/base/Makefile.in b/src/base/Makefile.in
index 3a01970..ab89956 100644
--- a/src/base/Makefile.in
+++ b/src/base/Makefile.in
@@ -144,6 +144,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/src/fileclasses/Makefile.in b/src/fileclasses/Makefile.in
index b9e234d..ac660f1 100644
--- a/src/fileclasses/Makefile.in
+++ b/src/fileclasses/Makefile.in
@@ -142,6 +142,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/src/imageclasses/Makefile.in b/src/imageclasses/Makefile.in
index 372539a..89169bc 100644
--- a/src/imageclasses/Makefile.in
+++ b/src/imageclasses/Makefile.in
@@ -144,6 +144,8 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+NLOPT_CFLAGS = @NLOPT_CFLAGS@
+NLOPT_LIBS = @NLOPT_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
