Changeset 803 for trunk/zoo-project

Timestamp:

Jan 19, 2017, 3:02:21 PM (8 years ago)

Author:

djay

Message:

Fix issue when building with OTB version upper or equal to 5.8.0.

File:

• trunk/zoo-project/zoo-kernel/configure.ac (modified) (1 diff)

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

@@ -831 +831 @@
         LDFLAGS_SAVE="$LDFLAGS"
         LIBS="$LIBS_SAVE $OTB_LDFLAGS"
-        echo $OTB_CPPFLAGS
-        #AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
-        #               [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
+        #echo $OTB_CPPFLAGS
+        AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
+                        [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
         LDFLAGS_SAVE="$LDFLAGS"
         LDFLAGS="$OTB_LDFLAGS"
-        echo $OTB_LDFLAGS
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"],[std::vector<std::string> list = otb::Wrapwper::ApplicationRegistry::GetAvailableApplication();]])],
-                [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
+        #echo $OTB_LDFLAGS
+        UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
+        if test "$OTBVERS" ==  "$UVERS" ; then 
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
+                                                           [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
+        else
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
+                                                           [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
+        fi
+                                                                                
         LDFLAGS="$LDFLAGS_SAVE"
         AC_LANG_POP([C++])