--- configure.orig 2011-12-06 07:01:58.000000000 +0800 +++ configure 2012-04-10 03:00:36.554106808 +0800 @@ -15038,7 +15038,7 @@ #include - int main() + int main(int argc, char *argv[]) { int i; char *p = "\x01\x02\x03\x04"; @@ -15285,22 +15285,23 @@ return 0; } _ACEOF -for ac_lib in '' c_r pthread; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_pthread_create=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_pthread_create+:} false; then : - break -fi -done +#for ac_lib in '' c_r pthread; do +# if test -z "$ac_lib"; then +# ac_res="none required" +# else +# ac_res=-l$ac_lib +# LIBS="-l$ac_lib $ac_func_search_save_LIBS" +# fi +# if ac_fn_c_try_link "$LINENO"; then : +# ac_cv_search_pthread_create=$ac_res +#fi +#rm -f core conftest.err conftest.$ac_objext \ +# conftest$ac_exeext +# if ${ac_cv_search_pthread_create+:} false; then : +# break +#fi +#done +ac_cv_search_pthread_create=%%PTHREAD_LIBS%% if ${ac_cv_search_pthread_create+:} false; then : else @@ -15376,10 +15377,10 @@ fi elif test "$OS" = "MACOSX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -pthread" >&5 -$as_echo_n "checking whether $CC accepts -pthread... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts %%PTHREAD_LIBS%%" >&5 +$as_echo_n "checking whether $CC accepts %%PTHREAD_LIBS%%... " >&6; } LDFLAGS_store="$LDFLAGS" - LDFLAGS="$LDFLAGS -pthread -fnested-functions" + LDFLAGS="$LDFLAGS %%PTHREAD_LIBS%% -fnested-functions" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15389,11 +15390,8 @@ main () { - int main(int argc, char **argv) - { pthread_create(NULL, NULL, NULL, NULL); return 0; - } ; return 0; @@ -15798,13 +15796,10 @@ main () { - int main(int argc, char **argv) - { char *q; char p[NS_MAXDNAME]; dn_expand(q, q, q, p, sizeof(p)); - } ; return 0; @@ -15900,13 +15895,10 @@ main () { - int main(int argc, char **argv) - { char *q; char p[NS_MAXDNAME]; __dn_expand(q, q, q, p, sizeof(p)); - } ; return 0; @@ -16379,14 +16371,14 @@ ;; no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall" + DEBUG_FLAGS="-Wall" ac_ec_debug=no ;; esac else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - DEBUG_FLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall" + DEBUG_FLAGS="-Wall" ac_ec_debug=no fi @@ -16536,7 +16528,7 @@ OLDLDFLAGS="${LDFLAGS}" OLDLIBS="${LIBS}" - LDFLAGS="$PCAPLIB" + LDFLAGS="$LDFLAGS $PCAPLIB" LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink_val_to_description in -lwpcap" >&5 $as_echo_n "checking for pcap_datalink_val_to_description in -lwpcap... " >&6; } @@ -16994,6 +16986,14 @@ +if false; then + HAVE_PCRE_TRUE= + HAVE_PCRE_FALSE='#' +else + HAVE_PCRE_TRUE='#' + HAVE_PCRE_FALSE= +fi + ac_ec_pcre=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre" >&5