[Liblas-commits] hg: clean up instant client support to match
gdal's configure sc...
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon Dec 7 13:52:23 EST 2009
changeset 790f61c63d31 in /Volumes/Data/www/liblas.org/hg
details: http://hg.liblas.orghg?cmd=changeset;node=790f61c63d31
summary: clean up instant client support to match gdal's configure script
diffstat:
m4/ax_lib_oracle_oci.m4 | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diffs (51 lines):
diff -r c6a2e0e03bac -r 790f61c63d31 m4/ax_lib_oracle_oci.m4
--- a/m4/ax_lib_oracle_oci.m4 Mon Dec 07 11:32:25 2009 -0600
+++ b/m4/ax_lib_oracle_oci.m4 Mon Dec 07 12:48:29 2009 -0600
@@ -162,7 +162,16 @@
dnl
dnl Check OCI headers
dnl
- AC_MSG_CHECKING([for Oracle OCI headers in $oracle_include_dir])
+ if test -f "$oracle_include_dir/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir"
+ fi
+ if test -f "$oracle_include_dir2/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir2"
+ fi
+ if test -f "$oracle_include_dir3/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir3"
+ fi
+ AC_MSG_CHECKING([for Oracle OCI headers in $ACTIVE_INCLUDE_DIR])
AC_LANG_PUSH(C++)
AC_COMPILE_IFELSE([
@@ -242,17 +251,26 @@
if test "$oci_header_found" = "yes" -a "$oci_lib_found" = "yes" -a \
-n "$oracle_version_req"; then
- oracle_version_major=`cat $oracle_include_dir/oci.h \
+ if test -f "$oracle_include_dir/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir"
+ fi
+ if test -f "$oracle_include_dir2/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir2"
+ fi
+ if test -f "$oracle_include_dir3/oci.h"; then
+ ACTIVE_INCLUDE_DIR="$oracle_include_dir3"
+ fi
+ oracle_version_major=`cat $ACTIVE_INCLUDE_DIR/oci.h \
| grep '#define.*OCI_MAJOR_VERSION.*' \
| sed -e 's/#define OCI_MAJOR_VERSION *//' \
| sed -e 's/ *\/\*.*\*\///'`
- oracle_version_minor=`cat $oracle_include_dir/oci.h \
+ oracle_version_minor=`cat $ACTIVE_INCLUDE_DIR/oci.h \
| grep '#define.*OCI_MINOR_VERSION.*' \
| sed -e 's/#define OCI_MINOR_VERSION *//' \
| sed -e 's/ *\/\*.*\*\///'`
- AC_MSG_CHECKING([if Oracle OCI version is >= $oracle_version_req])
+ AC_MSG_CHECKING([if Oracle OCI version is >= $oracle_version_req ])
if test -n "$oracle_version_major" -a -n $"oracle_version_minor"; then
More information about the Liblas-commits
mailing list