diff options
Diffstat (limited to 'sim/cr16')
| -rw-r--r-- | sim/cr16/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/cr16/config.in | 7 | ||||
| -rw-r--r-- | sim/cr16/configure | 49 |
3 files changed, 52 insertions, 9 deletions
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog index dda7e60..9d78b2e 100644 --- a/sim/cr16/ChangeLog +++ b/sim/cr16/ChangeLog @@ -1,3 +1,8 @@ +2014-08-15 Roland McGrath <mcgrathr@google.com> + + * configure: Regenerate. + * config.in: Regenerate. + 2014-03-10 Mike Frysinger <vapier@gentoo.org> * interp.c (sim_do_command): Add const to cmd. diff --git a/sim/cr16/config.in b/sim/cr16/config.in index 0db6f1e..5fed8c1 100644 --- a/sim/cr16/config.in +++ b/sim/cr16/config.in @@ -67,12 +67,19 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* 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 +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of this package. */ #undef PACKAGE diff --git a/sim/cr16/configure b/sim/cr16/configure index 9683a9c..db47906 100644 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -1390,7 +1390,7 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-plugins Enable support for plugins (defaults no) + --enable-plugins Enable support for plugins --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -8774,15 +8774,46 @@ fi # BFD uses libdl when when plugins enabled. -# Check whether --enable-plugins was given. + maybe_plugins=no + for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + maybe_plugins=yes +fi + +done + + for ac_header in windows.h +do : + ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default +" +if test "x$ac_cv_header_windows_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WINDOWS_H 1 +_ACEOF + maybe_plugins=yes +fi + +done + + + # Check whether --enable-plugins was given. if test "${enable_plugins+set}" = set; then : enableval=$enable_plugins; case "${enableval}" in - yes | "") plugins=yes ;; - no) plugins=no ;; - *) plugins=yes ;; - esac + no) plugins=no ;; + *) plugins=yes + if test "$maybe_plugins" != "yes" ; then + as_fn_error "Building with plugin support requires a host that supports dlopen." "$LINENO" 5 + fi ;; + esac else - plugins=no + plugins=$maybe_plugins + fi @@ -12271,7 +12302,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12274 "configure" +#line 12305 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12377,7 +12408,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12380 "configure" +#line 12411 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |