make user functions return bool

packages/gecode/CMakeLists.txt

@@ -4,9 +4,10 @@
 #CHECK: GECODE
 
 macro_optional_find_package (Gecode ON)
-macro_log_feature (GECODE_FOUND "libgecode" 
-  "Use Generic Constraint Development Environment (GECODE) library" 
+macro_log_feature (GECODE_FOUND "libgecode"
+  "Use Generic Constraint Development Environment (GECODE) library"
   "http://www.gecode.org" FALSE)
+
 if (GECODE_FOUND)
   #DEFINES:
   #   GECODE_INCLUDE_DIR
@@ -17,7 +18,7 @@ if (GECODE_FOUND)
 
   string(SUBSTRING ${GECODE_VERSION} 0 1 GECODE_MAJOR )
 
-  set (GECODE_SOURCES gecode${GECODE_MAJOR}_yap.cc 
+  set (GECODE_SOURCES gecode${GECODE_MAJOR}_yap.cc
     gecode${GECODE_MAJOR}-common.icc
     ${GECODE_VERSION}/gecode_yap_cc_impl_auto_generated.icc
     ${GECODE_VERSION}/gecode_yap_cc_init_auto_generated.icc
@@ -34,7 +35,7 @@ if (GECODE_FOUND)
     VERBATIM
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
-  
+
   add_library (gecode SHARED ${GECODE_SOURCES})
 
   target_link_libraries(gecode libYap ${GECODE_LIBRARIES})
@@ -42,7 +43,7 @@ if (GECODE_FOUND)
   set_target_properties (gecode PROPERTIES PREFIX "")
 
   include_directories (${GECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${GECODE_VERSION})
-  
+
   install(TARGETS  gecode
     LIBRARY DESTINATION ${dlls}
     )

packages/gecode/configure.in

@@ -11,6 +11,7 @@ else
 if test -d "$use_gecode"; then
   CPPFLAGS="$CPPFLAGS -I $use_gecode/include"
   GECODE_EXTRALIBS="-L $use_gecode/lib"
+  GECODE_INCLUDES=" $use_gecode/include"
      GECODE_PATH="$use_gecode/bin"
 dnl gecode is usually in /usr/local
 elif test -d /usr/local/include/gecode -a x$SYSROOT = x; then
@@ -47,7 +48,7 @@ if test "$use_gecode" != no; then
      fi
      if test "$use_gecode" = yes; then
        GECODE_PATH=`which fzn-gecode`
-     GECODE_PATH=`dirname "$GECODE_PATH"`
+       GECODE_PATH=`dirname "$GECODE_PATH"`
      else
        GECODE_PATH="$use_gecode"
      fi
@@ -116,8 +117,6 @@ CPPFLAGS="$CPPFLAGS -I \"$GECODE_INCLUDES\""
 
 AC_CHECK_HEADER(gecode/support/config.hpp)
 
-CPPFLAGS="$saved_CPPFLAGS"
-
 AC_SUBST(GECODE_EXTRALIBS)
 AC_SUBST(GECODE_INCLUDES)
 AC_SUBST(GECODE_VERSION)
@@ -128,3 +127,5 @@ if test "$PKG_GECODE" = "packages/gecode"; then
 AC_CONFIG_FILES([packages/gecode/Makefile])
 fi
 
+CPPFLAGS="$saved_CPPFLAGS"
+