sync from svn

Author: andre-merzky

Makefile

@@ -94,7 +94,6 @@ endif
 	@$(ECHO)  "      ======================================================"
 
 install::
-	@$(INSTALL)    config.summary $(SAGA_DAT_ROOT)/
 	@$(ECHO)  "      ======================================================"
 	@$(ECHO)  "      === make install to $(SAGA_LOCATION) was successful" 
 	@$(ECHO)  "      ======================================================"
@@ -109,3 +108,4 @@ examples: adaptors
 tools:    adaptors
 docs:     adaptors
 
+

README

@@ -0,0 +1,45 @@
+                            SAGA C++ Core Libraries  
+                    - The Simple API for Grid Applications -
+                          http://www.saga-project.org/
+
+
+  WHAT IS THIS?
+
+  This is the C++ reference implementation of the Open Grid
+  Forum <http://www.ogf.org/> SAGA (Simple API For Grid Applications)
+  standard. It strives compliance with the SAGA Core API specification.
+
+
+  LATEST VERSION
+
+  The latest version can be found on the SAGA project website:
+
+  http://saga-project.org/download
+
+
+  DOCUMENTATION
+
+  The documentation available as of the date of this release is included
+  in HTML format in the docs/apidoc directory. The most up-to-date
+  documentation for the current release can be found on the project page:
+
+  http://saga-project.org/documentation
+
+
+  INSTALLATION
+
+  Read the INSTALL file
+
+
+  LICENSING
+
+  SAGA is released under the Boost Software License 1.0.
+  Please see the LICENSE file for details.
+
+
+  CONTACT
+
+  If you want to be informed about new code releases, bug fixes,
+  security fixes, general news and information about SAGA, subscribe 
+  to the saga-users mailing list: http://saga-project.org/mailinglists.
+

config/saga.config.c.mk.in

@@ -6,6 +6,16 @@
 ifndef SAGA_MK_INC_CONF_C
        SAGA_MK_INC_CONF_C = yes
 
+###########################################################
+#
+# SAGA Module: can be overwritten by makefiles
+#
+ifndef SAGA_MODULE_NAME
+  SAGA_MODULE_NAME         = @SAGA_MODULE_NAME@
+endif 
+#
+###########################################################
+
 ###########################################################
 #
 # version

config/saga.m4

@@ -16,13 +16,14 @@
 #   SAGA_VERSION_MAJOR
 #   SAGA_VERSION_MINOR
 #   SAGA_VERSION_SUBMINOR
-#   SAGA_PACKAGE_VERSION   # = `grep 'Version' PACKAGE`
+#   SAGA_MODULE_VERSION    # = `grep 'VERSION' PACKAGE`
+#   SAGA_MODULE_NAME       # = `grep 'PACKAGE' PACKAGE`
 #
 # This macro stays backward compatible to old versions, by defining
 #   
 #   SAGA_MAKE_INLUDE_ROOT  # = $SAGA_MAKE_DIR
 #   TMP_SAGA_LOCATION      # = $SAGA_LOCATION
-#   SAGA_LIB_VERSION       # = $SAGA_PACKAGE_VERSION
+#   SAGA_LIB_VERSION       # = $SAGA_MODULE_VERSION
 #
 # Thos vars are deprecated though, and may disappear in future versions.
 # 
@@ -117,28 +118,27 @@ AC_DEFUN([AX_SAGA_CONFIG],
   fi
 
 
-  # We set SAGA_PACKAGE_VERSION to SAGA_VERSION by default.  If a local PACKAGE file is
-  # present though, for example for an adaptor, we use its version info instead.  
+  # We set SAGA_MOODULE_NAME, SAGA_MODULE_VERSION to SAGA_VERSION by default.  If a 
+  # local PACKAGE file is present though, for example for an adaptor, we use its 
+  # version info instead.  
 
-  AC_MSG_CHECKING([saga package version])
-  SAGA_PACKAGE_VERSION=$SAGA_VERSION
-  test -f PACKAGE && SAGA_PACKAGE_VERSION=` grep -e '^VERSION:'  PACKAGE | sed -e 's/^VERSION: *//'`
-  test -f PACKAGE && SAGA_PACKAGE_REVISION=`grep -e '^REVISION:' PACKAGE | cut -sf 2 -d '$' | cut -sf 2 -d ' '`
-  AC_MSG_RESULT([$SAGA_PACKAGE_VERSION (r$SAGA_PACKAGE_REVISION)])
+  AC_MSG_CHECKING([saga package name and version])
+  SAGA_MODULE_NAME=UnknownModuleName
+  test -f PACKAGE && SAGA_MODULE_NAME=` grep -e '^PACKAGE:'  PACKAGE | sed -e 's/^PACKAGE: *//'`
+
+  SAGA_MODULE_VERSION=$SAGA_VERSION
+  test -f PACKAGE && SAGA_MODULE_VERSION=` grep -e '^VERSION:'  PACKAGE | sed -e 's/^VERSION: *//'`
+  test -f PACKAGE && SAGA_MODULE_REVISION=`grep -e '^REVISION:' PACKAGE | cut -sf 2 -d '$' | cut -sf 2 -d ' '`
+  AC_MSG_RESULT([$SAGA_MODULE_NAME($SAGA_MODULE_VERSION / r$SAGA_MODULE_REVISION)])
+  AC_MSG_RESULT([$SAGA_MODULE_VERSION ()])
 
   # svn info supercedes the revision info from the PACKAGE file
   svnrevision=`svn info 2>&1 | grep Revision | cut -sf 2 -d ' '`
 
   if ! test "$svnrevision" = ""; then
-    SAGA_PACKAGE_REVISION=$svnrevision
+    SAGA_MODULE_REVISION=$svnrevision
   fi
 
-  AC_SUBST(SAGA_PACKAGE_VERSION)
-  export  SAGA_PACKAGE_VERSION
-  AC_SUBST(SAGA_PACKAGE_REVISION)
-  export  SAGA_PACKAGE_REVISION
-
-
 
   # we set SAGA_LOCATION, and a couple of other vars
   SAGA_LOCATION=$TMP_SAGA_LOCATION
@@ -162,6 +162,9 @@ AC_DEFUN([AX_SAGA_CONFIG],
   export SAGA_INI_DIR
   export SAGA_CONFIG
   export SAGA_VERSION
+  export SAGA_MODULE_NAME
+  export SAGA_MODULE_VERSION
+  export SAGA_MODULE_REVISION
 
   AC_SUBST(HAVE_SAGA)
   AC_SUBST(SAGA_LOCATION)
@@ -173,6 +176,9 @@ AC_DEFUN([AX_SAGA_CONFIG],
   AC_SUBST(SAGA_INI_DIR)
   AC_SUBST(SAGA_CONFIG)
   AC_SUBST(SAGA_VERSION)
+  AC_SUBST(SAGA_MODULE_NAME)
+  AC_SUBST(SAGA_MODULE_VERSION)
+  AC_SUBST(SAGA_MODULE_REVISION)
 
 
   # the adaptor and binding config files depend on the earlier findings of
@@ -194,7 +200,7 @@ AC_DEFUN([AX_SAGA_CONFIG],
   export SAGA_MAKE_INCLUDE_DIR
   AC_SUBST(SAGA_MAKE_INCLUDE_DIR)
 
-  SAGA_LIB_VERSION=$SAGA_PACKAGE_VERSION
+  SAGA_LIB_VERSION=$SAGA_MODULE_VERSION
   export SAGA_LIB_VERSION
   AC_SUBST(SAGA_LIB_VERSION)
 

config/saga_base.m4

@@ -12,10 +12,11 @@ AC_DEFUN([AX_SAGA_CHECK_BASE],
   export CONFDIR
   AC_SUBST(CONFDIR)
 
-  AC_MSG_CHECKING([SAGA Version])
+  AC_MSG_CHECKING([SAGA Package])
   # get version
-  test -f PACKAGE && SAGA_VERSION=` grep -e '^VERSION:'  PACKAGE | sed -e 's/^VERSION: *//'`
-  test -f PACKAGE && SAGA_REVISION=`grep -e '^REVISION:' PACKAGE | cut -f 2 -d '$' | cut -f 2 -d ' '`
+  test -f PACKAGE && SAGA_MODULE_NAME=` grep -e '^PACKAGE:'  PACKAGE | sed -e 's/^PACKAGE: *//'`
+  test -f PACKAGE && SAGA_VERSION=`     grep -e '^VERSION:'  PACKAGE | sed -e 's/^VERSION: *//'`
+  test -f PACKAGE && SAGA_REVISION=`    grep -e '^REVISION:' PACKAGE | cut -f 2 -d '$' | cut -f 2 -d ' '`
   
   # svn info supercedes the revision info from the PACKAGE file
   svnrevision=`svn info 2>&1 | grep Revision | cut -f 2 -d ' '`
@@ -54,6 +55,7 @@ AC_DEFUN([AX_SAGA_CHECK_BASE],
 
   SAGA_VERSION_DATE=`date "+%Y%m%d"`
 
+  AC_SUBST(SAGA_MODULE_NAME)
   AC_SUBST(SAGA_VERSION)
   AC_SUBST(SAGA_REVISION)
   AC_SUBST(SAGA_VERSION_MAJOR)
@@ -62,6 +64,7 @@ AC_DEFUN([AX_SAGA_CHECK_BASE],
   AC_SUBST(SAGA_VERSION_FULL)
   AC_SUBST(SAGA_VERSION_DATE)
 
+  AC_DEFINE_UNQUOTED([SAGA_MODULE_NAME]     , ["$SAGA_MODULE_NAME"])
   AC_DEFINE_UNQUOTED([SAGA_VERSION]         , ["$SAGA_VERSION"])
   AC_DEFINE_UNQUOTED([SAGA_REVISION]        , [$SAGA_REVISION])
   AC_DEFINE_UNQUOTED([SAGA_VERSION_MAJOR]   , [$SAGA_VERSION_MAJOR])
@@ -70,7 +73,7 @@ AC_DEFUN([AX_SAGA_CHECK_BASE],
   AC_DEFINE_UNQUOTED([SAGA_VERSION_FULL]    , [$SAGA_VERSION_FULL])
   AC_DEFINE_UNQUOTED([SAGA_VERSION_DATE]    , [$SAGA_VERSION_DATE])
 
-  AC_MSG_RESULT([$SAGA_VERSION (r$SAGA_REVISION)])
+  AC_MSG_RESULT([$SAGA_MODULE_NAME $SAGA_VERSION (r$SAGA_REVISION)])
 
 
   AC_MSG_CHECKING([operating system type])