| diff -ru a/configure b/configure |
| |
| |
| @@ -14553,6 +14553,16 @@ |
| dynamic_linker='GNU/Linux ld.so' |
| ;; |
| |
| +midipix) |
| + dynamic_linker='ld' |
| + library_names_spec='$libname.lib.a' |
| + need_lib_prefix=no |
| + need_version=no |
| + shlibpath_overrides_runpath=yes |
| + shrext_cmds=.so |
| + version_type=windows |
| + ;; |
| + |
| netbsdelf*-gnu) |
| version_type=linux |
| need_lib_prefix=no |
| @@ -17336,875 +17346,6 @@ |
| # |
| fi |
| |
| - |
| - # |
| - if test "$compiler_id" != "unknown"; then |
| - # |
| - tmp_save_CFLAGS="$CFLAGS" |
| - tmp_save_CPPFLAGS="$CPPFLAGS" |
| - # |
| - tmp_options="" |
| - tmp_CFLAGS="$CFLAGS" |
| - tmp_CPPFLAGS="$CPPFLAGS" |
| - |
| - ac_var_stripped="" |
| - for word1 in $tmp_CFLAGS; do |
| - ac_var_strip_word="no" |
| - for word2 in $flags_dbg_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_strip_word="yes" |
| - fi |
| - done |
| - if test "$ac_var_strip_word" = "no"; then |
| - ac_var_stripped="$ac_var_stripped $word1" |
| - fi |
| - done |
| - tmp_CFLAGS="$ac_var_stripped" |
| - squeeze tmp_CFLAGS |
| - |
| - |
| - ac_var_stripped="" |
| - for word1 in $tmp_CPPFLAGS; do |
| - ac_var_strip_word="no" |
| - for word2 in $flags_dbg_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_strip_word="yes" |
| - fi |
| - done |
| - if test "$ac_var_strip_word" = "no"; then |
| - ac_var_stripped="$ac_var_stripped $word1" |
| - fi |
| - done |
| - tmp_CPPFLAGS="$ac_var_stripped" |
| - squeeze tmp_CPPFLAGS |
| - |
| - # |
| - if test "$want_debug" = "yes"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug enabling options" >&5 |
| -$as_echo_n "checking if compiler accepts debug enabling options... " >&6; } |
| - tmp_options="$flags_dbg_yes" |
| - fi |
| - if test "$want_debug" = "no"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts debug disabling options" >&5 |
| -$as_echo_n "checking if compiler accepts debug disabling options... " >&6; } |
| - tmp_options="$flags_dbg_off" |
| - fi |
| - # |
| - if test "$flags_prefer_cppflags" = "yes"; then |
| - CPPFLAGS="$tmp_CPPFLAGS $tmp_options" |
| - CFLAGS="$tmp_CFLAGS" |
| - else |
| - CPPFLAGS="$tmp_CPPFLAGS" |
| - CFLAGS="$tmp_CFLAGS $tmp_options" |
| - fi |
| - squeeze CPPFLAGS |
| - squeeze CFLAGS |
| - |
| - tmp_compiler_works="unknown" |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_compile "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/cc-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| - if test "$tmp_compiler_works" = "yes"; then |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_link "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/link-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext \ |
| - conftest$ac_exeext conftest.$ac_ext |
| - fi |
| - if test "x$cross_compiling" != "xyes" && |
| - test "$tmp_compiler_works" = "yes"; then |
| - if test "$cross_compiling" = yes; then : |
| - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| -as_fn_error $? "cannot run test program while cross compiling |
| -See \`config.log' for more details" "$LINENO" 5; } |
| -else |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| -# ifdef __STDC__ |
| -# include <stdlib.h> |
| -# endif |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 0; |
| - exit(i); |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_run "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - echo "run-fail: test program exited with status $ac_status" >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| - conftest.$ac_objext conftest.beam conftest.$ac_ext |
| -fi |
| - |
| - fi |
| - if test "$tmp_compiler_works" = "yes"; then |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| -$as_echo "yes" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 |
| -$as_echo "$as_me: compiler options added: $tmp_options" >&6;} |
| - |
| - else |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| -$as_echo "no" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 |
| -$as_echo "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} |
| - CPPFLAGS="$tmp_save_CPPFLAGS" |
| - CFLAGS="$tmp_save_CFLAGS" |
| - |
| - fi |
| - |
| - # |
| - fi |
| - |
| - |
| - # |
| - if test "$compiler_id" != "unknown"; then |
| - # |
| - tmp_save_CFLAGS="$CFLAGS" |
| - tmp_save_CPPFLAGS="$CPPFLAGS" |
| - # |
| - tmp_options="" |
| - tmp_CFLAGS="$CFLAGS" |
| - tmp_CPPFLAGS="$CPPFLAGS" |
| - honor_optimize_option="yes" |
| - # |
| - # |
| - if test "$want_optimize" = "assume_no" || |
| - test "$want_optimize" = "assume_yes"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler optimizer assumed setting might be used" >&5 |
| -$as_echo_n "checking if compiler optimizer assumed setting might be used... " >&6; } |
| - |
| - |
| - ac_var_match_word="no" |
| - for word1 in $tmp_CFLAGS; do |
| - for word2 in $flags_opt_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_match_word="yes" |
| - fi |
| - done |
| - done |
| - |
| - if test "$ac_var_match_word" = "yes"; then |
| - |
| - honor_optimize_option="no" |
| - |
| - |
| - fi |
| - |
| - |
| - |
| - ac_var_match_word="no" |
| - for word1 in $tmp_CPPFLAGS; do |
| - for word2 in $flags_opt_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_match_word="yes" |
| - fi |
| - done |
| - done |
| - |
| - if test "$ac_var_match_word" = "yes"; then |
| - |
| - honor_optimize_option="no" |
| - |
| - |
| - fi |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $honor_optimize_option" >&5 |
| -$as_echo "$honor_optimize_option" >&6; } |
| - if test "$honor_optimize_option" = "yes"; then |
| - if test "$want_optimize" = "assume_yes"; then |
| - want_optimize="yes" |
| - fi |
| - if test "$want_optimize" = "assume_no"; then |
| - want_optimize="no" |
| - fi |
| - fi |
| - fi |
| - # |
| - if test "$honor_optimize_option" = "yes"; then |
| - |
| - ac_var_stripped="" |
| - for word1 in $tmp_CFLAGS; do |
| - ac_var_strip_word="no" |
| - for word2 in $flags_opt_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_strip_word="yes" |
| - fi |
| - done |
| - if test "$ac_var_strip_word" = "no"; then |
| - ac_var_stripped="$ac_var_stripped $word1" |
| - fi |
| - done |
| - tmp_CFLAGS="$ac_var_stripped" |
| - squeeze tmp_CFLAGS |
| - |
| - |
| - ac_var_stripped="" |
| - for word1 in $tmp_CPPFLAGS; do |
| - ac_var_strip_word="no" |
| - for word2 in $flags_opt_all; do |
| - if test "$word1" = "$word2"; then |
| - ac_var_strip_word="yes" |
| - fi |
| - done |
| - if test "$ac_var_strip_word" = "no"; then |
| - ac_var_stripped="$ac_var_stripped $word1" |
| - fi |
| - done |
| - tmp_CPPFLAGS="$ac_var_stripped" |
| - squeeze tmp_CPPFLAGS |
| - |
| - if test "$want_optimize" = "yes"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer enabling options" >&5 |
| -$as_echo_n "checking if compiler accepts optimizer enabling options... " >&6; } |
| - tmp_options="$flags_opt_yes" |
| - fi |
| - if test "$want_optimize" = "no"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts optimizer disabling options" >&5 |
| -$as_echo_n "checking if compiler accepts optimizer disabling options... " >&6; } |
| - tmp_options="$flags_opt_off" |
| - fi |
| - if test "$flags_prefer_cppflags" = "yes"; then |
| - CPPFLAGS="$tmp_CPPFLAGS $tmp_options" |
| - CFLAGS="$tmp_CFLAGS" |
| - else |
| - CPPFLAGS="$tmp_CPPFLAGS" |
| - CFLAGS="$tmp_CFLAGS $tmp_options" |
| - fi |
| - squeeze CPPFLAGS |
| - squeeze CFLAGS |
| - |
| - tmp_compiler_works="unknown" |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_compile "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/cc-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| - if test "$tmp_compiler_works" = "yes"; then |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_link "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/link-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext \ |
| - conftest$ac_exeext conftest.$ac_ext |
| - fi |
| - if test "x$cross_compiling" != "xyes" && |
| - test "$tmp_compiler_works" = "yes"; then |
| - if test "$cross_compiling" = yes; then : |
| - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| -as_fn_error $? "cannot run test program while cross compiling |
| -See \`config.log' for more details" "$LINENO" 5; } |
| -else |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| -# ifdef __STDC__ |
| -# include <stdlib.h> |
| -# endif |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 0; |
| - exit(i); |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_run "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - echo "run-fail: test program exited with status $ac_status" >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| - conftest.$ac_objext conftest.beam conftest.$ac_ext |
| -fi |
| - |
| - fi |
| - if test "$tmp_compiler_works" = "yes"; then |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| -$as_echo "yes" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_options" >&5 |
| -$as_echo "$as_me: compiler options added: $tmp_options" >&6;} |
| - |
| - else |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| -$as_echo "no" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_options" >&5 |
| -$as_echo "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} |
| - CPPFLAGS="$tmp_save_CPPFLAGS" |
| - CFLAGS="$tmp_save_CFLAGS" |
| - |
| - fi |
| - |
| - fi |
| - # |
| - fi |
| - |
| - |
| - # |
| - if test "$compiler_id" != "unknown"; then |
| - # |
| - tmp_save_CPPFLAGS="$CPPFLAGS" |
| - tmp_save_CFLAGS="$CFLAGS" |
| - tmp_CPPFLAGS="" |
| - tmp_CFLAGS="" |
| - # |
| - case "$compiler_id" in |
| - # |
| - CLANG) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -pedantic" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wpointer-arith -Wwrite-strings" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wshadow" |
| - tmp_CFLAGS="$tmp_CFLAGS -Winline -Wnested-externs" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-declarations" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wfloat-equal" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar -Wsign-compare" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wundef" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wendif-labels -Wstrict-prototypes" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wcast-align" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wshorten-64-to-32" |
| - # |
| - if test "$compiler_num" -ge "101"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wunused" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "208"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wvla" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "209"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wshift-sign-overflow" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "302"; then |
| - case $host_os in |
| - cygwin* | mingw*) |
| - ;; |
| - *) |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-variable-declarations" |
| - ;; |
| - esac |
| - fi |
| - # |
| - if test "$compiler_num" -ge "306"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wdouble-promotion" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "309"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wcomma" |
| - # avoid the varargs warning, fixed in 4.0 |
| - # https://bugs.llvm.org/show_bug.cgi?id=29140 |
| - if test "$compiler_num" -lt "400"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-varargs" |
| - fi |
| - fi |
| - fi |
| - ;; |
| - # |
| - DEC_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -msg_enable level3" |
| - fi |
| - ;; |
| - # |
| - GNU_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - # |
| - if test "x$cross_compiling" != "xyes" || |
| - test "$compiler_num" -ge "300"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -pedantic" |
| - fi |
| - # |
| - tmp_CFLAGS="$tmp_CFLAGS -Wall -W" |
| - # |
| - if test "$compiler_num" -ge "104"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wpointer-arith -Wwrite-strings" |
| - if test "x$cross_compiling" != "xyes" || |
| - test "$compiler_num" -ge "300"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wunused -Wshadow" |
| - fi |
| - fi |
| - # |
| - if test "$compiler_num" -ge "207"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Winline -Wnested-externs" |
| - if test "x$cross_compiling" != "xyes" || |
| - test "$compiler_num" -ge "300"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-declarations" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes" |
| - fi |
| - fi |
| - # |
| - if test "$compiler_num" -ge "295"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-long-long" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "296"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wfloat-equal" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-multichar -Wsign-compare" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wundef" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "297"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-format-nonliteral" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "300"; then |
| - tmp_CFLAGS="$tmp_CFLAGS" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "303"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wendif-labels -Wstrict-prototypes" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "304"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "400"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wstrict-aliasing=3" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "402"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wcast-align" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "403"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wtype-limits -Wold-style-declaration" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wmissing-parameter-type -Wempty-body" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wclobbered -Wignored-qualifiers" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wconversion -Wno-sign-conversion -Wvla" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "405"; then |
| - if test "$curl_cv_have_def__WIN32" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-pedantic-ms-format" |
| - fi |
| - fi |
| - # |
| - if test "$compiler_num" -ge "406"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wdouble-promotion" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "600"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wshift-negative-value" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wshift-overflow=2" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wnull-dereference" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wduplicated-cond" |
| - fi |
| - # |
| - if test "$compiler_num" -ge "700"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wduplicated-branches" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wrestrict" |
| - tmp_CFLAGS="$tmp_CFLAGS -Walloc-zero" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wformat-overflow=2" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wformat-truncation=2" |
| - fi |
| - # |
| - fi |
| - # |
| - if test "$compiler_num" -ge "300"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" |
| - else |
| - if test "x$cross_compiling" = "xyes"; then |
| - if test "$compiler_num" -ge "104"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" |
| - fi |
| - if test "$compiler_num" -ge "207"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" |
| - fi |
| - fi |
| - fi |
| - ;; |
| - # |
| - HP_UX_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS +w1" |
| - fi |
| - ;; |
| - # |
| - IBM_C) |
| - # |
| - tmp_CFLAGS="$tmp_CFLAGS" |
| - ;; |
| - # |
| - INTEL_UNIX_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - if test "$compiler_num" -gt "600"; then |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wall -w2" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcheck" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wcomment" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wdeprecated" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wmissing-prototypes" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wp64" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wpointer-arith" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wreturn-type" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wshadow" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wuninitialized" |
| - tmp_CPPFLAGS="$tmp_CPPFLAGS -Wunused-function" |
| - fi |
| - fi |
| - tmp_CFLAGS="$tmp_CFLAGS -fno-omit-frame-pointer" |
| - tmp_CFLAGS="$tmp_CFLAGS -fno-strict-aliasing" |
| - tmp_CFLAGS="$tmp_CFLAGS -fp-model precise" |
| - if test "$compiler_num" -ge "1000"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -vec-report0" |
| - fi |
| - ;; |
| - # |
| - INTEL_WINDOWS_C) |
| - # |
| - tmp_CFLAGS="$tmp_CFLAGS" |
| - ;; |
| - # |
| - LCC) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS" |
| - fi |
| - ;; |
| - # |
| - SGI_MIPS_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -fullwarn" |
| - fi |
| - ;; |
| - # |
| - SGI_MIPSPRO_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -fullwarn" |
| - tmp_CFLAGS="$tmp_CFLAGS -woff 1209" |
| - fi |
| - ;; |
| - # |
| - SUNPRO_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -v" |
| - fi |
| - ;; |
| - # |
| - TINY_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wall" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wwrite-strings" |
| - tmp_CFLAGS="$tmp_CFLAGS -Wunsupported" |
| - fi |
| - ;; |
| - # |
| - WATCOM_UNIX_C) |
| - # |
| - if test "$want_warnings" = "yes"; then |
| - tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" |
| - fi |
| - ;; |
| - # |
| - WATCOM_WINDOWS_C) |
| - # |
| - tmp_CFLAGS="$tmp_CFLAGS" |
| - ;; |
| - # |
| - esac |
| - # |
| - squeeze tmp_CPPFLAGS |
| - squeeze tmp_CFLAGS |
| - # |
| - if test ! -z "$tmp_CFLAGS" || test ! -z "$tmp_CPPFLAGS"; then |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts strict warning options" >&5 |
| -$as_echo_n "checking if compiler accepts strict warning options... " >&6; } |
| - CPPFLAGS="$tmp_save_CPPFLAGS $tmp_CPPFLAGS" |
| - CFLAGS="$tmp_save_CFLAGS $tmp_CFLAGS" |
| - squeeze CPPFLAGS |
| - squeeze CFLAGS |
| - |
| - tmp_compiler_works="unknown" |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_compile "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/cc-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
| - if test "$tmp_compiler_works" = "yes"; then |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 1; |
| - return i; |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_link "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - sed 's/^/link-fail: /' conftest.err >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core conftest.err conftest.$ac_objext \ |
| - conftest$ac_exeext conftest.$ac_ext |
| - fi |
| - if test "x$cross_compiling" != "xyes" && |
| - test "$tmp_compiler_works" = "yes"; then |
| - if test "$cross_compiling" = yes; then : |
| - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| -as_fn_error $? "cannot run test program while cross compiling |
| -See \`config.log' for more details" "$LINENO" 5; } |
| -else |
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| -/* end confdefs.h. */ |
| - |
| - |
| -# ifdef __STDC__ |
| -# include <stdlib.h> |
| -# endif |
| - |
| -int main (void) |
| -{ |
| - |
| - int i = 0; |
| - exit(i); |
| - |
| - ; |
| - return 0; |
| -} |
| - |
| -_ACEOF |
| -if ac_fn_c_try_run "$LINENO"; then : |
| - |
| - tmp_compiler_works="yes" |
| - |
| -else |
| - |
| - tmp_compiler_works="no" |
| - echo " " >&6 |
| - echo "run-fail: test program exited with status $ac_status" >&6 |
| - echo " " >&6 |
| - |
| -fi |
| -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| - conftest.$ac_objext conftest.beam conftest.$ac_ext |
| -fi |
| - |
| - fi |
| - if test "$tmp_compiler_works" = "yes"; then |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| -$as_echo "yes" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 |
| -$as_echo "$as_me: compiler options added: $tmp_CFLAGS $tmp_CPPFLAGS" >&6;} |
| - |
| - else |
| - |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
| -$as_echo "no" >&6; } |
| - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&5 |
| -$as_echo "$as_me: WARNING: compiler options rejected: $tmp_CFLAGS $tmp_CPPFLAGS" >&2;} |
| - CPPFLAGS="$tmp_save_CPPFLAGS" |
| - CFLAGS="$tmp_save_CFLAGS" |
| - |
| - fi |
| - |
| - fi |
| - # |
| - fi |
| - |
| - |
| -if test "$compiler_id" = "INTEL_UNIX_C"; then |
| - # |
| - if test "$compiler_num" -ge "1000"; then |
| - CFLAGS="$CFLAGS -shared-intel" |
| - elif test "$compiler_num" -ge "900"; then |
| - CFLAGS="$CFLAGS -i-dynamic" |
| - fi |
| - # |
| -fi |
| - |
| - |
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler halts on compilation errors" >&5 |
| $as_echo_n "checking if compiler halts on compilation errors... " >&6; } |
| cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| diff -ru a/curl-config.in b/curl-config.in |
| |
| |
| @@ -143,11 +143,7 @@ |
| ;; |
| |
| --libs) |
| - if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then |
| - CURLLIBDIR="-L@libdir@ " |
| - else |
| - CURLLIBDIR="" |
| - fi |
| + CURLLIBDIR="" |
| if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then |
| echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ |
| else |