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 65c92b7e57c0820331c0f68cf494e8b05eee87ec
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Tue Sep 4 13:32:47 2012 +0200
introduced --enable-las and --enable-fann in configure.ac
---
configure | 53 ++++++++++++++++++++++++-----------------------------
configure.ac | 35 ++++++++++++++---------------------
2 files changed, 38 insertions(+), 50 deletions(-)
diff --git a/configure b/configure
index 187ca3a..75879c2 100755
--- a/configure
+++ b/configure
@@ -713,8 +713,8 @@ ac_user_opts='
enable_option_checking
with_gdal
enable_dependency_tracking
-with_fann
-with_las
+enable_fann
+enable_las
'
ac_precious_vars='build_alias
host_alias
@@ -1354,13 +1354,13 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --enable-fann Enable feature fann
+ --enable-las Enable feature las
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-gdal=[ARG] Specify full path to gdal-config script
- --with-fann use fann library @@
- --with-las use las library @@
Some influential environment variables:
CXX C++ compiler command
@@ -5089,16 +5089,9 @@ fi
done
-# Checks for packages
-#PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
-#AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
-
-
-# Check whether --with-fann was given.
-if test "${with_fann+set}" = set; then :
- withval=$with_fann;
-else
- with_fann=no
+# Check whether --enable-fann was given.
+if test "${enable_fann+set}" = set; then :
+ enableval=$enable_fann;
fi
@@ -5107,6 +5100,7 @@ fi
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
@@ -5220,7 +5214,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
-if test "x$with_fann" != xno; then :
+if test "x$enable_fann" = "xyes"; then :
pkg_failed=no
@@ -5299,6 +5293,8 @@ else
USE_FANN_FALSE=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_FANN=true\"" >&5
+$as_echo "$as_me: WARNING: \"USE_FANN=true\"" >&2;}
else
@@ -5310,18 +5306,18 @@ else
USE_FANN_FALSE=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_FANN=false\""
>&5
+$as_echo "$as_me: WARNING: \"USE_FANN=false\"" >&2;}
fi
-
-# Check whether --with-las was given.
-if test "${with_las+set}" = set; then :
- withval=$with_las;
-else
- with_las=no
+# Check whether --enable-las was given.
+if test "${enable_las+set}" = set; then :
+ enableval=$enable_las;
fi
-if test "x$with_las" != xno; then :
+
+if test "x$enable_las" = "xyes"; then :
if true; then
USE_LAS_TRUE=
@@ -5331,6 +5327,10 @@ else
USE_LAS_FALSE=
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_LAS=true\"" >&5
+$as_echo "$as_me: WARNING: \"USE_LAS=true\"" >&2;}
+ FILECLASSES_OPT="src/fileclasses"
+
else
@@ -5342,13 +5342,8 @@ else
USE_LAS_FALSE=
fi
-
-fi
-
-if $USE_LAS; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_LAS=true\"" >&5
-$as_echo "$as_me: WARNING: \"USE_LAS=true\"" >&2;}
- FILECLASSES_OPT="src/fileclasses"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"USE_LAS=false\"" >&5
+$as_echo "$as_me: WARNING: \"USE_LAS=false\"" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index 4c2f774..f44206e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,39 +22,32 @@ AX_LIB_GDAL([1.8.0]) dnl uncomment if gdal version 1.8.0 is
required
AC_CHECK_HEADERS([gdal.h])
-# Checks for packages
-#PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
-#AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
+dnl Default-disabled features
+AC_ARG_ENABLE([fann],
+ AS_HELP_STRING([--enable-fann], [Enable feature fann]))
-AC_ARG_WITH([fann],
- [AS_HELP_STRING([--with-fann], [use fann library] @@)],
- [],
- [with_fann=no])
-AS_IF([test "x$with_fann" != xno],
- [
+AS_IF([test "x$enable_fann" = "xyes"], [
PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
+ AC_MSG_WARN("USE_FANN=true")
], [
AM_CONDITIONAL(USE_FANN, false)
+ AC_MSG_WARN("USE_FANN=false")
])
-AC_ARG_WITH([las],
- [AS_HELP_STRING([--with-las], [use las library] @@)],
- [],
- [with_las=no])
-AS_IF([test "x$with_las" != xno],
- [
+AC_ARG_ENABLE([las],
+ AS_HELP_STRING([--enable-las], [Enable feature las]))
+
+AS_IF([test "x$enable_las" = "xyes"], [
AM_CONDITIONAL(USE_LAS, true)
+ AC_MSG_WARN("USE_LAS=true")
+ FILECLASSES_OPT="src/fileclasses"
+ AC_SUBST([FILECLASSES_OPT])
], [
AM_CONDITIONAL(USE_LAS, false)
+ AC_MSG_WARN("USE_LAS=false")
])
-if $USE_LAS; then
- AC_MSG_WARN("USE_LAS=true")
- FILECLASSES_OPT="src/fileclasses"
- AC_SUBST([FILECLASSES_OPT])
-fi
-
PKG_CHECK_MODULES(GSL, gsl >= 1.14, [HAVE_GSL=1], [HAVE_GSL=0])
AM_CONDITIONAL([USE_GSL], [test "$HAVE_GSL" -eq 1])
--
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
