Changeset 637 for trunk/zoo-project

Timestamp:

Apr 24, 2015, 11:47:50 PM (9 years ago)

Author:

djay

Message:

Fixes in zcfg generator and fixes to build correctly on GNU/Linux.

Location:

trunk/zoo-project/zoo-kernel

Files:

• configure.ac (modified) (2 diffs)
• service_internal_saga.c (modified) (1 diff)
• service_internal_saga.h (modified) (1 diff)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -373 +373 @@
         OTB_ENABLED=""
 else
-    if test -z "$ITKVERS" 
-    then
-        ITKVERS="4.5"
-    fi
+        if test -z "$ITKVERS" 
+        then
+                ITKVERS="4.5"
+        fi
         OTB_ENABLED="-DUSE_OTB"
         OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkdouble-conversion-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS -litkzlib-$ITKVERS"
@@ -439 +439 @@
                         [], [AC_MSG_ERROR([could not find header file $i related to SAGA-GIS])])
         LIBS_SAVE="$LIBS"
+        AC_CHECK_LIB([saga_api], [SG_Set_UI_Callback,SG_Get_Module_Library_Manager])
         AC_LANG_POP([C++])
-        AC_CHECK_LIB([saga_api], [SG_Set_UI_Callback,SG_Get_Module_Library_Manager])
 fi
 AC_SUBST([SAGA_CPPFLAGS])

trunk/zoo-project/zoo-kernel/service_internal_saga.c

@@ -25 +25 @@
 #include <stdlib.h>
 #include <limits.h>
+#include <locale.h>
+#include <wx/string.h>
+#include <wx/app.h>
+#include <api_core.h>
+#include <data_manager.h>
+#include <module_library.h>
+#define _ZOO_SAGA
 #include "service_internal_saga.h"
 #include "mimetypes.h"
+
+/**
+ * Global SAGA-GIS output counter 
+ */
+int sagaOutputCounter=0;
 
 /**

trunk/zoo-project/zoo-kernel/service_internal_saga.h

@@ -28 +28 @@
 #pragma once 
 
-#include <locale.h>
-#define _WX_WXCRTVARARG_H_
-#include <wx/string.h>
-#include <wx/app.h>
-#include <api_core.h>
-#include <data_manager.h>
-#include <module_library.h>
-
 #include "service.h"
 #include "service_internal.h"
 
-/**
- * Global SAGA-GIS output counter 
- */
-int sagaOutputCounter=0;
 int zoo_saga_support(maps**,map*,service*,maps**,maps**);