Changeset: a6ae3e97fcbb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6ae3e97fcbb
Modified Files:
configure.ag
Branch: default
Log Message:
Fixed the variables used in the configure script for handling the lidar vault
diffs (81 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -167,15 +167,8 @@ dft_lidar=auto
AC_ARG_ENABLE(lidar,
AS_HELP_STRING([--enable-lidar],
[enable support for LiDAR data (default=auto)]),
- enable_lidar=$enableval,
- enable_lidar=$dft_lidar)
-
-dft_shp=auto
-AC_ARG_ENABLE(shp,
- AS_HELP_STRING([--enable-shp],
- [enable support for ESRI Shapefiles (default=auto)]),
- enable_shp=$enableval,
- enable_shp=$dft_shp)
+ have_lidar=$enableval,
+ have_lidar=$dft_lidar)
dft_sql=yes
AC_ARG_ENABLE(sql,
@@ -2606,7 +2599,7 @@ AC_ARG_WITH(liblas,
AS_HELP_STRING([--with-liblas=DIR],
[liblas library is installed in DIR]),
have_liblas="$withval")
-case "$enable_lidar" in
+case "$have_lidar" in
yes|auto)
# liblas >= 1.8.0 required
LIBLAS_VERSION_REQUIRED_MIN=1.8.0
@@ -2653,23 +2646,23 @@ yes|auto)
fi
# if lidar is enabled and liblas was not found abort
if test "x$have_liblas" = xno; then
- if test "x$enable_lidar" = xyes; then
+ if test "x$have_lidar" = xyes; then
AC_MSG_ERROR([liblas library required for lidar module])
fi
# no liblas, so don't compile lidar
- enable_lidar=no
+ have_lidar=no
if test "x$disable_lidar" = x; then
disable_lidar=${why_have_liblas:-"(liblas library
required for lidar module)"}
fi
fi
;;
no)
- enable_lidar=no
+ have_lidar=no
have_liblas=no
why_have_liblas="(lidar module is disabled)"
;;
esac
-case "$enable_lidar" in
+case "$have_lidar" in
no) LIBLAS_RPM=without;;
*) LIBLAS_RPM=with;;
esac
@@ -2678,11 +2671,11 @@ AC_SUBST(LIBLAS_RPM)
AC_SUBST(LIBLAS_INCS)
AC_SUBST(LIBLAS_LIBS)
-AC_MSG_CHECKING(['enable lidar: $enable_lidar'])
+AC_MSG_CHECKING(['enable lidar: $have_lidar'])
-AM_CONDITIONAL(HAVE_LIDAR, test "x$enable_lidar" = xyes -o "x$enable_lidar" =
xauto)
+AM_CONDITIONAL(HAVE_LIDAR, test "x$have_lidar" = xyes -o "x$have_lidar" =
xauto)
-AC_MSG_CHECKING(['enable lidar: $enable_lidar'])
+AC_MSG_CHECKING(['enable lidar: $have_lidar'])
# gdal
org_have_gdal="auto"
@@ -3611,6 +3604,7 @@ for comp in \
eval "org=\$org_have_$comp"
eval "have=\$have_$comp"
eval "why=\$why_have_$comp"
+
case "$why-$have-$org" in
-no-no) why="(by default)";;
-no-*) why="(by command line option)";;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
