diff options
Diffstat (limited to 'sim/sh64')
| -rw-r--r-- | sim/sh64/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/sh64/config.in | 3 | ||||
| -rwxr-xr-x | sim/sh64/configure | 94 |
3 files changed, 17 insertions, 84 deletions
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index beda6be..b449969 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,7 @@ +2015-03-31 Mike Frysinger <vapier@gentoo.org> + + * config.in, configure: Regenerate. + 2015-03-24 Mike Frysinger <vapier@gentoo.org> * tconfig.h (SIM_HAVE_BIENDIAN): Delete. diff --git a/sim/sh64/config.in b/sim/sh64/config.in index bf39e2d..99be0a6 100644 --- a/sim/sh64/config.in +++ b/sim/sh64/config.in @@ -79,9 +79,6 @@ /* Define to 1 if you have the <windows.h> header file. */ #undef HAVE_WINDOWS_H -/* Define to 1 if you have the <zlib.h> header file. */ -#undef HAVE_ZLIB_H - /* Define to 1 if you have the `__setfpucw' function. */ #undef HAVE___SETFPUCW diff --git a/sim/sh64/configure b/sim/sh64/configure index 87e270e..e186188 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -635,6 +635,8 @@ SED LIBTOOL PLUGINS_FALSE PLUGINS_TRUE +zlibinc +zlibdir CATOBJEXT GENCAT INSTOBJEXT @@ -745,7 +747,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -with_zlib +with_system_zlib enable_plugins enable_shared enable_static @@ -1427,7 +1429,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-zlib include zlib support (auto/yes/no) default=auto + --with-system-zlib use installed libz --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -2291,7 +2293,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -8704,88 +8705,19 @@ fi # BFD conditionally uses zlib, so we must link it in if libbfd does, by # using the same condition. - # See if the user specified whether he wants zlib support or not. - -# Check whether --with-zlib was given. -if test "${with_zlib+set}" = set; then : - withval=$with_zlib; -else - with_zlib=auto -fi - - - if test "$with_zlib" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5 -$as_echo_n "checking for library containing zlibVersion... " >&6; } -if test "${ac_cv_search_zlibVersion+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char zlibVersion (); -int -main () -{ -return zlibVersion (); - ; - return 0; -} -_ACEOF -for ac_lib in '' z; 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_zlibVersion=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_zlibVersion+set}" = set; then : - break -fi -done -if test "${ac_cv_search_zlibVersion+set}" = set; then : + # Use the system's zlib library. + zlibdir=-L../zlib + zlibinc="-I\$(srcdir)/../zlib" -else - ac_cv_search_zlibVersion=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5 -$as_echo "$ac_cv_search_zlibVersion" >&6; } -ac_res=$ac_cv_search_zlibVersion -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - for ac_header in zlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ZLIB_H 1 -_ACEOF +# Check whether --with-system-zlib was given. +if test "${with_system_zlib+set}" = set; then : + withval=$with_system_zlib; zlibdir= + zlibinc= fi -done -fi - if test "$with_zlib" = "yes" -a "$ac_cv_header_zlib_h" != "yes"; then - as_fn_error "zlib (libz) library was explicitly requested but not found" "$LINENO" 5 - fi - fi # BFD uses libdl when when plugins enabled. @@ -12376,7 +12308,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12379 "configure" +#line 12311 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12482,7 +12414,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12485 "configure" +#line 12417 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |