[Liblas-commits] r1177 - in trunk: . m4

[liblas-commits at liblas.org]

Author: hobu
Date: Sun Apr  5 22:33:30 2009
New Revision: 1177
URL: http://liblas.org/changeset/1177

Log:
use svn:externals to depend on mloskot's macros svn

Removed:
   trunk/m4/
Modified:
   trunk/   (props changed)
   trunk/autogen.sh
   trunk/configure.ac

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Apr  5 22:33:30 2009
@@ -26,7 +26,7 @@
    AMFLAGS=$AMFLAGS" --include-deps";
 fi
 
-echo "Running aclocal -I m4"
+echo "Running aclocal -I macros"
 aclocal -I m4 || giveup
 #echo "Running autoheader"
 #autoheader || giveup

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Apr  5 22:33:30 2009
@@ -214,6 +214,15 @@
 AC_SUBST([GEOTIFF_PREFIX])
 AM_CONDITIONAL([GEOTIFF_IS_CONFIG], [test ! x$GEOTIFF_CONFIG = xno])
 
+
+dnl Oracle Checks
+
+ORACLE_OCI_REQ_VERSION="10.0.1"
+HAVE_ORACLE_OCI="no"
+AX_LIB_ORACLE_OCI($ORACLE_OCI_REQ_VERSION)
+AM_CONDITIONAL([OCI_IS_CONFIG], [test ! x$HAVE_ORACLE_OCI = xno])
+
+
 dnl #########################################################################
 dnl Determine other features of compiler
 dnl #########################################################################