The plugin version now uses the native DLL handling code for all Windows ports.
Skip configure checks for libtool / ltdl and no longer link with mingwex.
This commit is contained in:
Volker Ruppert
parent
a767ec0b1b
commit
59b07e4b61
128
bochs/configure
vendored
128
bochs/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 12056 2013-12-22 12:17:28Z vruppert .
|
||||
# From configure.in Id: configure.in 12082 2013-12-29 20:04:16Z vruppert .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69.
|
||||
#
|
||||
@ -3320,11 +3320,12 @@ MSVC_TARGET=0
|
||||
need_dlcompat_for_plugins=0
|
||||
case "$target" in
|
||||
*-pc-windows* | *-pc-winnt*)
|
||||
DEFAULT_GUI=win32 # default to win32 gui
|
||||
DEFAULT_GUI=win32 # default to win32 gui
|
||||
NO_LT=1 # do not use libtool at all
|
||||
MSVC_TARGET=1
|
||||
;;
|
||||
*-cygwin* | *-mingw32*)
|
||||
NO_LT=1 # do not use libtool at all on cygwin
|
||||
NO_LT=1 # do not use libtool at all
|
||||
if test "$with_term" = yes; then
|
||||
# ncurses won't compile with -DWIN32
|
||||
# also, I can't get it to link without this -DBROKEN_LINKER=1 hack.
|
||||
@ -4463,7 +4464,7 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "$MSVC_TARGET" != 1; then
|
||||
if test "$NO_LT" != 1; then
|
||||
# Check whether --enable-static was given.
|
||||
if test "${enable_static+set}" = set; then :
|
||||
enableval=$enable_static; p=${PACKAGE-default}
|
||||
@ -5151,7 +5152,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5154 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5155 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -6839,11 +6840,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6842: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6843: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6846: \$? = $ac_status" >&5
|
||||
echo "$as_me:6847: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -7072,11 +7073,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7075: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7076: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7079: \$? = $ac_status" >&5
|
||||
echo "$as_me:7080: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -7139,11 +7140,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7142: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7143: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7146: \$? = $ac_status" >&5
|
||||
echo "$as_me:7147: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -8929,7 +8930,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8932 "configure"
|
||||
#line 8933 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -9027,7 +9028,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9030 "configure"
|
||||
#line 9031 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11142,11 +11143,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11145: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11146: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11149: \$? = $ac_status" >&5
|
||||
echo "$as_me:11150: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -11209,11 +11210,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11212: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11213: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11216: \$? = $ac_status" >&5
|
||||
echo "$as_me:11217: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -12234,7 +12235,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12237 "configure"
|
||||
#line 12238 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12332,7 +12333,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12335 "configure"
|
||||
#line 12336 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -13155,11 +13156,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13158: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13159: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13162: \$? = $ac_status" >&5
|
||||
echo "$as_me:13163: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -13222,11 +13223,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13225: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13226: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13229: \$? = $ac_status" >&5
|
||||
echo "$as_me:13230: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -15187,11 +15188,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15190: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15191: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15194: \$? = $ac_status" >&5
|
||||
echo "$as_me:15195: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15420,11 +15421,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15423: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15424: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15427: \$? = $ac_status" >&5
|
||||
echo "$as_me:15428: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
@ -15487,11 +15488,11 @@ else
|
||||
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15490: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15491: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15494: \$? = $ac_status" >&5
|
||||
echo "$as_me:15495: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -17277,7 +17278,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17280 "configure"
|
||||
#line 17281 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -17375,7 +17376,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 17378 "configure"
|
||||
#line 17379 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -19062,7 +19063,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 19065 "configure"
|
||||
#line 19066 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -21643,10 +21644,11 @@ $as_echo "yes" >&6; }
|
||||
GUI_PLUGIN_OBJS='$(OBJS_THAT_CAN_BE_PLUGINS)'
|
||||
DEFINE_PLUGIN_PATH='-DBX_PLUGIN_PATH="\"${plugdir}\""'
|
||||
# and the $(OBJS_THAT_SUPPORT_OTHER_PLUGINS) will be built and linked
|
||||
# by special link rules for the plugins that they support.
|
||||
LIBS="$LIBS $LIBADD_DL"
|
||||
have_ltdl=0
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
|
||||
if test "$NO_LT" != 1; then
|
||||
# by special link rules for the plugins that they support.
|
||||
LIBS="$LIBS $LIBADD_DL"
|
||||
have_ltdl=0
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "ltdl.h" "ac_cv_header_ltdl_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_ltdl_h" = xyes; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lt_dlinit in -lltdl" >&5
|
||||
$as_echo_n "checking for lt_dlinit in -lltdl... " >&6; }
|
||||
@ -21691,13 +21693,16 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
if test "$have_ltdl" = 1; then
|
||||
PLUGIN_LIB="-lltdl"
|
||||
$as_echo "#define BX_HAVE_LTDL 1" >>confdefs.h
|
||||
if test "$have_ltdl" = 1; then
|
||||
PLUGIN_LIB="-lltdl"
|
||||
$as_echo "#define BX_HAVE_LTDL 1" >>confdefs.h
|
||||
|
||||
else
|
||||
PLUGIN_VAR="ltdl.o"
|
||||
PLUGIN_LIB="ltdl.o"
|
||||
fi
|
||||
else
|
||||
PLUGIN_VAR="ltdl.o"
|
||||
PLUGIN_LIB="ltdl.o"
|
||||
RANLIB="echo"
|
||||
fi
|
||||
PLUGIN_TARGET=bochs_plugins
|
||||
INSTALL_PLUGINS_VAR=install_libtool_plugins
|
||||
@ -24684,7 +24689,6 @@ case "$target" in
|
||||
MAKE=nmake
|
||||
MAKELIB="lib /nologo /subsystem:console /verbose /out:\$@"
|
||||
RMCOMMAND="-del"
|
||||
RANLIB="echo"
|
||||
#L_OPT="/debug" # for debugging
|
||||
L_OPT="" # no debug info
|
||||
LINK="link $L_OPT /nologo /subsystem:console /incremental:no /out:\$@ "
|
||||
@ -24782,46 +24786,6 @@ case $target in
|
||||
;;
|
||||
*-cygwin* | *-mingw*)
|
||||
if test "$bx_plugins" = 1; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opendir in -lmingwex" >&5
|
||||
$as_echo_n "checking for opendir in -lmingwex... " >&6; }
|
||||
if ${ac_cv_lib_mingwex_opendir+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lmingwex $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 opendir ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return opendir ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_mingwex_opendir=yes
|
||||
else
|
||||
ac_cv_lib_mingwex_opendir=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mingwex_opendir" >&5
|
||||
$as_echo "$ac_cv_lib_mingwex_opendir" >&6; }
|
||||
if test "x$ac_cv_lib_mingwex_opendir" = xyes; then :
|
||||
LIBS="$LIBS -lmingwex"
|
||||
fi
|
||||
|
||||
# set variables for building DLL plugins
|
||||
PRIMARY_TARGET=".win32_dll_plugin_target"
|
||||
PLUGIN_LIBNAME_TRANSFORMATION='%.o=bx_%.dll'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user