configure: Remove some obsolete shared library checks.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard
parent
27ab5f7bf4
commit
ae06f74828
|
|
@ -7934,7 +7934,7 @@ done
|
|||
|
||||
|
||||
|
||||
DLLFLAGS="-D_REENTRANT"
|
||||
DLLFLAGS=""
|
||||
|
||||
LDDLLFLAGS=""
|
||||
|
||||
|
|
@ -7949,7 +7949,6 @@ WINELOADER_LDFLAGS=""
|
|||
WINEPRELOADER_LDFLAGS=""
|
||||
|
||||
LIBEXT="so"
|
||||
DLLEXT=".so"
|
||||
# Extract the first word of "ldd", so it can be a program name with args.
|
||||
set dummy ldd; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
|
|
@ -8313,7 +8312,6 @@ else
|
|||
fi
|
||||
|
||||
LIBEXT="dll"
|
||||
DLLEXT=""
|
||||
case $host_cpu in
|
||||
*i[3456]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--disable-stdcall-fixup" >&5
|
||||
$as_echo_n "checking whether the compiler supports -Wl,--disable-stdcall-fixup... " >&6; }
|
||||
|
|
@ -9318,87 +9316,7 @@ fi
|
|||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LDDLLFLAGS="-fPIC" ;;
|
||||
esac
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a GNU style ELF dll" >&5
|
||||
$as_echo_n "checking whether we can build a GNU style ELF dll... " >&6; }
|
||||
if ${ac_cv_c_dll_gnuelf+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
void myfunc() {}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=yes
|
||||
else
|
||||
ac_cv_cflags__fPIC__shared__Wl__Bsymbolic=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
if test "x$ac_cv_cflags__fPIC__shared__Wl__Bsymbolic" = xyes; then :
|
||||
ac_cv_c_dll_gnuelf="yes"
|
||||
else
|
||||
ac_cv_c_dll_gnuelf="no"
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_gnuelf" >&5
|
||||
$as_echo "$ac_cv_c_dll_gnuelf" >&6; }
|
||||
if test "$ac_cv_c_dll_gnuelf" = "yes"
|
||||
then
|
||||
LIBWINE_LDFLAGS="-shared"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-soname,confest.so.1" >&5
|
||||
$as_echo_n "checking whether the compiler supports -shared -Wl,-soname,confest.so.1... " >&6; }
|
||||
if ${ac_cv_cflags__shared__Wl__soname_confest_so_1+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -shared -Wl,-soname,confest.so.1"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int main(int argc, char **argv) { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_cflags__shared__Wl__soname_confest_so_1=yes
|
||||
else
|
||||
ac_cv_cflags__shared__Wl__soname_confest_so_1=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__shared__Wl__soname_confest_so_1" >&5
|
||||
$as_echo "$ac_cv_cflags__shared__Wl__soname_confest_so_1" >&6; }
|
||||
if test "x$ac_cv_cflags__shared__Wl__soname_confest_so_1" = xyes; then :
|
||||
LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,-h,confest.so.1" >&5
|
||||
$as_echo_n "checking whether the compiler supports -shared -Wl,-h,confest.so.1... " >&6; }
|
||||
if ${ac_cv_cflags__shared__Wl__h_confest_so_1+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -shared -Wl,-h,confest.so.1"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int main(int argc, char **argv) { return 0; }
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_cflags__shared__Wl__h_confest_so_1=yes
|
||||
else
|
||||
ac_cv_cflags__shared__Wl__h_confest_so_1=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__shared__Wl__h_confest_so_1" >&5
|
||||
$as_echo "$ac_cv_cflags__shared__Wl__h_confest_so_1" >&6; }
|
||||
if test "x$ac_cv_cflags__shared__Wl__h_confest_so_1" = xyes; then :
|
||||
LIBWINE_LDFLAGS="-shared -Wl,-h,libwine.so.$libwine_soversion"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo '{ global: *; };' >conftest.map
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -shared -Wl,--version-script=conftest.map" >&5
|
||||
|
|
@ -9586,40 +9504,6 @@ if test "x$ac_cv_cflags__Wl__z_max_page_size_0x1000" = xyes; then :
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a UnixWare (Solaris) dll" >&5
|
||||
$as_echo_n "checking whether we can build a UnixWare (Solaris) dll... " >&6; }
|
||||
if ${ac_cv_c_dll_unixware+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_wine_try_cflags_saved=$CFLAGS
|
||||
CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
void myfunc() {}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=yes
|
||||
else
|
||||
ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
CFLAGS=$ac_wine_try_cflags_saved
|
||||
if test "x$ac_cv_cflags__fPIC__Wl__G__h_conftest_so_1_0__B_symbolic" = xyes; then :
|
||||
ac_cv_c_dll_unixware="yes"
|
||||
else
|
||||
ac_cv_c_dll_unixware="no"
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_dll_unixware" >&5
|
||||
$as_echo "$ac_cv_c_dll_unixware" >&6; }
|
||||
if test "$ac_cv_c_dll_unixware" = "yes"
|
||||
then
|
||||
LIBWINE_LDFLAGS="-Wl,-G,-h,libwine.so.$libwine_soversion"
|
||||
fi
|
||||
fi
|
||||
LIBWINE_SHAREDLIB="libwine.so.$libwine_version"
|
||||
|
||||
LIBWINE_DEPENDS="wine.map"
|
||||
|
|
|
|||
25
configure.ac
25
configure.ac
|
|
@ -698,7 +698,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
|
|||
|
||||
dnl **** Check for working dll ****
|
||||
|
||||
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
|
||||
AC_SUBST(DLLFLAGS,"")
|
||||
AC_SUBST(LDDLLFLAGS,"")
|
||||
AC_SUBST(LDEXECFLAGS,"")
|
||||
AC_SUBST(TOP_INSTALL_LIB,"")
|
||||
|
|
@ -706,7 +706,6 @@ AC_SUBST(TOP_INSTALL_DEV,"")
|
|||
AC_SUBST(WINELOADER_LDFLAGS,"")
|
||||
AC_SUBST(WINEPRELOADER_LDFLAGS,"")
|
||||
LIBEXT="so"
|
||||
DLLEXT=".so"
|
||||
WINE_PATH_SONAME_TOOLS
|
||||
WINE_CONFIG_HELPERS
|
||||
|
||||
|
|
@ -719,7 +718,6 @@ case $host_os in
|
|||
cygwin*|mingw32*)
|
||||
AC_CHECK_TOOL(DLLTOOL,dlltool,false)
|
||||
LIBEXT="dll"
|
||||
DLLEXT=""
|
||||
dnl Disable stdcall fixups to catch prototype mismatches
|
||||
case $host_cpu in
|
||||
*i[[3456]]86*) WINE_TRY_CFLAGS([-Wl,--disable-stdcall-fixup],
|
||||
|
|
@ -904,16 +902,7 @@ case $host_os in
|
|||
DLLFLAGS="$DLLFLAGS -fPIC"
|
||||
LDDLLFLAGS="-fPIC" ;;
|
||||
esac
|
||||
AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf,
|
||||
[WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic],
|
||||
ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")])
|
||||
if test "$ac_cv_c_dll_gnuelf" = "yes"
|
||||
then
|
||||
LIBWINE_LDFLAGS="-shared"
|
||||
WINE_TRY_CFLAGS([-shared -Wl,-soname,confest.so.1],
|
||||
[LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"],
|
||||
[WINE_TRY_CFLAGS([-shared -Wl,-h,confest.so.1],
|
||||
[LIBWINE_LDFLAGS="-shared -Wl,-h,libwine.so.$libwine_soversion"])])
|
||||
LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"
|
||||
|
||||
echo '{ global: *; };' >conftest.map
|
||||
WINE_TRY_CFLAGS([-shared -Wl,--version-script=conftest.map],
|
||||
|
|
@ -945,16 +934,6 @@ case $host_os in
|
|||
[WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll, ac_cv_c_dll_unixware,
|
||||
[WINE_TRY_SHLIB_FLAGS([-fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic],
|
||||
ac_cv_c_dll_unixware="yes",ac_cv_c_dll_unixware="no")])
|
||||
if test "$ac_cv_c_dll_unixware" = "yes"
|
||||
then
|
||||
LIBWINE_LDFLAGS="-Wl,-G,-h,libwine.so.$libwine_soversion"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
|
||||
AC_SUBST(LIBWINE_DEPENDS,"wine.map")
|
||||
TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
|
||||
|
|
|
|||
Loading…
Reference in New Issue