Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- Unix build tweaks. Fixes #1193 (I think) 

svn path=/trunk/boinc/; revision=25804
This commit is contained in:
David Anderson 2012-06-27 05:03:16 +00:00
parent f8c1665722
commit d5d9921f5c
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -4571,3 +4571,10 @@ David 26 June 2012
sched_send.cpp sched_send.cpp
lib/ lib/
coproc.cpp coproc.cpp
David 26 June 2012
- Unix build tweaks. Fixes #1193 (I think)
m4/
boinc_check_fcgi.m4
libcurl.m4

4
m4/boinc_check_fcgi.m4
View File

@ -6,7 +6,7 @@ if ( test "x${enable_server}" = "xyes" ) || ( test "x${enable_libraries}" = "xye
save_cflags="${CFLAGS}" save_cflags="${CFLAGS}"
CFLAGS="-I${prefix} -include fcgi_stdio.h -D_USING_FCGI_ ${CFLAGS}" CFLAGS="-I${prefix} -include fcgi_stdio.h -D_USING_FCGI_ ${CFLAGS}"
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[[ [[
#define CONFIG_TEST #define CONFIG_TEST
]], ]],
@ -14,7 +14,7 @@ if ( test "x${enable_server}" = "xyes" ) || ( test "x${enable_libraries}" = "xye
fprintf(stderr,"Hello\n"); fprintf(stderr,"Hello\n");
return 0; return 0;
] ]
), )],
[ [
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
], ],

4
m4/libcurl.m4
View File

@ -179,7 +179,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
_libcurl_save_libs=$LIBS _libcurl_save_libs=$LIBS
LIBS="$LIBS $LIBCURL" LIBS="$LIBS $LIBCURL"
AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <curl/curl.h>],[ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <curl/curl.h>],[
/* Try and use a few common options to force a failure if we are /* Try and use a few common options to force a failure if we are
missing symbols or can't link. */ missing symbols or can't link. */
int x; int x;
@ -190,7 +190,7 @@ x=CURLOPT_FILE;
x=CURLOPT_ERRORBUFFER; x=CURLOPT_ERRORBUFFER;
x=CURLOPT_STDERR; x=CURLOPT_STDERR;
x=CURLOPT_VERBOSE; x=CURLOPT_VERBOSE;
]),libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no) ])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
CPPFLAGS=$_libcurl_save_cppflags CPPFLAGS=$_libcurl_save_cppflags
LIBS=$_libcurl_save_libs LIBS=$_libcurl_save_libs