Changeset 877 for branches/prototype-v0/zoo-project/zoo-kernel/configure.ac
- Timestamp:
- Aug 16, 2018, 8:00:56 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/prototype-v0/zoo-project/zoo-kernel/configure.ac
r873 r877 68 68 [AS_HELP_STRING([--with-json=PATH], [Specifies an alternative location for the json-c library])], 69 69 [JSON_DIR="$withval"], [JSON_DIR="/usr/"]) 70 JSON_CPPFLAGS="-I$JSON_DIR/include/json-c/" 71 JSON_LDFLAGS="-L$JSON_DIR/lib -ljson-c" 72 CPPFLAGS_SAVE="$CPPFLAGS" 73 CPPFLAGS="$JSON_CPPFLAGS" 74 LIBS_SAVE="$LIBS" 75 LIBS="$JSON_LDFLAGS" 76 echo $CPPFLAGS 77 AC_CHECK_HEADERS([json_object.h], 78 [], [AC_MSG_ERROR([could not find header file json_object.h])]) 79 AC_CHECK_LIB([json-c], [json_object_new_object], 80 [], [AC_MSG_ERROR([could not find function in json-c library])]) 81 CPPFLAGS="$CPPFLAGS_SAVE" 82 JSON_FILE="service_json.o" 83 JSON_ENABLED="-DJSON" 70 if test "x$JSON_DIR" != "x" 71 then 72 JSON_CPPFLAGS="-I$JSON_DIR/include/json-c/" 73 JSON_LDFLAGS="-L$JSON_DIR/lib -ljson-c" 74 CPPFLAGS_SAVE="$CPPFLAGS" 75 CPPFLAGS="$JSON_CPPFLAGS" 76 LIBS_SAVE="$LIBS" 77 LIBS="$JSON_LDFLAGS" 78 AC_CHECK_HEADERS([json_object.h], 79 [], [AC_MSG_ERROR([could not find header file json_object.h])]) 80 AC_CHECK_LIB([json-c], [json_object_new_object], 81 [], [AC_MSG_ERROR([could not find function in json-c library])]) 82 CPPFLAGS="$CPPFLAGS_SAVE" 83 JSON_FILE="service_json.o" 84 JSON_ENABLED="-DJSON" 85 fi 84 86 AC_SUBST([JSON_CPPFLAGS]) 85 87 AC_SUBST([JSON_LDFLAGS]) … … 112 114 #============================================================================ 113 115 114 #AC_ARG_WITH([gettext], 115 # [AS_HELP_STRING([--with-gettext=PATH], [Specifies an alternative location for the openssl library])], 116 # [GETTEXT_DIR="$withval"], [GETTEXT_DIR="/usr/"]) 117 #GETTEXT_CFLAGS="-I$GETTEXT_DIR/include" 118 #GETTEXT_LDFLAGS="-L$GETTEXT_DIR/lib -lintl" 116 AC_ARG_WITH([gettext], 117 [AS_HELP_STRING([--with-gettext=PATH], [Specifies an alternative location for the openssl library])], 118 [GETTEXT_DIR="$withval"], [GETTEXT_DIR="/usr/"]) 119 120 GETTEXT_CFLAGS="-I$GETTEXT_DIR/include" 121 GETTEXT_LDFLAGS="-L$GETTEXT_DIR/lib -lintl" 119 122 #CFLAGS_SAVE="$CFLAGS" 120 123 #CFLAGS="$GETTEXT_CFLAGS" … … 232 235 [HPCWITH="$withval"], [HPCWITH="no"]) 233 236 237 238 AC_ARG_WITH([ssh2], 239 [AS_HELP_STRING([--with-ssh2=PATH], [Specifies an alternative location for the ssh2 library])], 240 [SSH2PATH="$withval"], [SSH2PATH="/usr"]) 241 234 242 if test "x$HPCWITH" = "xyes"; then 235 243 HPC_FILES="service_internal_hpc.o sshapi.o" … … 237 245 HPC_CPPFLAGS="" 238 246 HPC_LDFLAGS="" 247 # Extract the linker and include flags 248 SSH2_LDFLAGS="-L$SSH2PATH/lib -lssh2" 249 SSH2_CPPFLAGS="-I$SSH2PATH/include" 250 # Check headers file 251 CPPFLAGS_SAVE="$CPPFLAGS" 252 CPPFLAGS="$SSH2_CPPFLAGS" 253 LIBS_SAVE="$LIBS" 254 LIBS="$SSH2_LDFLAGS" 255 256 AC_CHECK_HEADERS([libssh2.h], 257 [], [AC_MSG_ERROR([could not find headers related to libssh2])]) 258 AC_CHECK_LIB([ssh2], [libssh2_session_init]) 259 260 LIBS="$LIBS_SAVE" 239 261 fi 240 262 … … 244 266 AC_SUBST([HPC_FILES]) 245 267 246 AC_ARG_WITH([ssh2],247 [AS_HELP_STRING([--with-ssh2=PATH], [Specifies an alternative location for the ssh2 library])],248 [SSH2PATH="$withval"], [SSH2PATH="/usr"])249 250 # Extract the linker and include flags251 SSH2_LDFLAGS="-L$SSH2PATH/lib -lssh2"252 SSH2_CPPFLAGS="-I$SSH2PATH/include"253 # Check headers file254 CPPFLAGS_SAVE="$CPPFLAGS"255 CPPFLAGS="$SSH2_CPPFLAGS"256 LIBS_SAVE="$LIBS"257 LIBS="$SSH2_LDFLAGS"258 echo $CPPFLAGS259 echo $LIBS260 261 AC_CHECK_HEADERS([libssh2.h],262 [], [AC_MSG_ERROR([could not find headers related to libssh2])])263 AC_CHECK_LIB([ssh2], [libssh2_session_init])264 265 LIBS="$LIBS_SAVE"266 268 AC_SUBST([SSH2_CPPFLAGS]) 267 269 AC_SUBST([SSH2_LDFLAGS]) … … 805 807 806 808 AC_LANG([C++]) 807 echo $JAVA_CPPFLAGS809 #echo $JAVA_CPPFLAGS 808 810 # Check headers file (second time we check that in fact) 809 811 CPPFLAGS_SAVE="$CPPFLAGS" … … 855 857 856 858 AC_LANG([C++]) 857 echo $JAVA_CPPFLAGS859 #echo $JAVA_CPPFLAGS 858 860 # Check headers file (second time we check that in fact) 859 861 CPPFLAGS_SAVE="$CFLAGS"
Note: See TracChangeset
for help on using the changeset viewer.