[Octave-cvsupdate] SF.net SVN: octave:[6294] trunk/octave-forge/main/octcdf

[<aba...@us...>]

Revision: 6294
          http://octave.svn.sourceforge.net/octave/?rev=6294&view=rev
Author:   abarth93
Date:     2009-10-06 09:21:04 +0000 (Tue, 06 Oct 2009)

Log Message:
-----------
get libraries and compiler flags from nc-config (if present)

Modified Paths:
--------------
    trunk/octave-forge/main/octcdf/DESCRIPTION
    trunk/octave-forge/main/octcdf/src/configure.base

Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION	2009-10-05 18:49:21 UTC (rev 6293)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION	2009-10-06 09:21:04 UTC (rev 6294)
@@ -1,6 +1,6 @@
 Name: octcdf
-Version: 1.0.14
-Date: 2009-06-16
+Version: 1.0.15
+Date: 2009-10-06
 Author: Alexander Barth <bar...@gm...>
 Maintainer: Alexander Barth <bar...@gm...>
 Title: octcdf

Modified: trunk/octave-forge/main/octcdf/src/configure.base
===================================================================
--- trunk/octave-forge/main/octcdf/src/configure.base	2009-10-05 18:49:21 UTC (rev 6293)
+++ trunk/octave-forge/main/octcdf/src/configure.base	2009-10-06 09:21:04 UTC (rev 6294)
@@ -305,28 +305,38 @@
 OCTCDF_LIBS="$LDFLAGS"
 OCTCDF_CFLAGS="$CPPFLAGS"
 
-dnl first checking for opendap support
+dnl first checking for nc-config, then nc-dap 
 
-AC_MSG_CHECKING([for nc-dap])
+AC_MSG_CHECKING([for nc-config])
 
-if ncdap-config --version > /dev/null 2>&1; then
+if nc-config --version > /dev/null 2>&1; then
       AC_MSG_RESULT([yes])
-      OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
-      OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
-
+      OCTCDF_LIBS="$OCTCDF_LIBS `nc-config --libs`"
+      OCTCDF_CFLAGS="$OCTCDF_CFLAGS `nc-config --cflags`"
       HAVE_NETCDF=yes
 else
       AC_MSG_RESULT([no])          
+      AC_MSG_CHECKING([for nc-dap])
 
-      dnl if no opendap, checking if the NetCDF library exists. 
+      if ncdap-config --version > /dev/null 2>&1; then
+            AC_MSG_RESULT([yes])
+            OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
+            OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
 
-      AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
+            HAVE_NETCDF=yes
+      else
+            AC_MSG_RESULT([no])          
 
-      if test $HAVE_NETCDF = yes ; then
-        OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
+            dnl if no opendap, checking if the NetCDF library exists. 
 
-        dnl we have the libraries, no we have also the headers?
-        AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+            AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
+
+            if test $HAVE_NETCDF = yes ; then
+              OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
+
+              dnl we have the libraries, no we have also the headers?
+              AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+            fi
       fi
 fi
 
@@ -355,4 +365,6 @@
 octave-forge is configured with
    octave:      $OCTAVE (version $OCTAVE_VERSION)
    mkoctfile:	$MKOCTFILE for Octave $subver
-   octcdf toolbox: $OCTCDFSTATUS"
+   octcdf toolbox: $OCTCDFSTATUS
+   netCDF compiler flags: $OCTCDF_CFLAGS
+   netCDF libraries: $OCTCDF_LIBS"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.