ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added configure check for the soname of libraries that we load 

dynamically.  Added a few other configure macros, and moved all macros
into aclocal.m4.
This commit is contained in:
Alexandre Julliard 2002-05-20 18:29:58 +00:00
parent a081e2380f
commit 67e8dc6861
7 changed files with 566 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
aclocal.m4 vendored Normal file
View File

@ -0,0 +1,104 @@
dnl Macros used to build the Wine configure script
dnl
dnl Copyright 2002 Alexandre Julliard
dnl
dnl This library is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Lesser General Public
dnl License as published by the Free Software Foundation; either
dnl version 2.1 of the License, or (at your option) any later version.
dnl
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Lesser General Public License for more details.
dnl
dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl
dnl **** Get the ldd program name; used by WINE_GET_SONAME ****
dnl
dnl Usage: WINE_PATH_LDD
dnl
AC_DEFUN([WINE_PATH_LDD],[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH)])
dnl **** Extract the soname of a library ****
dnl
dnl Usage: WINE_GET_SONAME(LIBRARY, FUNCTION, [OTHER_LIBRARIES])
dnl
AC_DEFUN([WINE_GET_SONAME],
[AC_REQUIRE([WINE_PATH_LDD])
AC_CACHE_CHECK([for -l$1 soname], ac_cv_lib_soname_$1,
[ac_get_soname_save_LIBS=$LIBS
LIBS="-l$1 $3 $LIBS"
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
[ac_cv_lib_soname_$1=`$ac_cv_path_LDD conftest$ac_exeext | grep lib$1\\.so | sed 's/^[[ ]]*\([[^ ]]*\)[[ ]]*=>.*$/\1/'`
if test "x$ac_cv_lib_soname_$1" = "x"
then
ac_cv_lib_soname_$1="lib$1.so"
fi],
[ac_cv_lib_soname_$1="lib$1.so"])
LIBS=$ac_get_soname_save_LIBS])
if test "x$ac_cv_lib_soname_$1" != xNONE
then AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),"$ac_cv_lib_soname_$1",
[Define to the soname of the lib$1 library.])dnl
fi])
dnl **** Check if a structure contains a specified member ****
dnl
dnl Usage: WINE_CHECK_STRUCT_MEMBER(struct,member,[includes,[action-if-found,[action-if-not-found]]])
dnl
AC_DEFUN([WINE_CHECK_STRUCT_MEMBER],
[AC_CACHE_CHECK([for $2 in struct $1], ac_cv_c_$1_$2,
AC_TRY_COMPILE([$3],[struct $1 s; s.$2 = 0],ac_cv_c_$1_$2="yes",ac_cv_c_$1_$2="no"))
AS_IF([ test "x$ac_cv_c_$1_$2" = "xyes"],[$4],[$5])
])
dnl **** Check for reentrant libc ****
dnl
dnl Usage: WINE_CHECK_ERRNO(errno-name,[action-if-yes,[action-if-no]])
dnl
dnl For cross-compiling we blindly assume that libc is reentrant. This is
dnl ok since non-reentrant libc is quite rare (mostly old libc5 versions).
dnl
AC_DEFUN([WINE_CHECK_ERRNO],
[AC_CACHE_CHECK([for reentrant libc: $1],[wine_cv_libc_r_$1],
[AC_TRY_RUN([int myerrno = 0;
char buf[256];
int *$1(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);}],
wine_cv_libc_r_$1=yes, wine_cv_libc_r_$1=no,
wine_cv_libc_r_$1=yes)])
AS_IF([test "$wine_cv_libc_r_$1" = "yes"],[$2],[$3])])
dnl **** Link C code with an assembly file ****
dnl
dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]])
dnl
AC_DEFUN([WINE_TRY_ASM_LINK],
[ac_try_asm_link_saved_libs=$LIBS
LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF
$1
EOF
AC_TRY_LINK([$2],[$3],[$4],[$5])
rm -f conftest_asm.s
LIBS=$ac_try_asm_link_saved_libs])
dnl **** Check if we can link an empty program with special CFLAGS ****
dnl
dnl Usage: WINE_TRY_CFLAGS(flags,[action-if-yes,[action-if-no]])
dnl
AC_DEFUN([WINE_TRY_CFLAGS],
[ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS $1"
AC_TRY_LINK([],[],[$2],[$3])
CFLAGS=$ac_wine_try_cflags_saved])
dnl **** Create non-existent directories from config.status ****
dnl
dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
dnl
AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])])

442
configure vendored
View File

@ -9293,9 +9293,9 @@ echo $ECHO_N "checking for gcc -mpreferred-stack-boundary=2 support... $ECHO_C"
if test "${ac_cv_c_gcc_stack_boundary+set}" = set; then if test "${ac_cv_c_gcc_stack_boundary+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_cflags=$CFLAGS ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" CFLAGS="$CFLAGS -mpreferred-stack-boundary=2"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
@ -9308,18 +9308,18 @@ else
int int
main () main ()
{ {
return 0
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext' { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
@ -9331,9 +9331,8 @@ else
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
ac_cv_c_gcc_stack_boundary="no" ac_cv_c_gcc_stack_boundary="no"
fi fi
rm -f conftest.$ac_objext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
CFLAGS=$saved_cflags CFLAGS=$ac_wine_try_cflags_saved
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_gcc_stack_boundary" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_gcc_stack_boundary" >&5
echo "${ECHO_T}$ac_cv_c_gcc_stack_boundary" >&6 echo "${ECHO_T}$ac_cv_c_gcc_stack_boundary" >&6
@ -9349,7 +9348,7 @@ echo $ECHO_N "checking whether .type must sit inside a .def directive... $ECHO_C
if test "${ac_cv_c_type_in_def+set}" = set; then if test "${ac_cv_c_type_in_def+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_libs=$LIBS ac_try_asm_link_saved_libs=$LIBS
LIBS="conftest_asm.s $LIBS" LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF cat > conftest_asm.s <<EOF
.globl _ac_test .globl _ac_test
@ -9394,7 +9393,8 @@ cat conftest.$ac_ext >&5
ac_cv_c_type_in_def="no" ac_cv_c_type_in_def="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$saved_libs rm -f conftest_asm.s
LIBS=$ac_try_asm_link_saved_libs
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_type_in_def" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_type_in_def" >&5
echo "${ECHO_T}$ac_cv_c_type_in_def" >&6 echo "${ECHO_T}$ac_cv_c_type_in_def" >&6
@ -9413,7 +9413,7 @@ echo $ECHO_N "checking whether external symbols need an underscore prefix... $EC
if test "${ac_cv_c_extern_prefix+set}" = set; then if test "${ac_cv_c_extern_prefix+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_libs=$LIBS ac_try_asm_link_saved_libs=$LIBS
LIBS="conftest_asm.s $LIBS" LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF cat > conftest_asm.s <<EOF
.globl _ac_test .globl _ac_test
@ -9457,7 +9457,8 @@ cat conftest.$ac_ext >&5
ac_cv_c_extern_prefix="no" ac_cv_c_extern_prefix="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$saved_libs rm -f conftest_asm.s
LIBS=$ac_try_asm_link_saved_libs
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_extern_prefix" >&5
echo "${ECHO_T}$ac_cv_c_extern_prefix" >&6 echo "${ECHO_T}$ac_cv_c_extern_prefix" >&6
@ -9476,20 +9477,14 @@ echo $ECHO_N "checking whether stdcall symbols need to be decorated... $ECHO_C"
if test "${ac_cv_c_stdcall_decoration+set}" = set; then if test "${ac_cv_c_stdcall_decoration+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_libs=$LIBS ac_try_asm_link_saved_libs=$LIBS
LIBS="conftest_asm.s $LIBS" LIBS="conftest_asm.s $LIBS"
if test "$ac_cv_c_extern_prefix" = "yes"
then
cat > conftest_asm.s <<EOF cat > conftest_asm.s <<EOF
.globl _ac_test@0 .globl _ac_test@0
_ac_test@0: _ac_test@0:
EOF
else
cat > conftest_asm.s <<EOF
.globl ac_test@0 .globl ac_test@0
ac_test@0: ac_test@0:
EOF EOF
fi
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
@ -9503,7 +9498,7 @@ extern void __attribute__((__stdcall__)) ac_test(void);
int int
main () main ()
{ {
ac_test(); return 0 ac_test()
; ;
return 0; return 0;
} }
@ -9527,7 +9522,8 @@ cat conftest.$ac_ext >&5
ac_cv_c_stdcall_decoration="no" ac_cv_c_stdcall_decoration="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$saved_libs rm -f conftest_asm.s
LIBS=$ac_try_asm_link_saved_libs
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_stdcall_decoration" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_stdcall_decoration" >&5
echo "${ECHO_T}$ac_cv_c_stdcall_decoration" >&6 echo "${ECHO_T}$ac_cv_c_stdcall_decoration" >&6
@ -9546,7 +9542,7 @@ echo $ECHO_N "checking whether assembler accepts .string... $ECHO_C" >&6
if test "${ac_cv_c_asm_string+set}" = set; then if test "${ac_cv_c_asm_string+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_libs=$LIBS ac_try_asm_link_saved_libs=$LIBS
LIBS="conftest_asm.s $LIBS" LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF cat > conftest_asm.s <<EOF
.string "test" .string "test"
@ -9588,7 +9584,8 @@ cat conftest.$ac_ext >&5
ac_cv_c_asm_string="no" ac_cv_c_asm_string="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$saved_libs rm -f conftest_asm.s
LIBS=$ac_try_asm_link_saved_libs
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_asm_string" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_asm_string" >&5
echo "${ECHO_T}$ac_cv_c_asm_string" >&6 echo "${ECHO_T}$ac_cv_c_asm_string" >&6
@ -9961,9 +9958,9 @@ echo $ECHO_N "checking whether we can build a GNU style ELF dll... $ECHO_C" >&6
if test "${ac_cv_c_dll_gnuelf+set}" = set; then if test "${ac_cv_c_dll_gnuelf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_cflags=$CFLAGS ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic" CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
@ -9976,7 +9973,7 @@ else
int int
main () main ()
{ {
return 1
; ;
return 0; return 0;
} }
@ -10000,8 +9997,7 @@ cat conftest.$ac_ext >&5
ac_cv_c_dll_gnuelf="no" ac_cv_c_dll_gnuelf="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
CFLAGS=$saved_cflags CFLAGS=$ac_wine_try_cflags_saved
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_dll_gnuelf" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_dll_gnuelf" >&5
echo "${ECHO_T}$ac_cv_c_dll_gnuelf" >&6 echo "${ECHO_T}$ac_cv_c_dll_gnuelf" >&6
@ -10015,9 +10011,9 @@ echo $ECHO_N "checking whether we can build a UnixWare (Solaris) dll... $ECHO_C"
if test "${ac_cv_c_dll_unixware+set}" = set; then if test "${ac_cv_c_dll_unixware+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
saved_cflags=$CFLAGS ac_wine_try_cflags_saved=$CFLAGS
CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic" CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
@ -10030,7 +10026,7 @@ else
int int
main () main ()
{ {
return 1
; ;
return 0; return 0;
} }
@ -10054,8 +10050,7 @@ cat conftest.$ac_ext >&5
ac_cv_c_dll_unixware="no" ac_cv_c_dll_unixware="no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
CFLAGS=$saved_cflags CFLAGS=$ac_wine_try_cflags_saved
fi fi
echo "$as_me:$LINENO: result: $ac_cv_c_dll_unixware" >&5 echo "$as_me:$LINENO: result: $ac_cv_c_dll_unixware" >&5
echo "${ECHO_T}$ac_cv_c_dll_unixware" >&6 echo "${ECHO_T}$ac_cv_c_dll_unixware" >&6
@ -10109,11 +10104,318 @@ esac
if test "$LIBEXT" = "so"
then
# Extract the first word of "ldd", so it can be a program name with args.
set dummy ldd; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_LDD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $LDD in
[\\/]* | ?:[\\/]*)
ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /sbin:/usr/sbin:$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_LDD" && ac_cv_path_LDD="true"
;;
esac
fi
LDD=$ac_cv_path_LDD
if test -n "$LDD"; then
echo "$as_me:$LINENO: result: $LDD" >&5
echo "${ECHO_T}$LDD" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
echo "$as_me:$LINENO: checking for -lX11 soname" >&5
echo $ECHO_N "checking for -lX11 soname... $ECHO_C" >&6
if test "${ac_cv_lib_soname_X11+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_get_soname_save_LIBS=$LIBS
LIBS="-lX11 $X_LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XCreateWindow ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
XCreateWindow ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_soname_X11=`$ac_cv_path_LDD conftest$ac_exeext | grep libX11\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'`
if test "x$ac_cv_lib_soname_X11" = "x"
then
ac_cv_lib_soname_X11="libX11.so"
fi
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_soname_X11="libX11.so"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_get_soname_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_soname_X11" >&5
echo "${ECHO_T}$ac_cv_lib_soname_X11" >&6
if test "x$ac_cv_lib_soname_X11" != xNONE
then
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBX11 "$ac_cv_lib_soname_X11"
_ACEOF
fi
echo "$as_me:$LINENO: checking for -lXext soname" >&5
echo $ECHO_N "checking for -lXext soname... $ECHO_C" >&6
if test "${ac_cv_lib_soname_Xext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_get_soname_save_LIBS=$LIBS
LIBS="-lXext $X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XextCreateExtension ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
XextCreateExtension ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_soname_Xext=`$ac_cv_path_LDD conftest$ac_exeext | grep libXext\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'`
if test "x$ac_cv_lib_soname_Xext" = "x"
then
ac_cv_lib_soname_Xext="libXext.so"
fi
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_soname_Xext="libXext.so"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_get_soname_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xext" >&5
echo "${ECHO_T}$ac_cv_lib_soname_Xext" >&6
if test "x$ac_cv_lib_soname_Xext" != xNONE
then
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext"
_ACEOF
fi
echo "$as_me:$LINENO: checking for -lXrender soname" >&5
echo $ECHO_N "checking for -lXrender soname... $ECHO_C" >&6
if test "${ac_cv_lib_soname_Xrender+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_get_soname_save_LIBS=$LIBS
LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char XRenderQueryExtension ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
XRenderQueryExtension ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_soname_Xrender=`$ac_cv_path_LDD conftest$ac_exeext | grep libXrender\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'`
if test "x$ac_cv_lib_soname_Xrender" = "x"
then
ac_cv_lib_soname_Xrender="libXrender.so"
fi
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_soname_Xrender="libXrender.so"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_get_soname_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_soname_Xrender" >&5
echo "${ECHO_T}$ac_cv_lib_soname_Xrender" >&6
if test "x$ac_cv_lib_soname_Xrender" != xNONE
then
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBXRENDER "$ac_cv_lib_soname_Xrender"
_ACEOF
fi
echo "$as_me:$LINENO: checking for -lfreetype soname" >&5
echo $ECHO_N "checking for -lfreetype soname... $ECHO_C" >&6
if test "${ac_cv_lib_soname_freetype+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_get_soname_save_LIBS=$LIBS
LIBS="-lfreetype $X_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char FT_Init_FreeType ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
FT_Init_FreeType ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_soname_freetype=`$ac_cv_path_LDD conftest$ac_exeext | grep libfreetype\\.so | sed 's/^[ ]*\([^ ]*\)[ ]*=>.*$/\1/'`
if test "x$ac_cv_lib_soname_freetype" = "x"
then
ac_cv_lib_soname_freetype="libfreetype.so"
fi
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_soname_freetype="libfreetype.so"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_get_soname_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_soname_freetype" >&5
echo "${ECHO_T}$ac_cv_lib_soname_freetype" >&6
if test "x$ac_cv_lib_soname_freetype" != xNONE
then
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBFREETYPE "$ac_cv_lib_soname_freetype"
_ACEOF
fi
fi
wine_cv_libc_reentrant=no wine_cv_libc_reentrant=no
echo "$as_me:$LINENO: checking for reentrant libc: __errno_location" >&5
echo "$as_me:$LINENO: checking for reentrant libc: __errno_location" >&5
echo $ECHO_N "checking for reentrant libc: __errno_location... $ECHO_C" >&6 echo $ECHO_N "checking for reentrant libc: __errno_location... $ECHO_C" >&6
if test "${wine_cv_libc_r___errno_location+set}" = set; then if test "${wine_cv_libc_r___errno_location+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
@ -10150,16 +10452,12 @@ wine_cv_libc_r___errno_location=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $wine_cv_libc_r___errno_location" >&5 echo "$as_me:$LINENO: result: $wine_cv_libc_r___errno_location" >&5
echo "${ECHO_T}$wine_cv_libc_r___errno_location" >&6 echo "${ECHO_T}$wine_cv_libc_r___errno_location" >&6
if test "$wine_cv_libc_r___errno_location" = "yes" if test "$wine_cv_libc_r___errno_location" = "yes"; then
then
wine_cv_libc_reentrant=__errno_location wine_cv_libc_reentrant=__errno_location
fi else
echo "$as_me:$LINENO: checking for reentrant libc: __error" >&5 echo "$as_me:$LINENO: checking for reentrant libc: __error" >&5
echo $ECHO_N "checking for reentrant libc: __error... $ECHO_C" >&6 echo $ECHO_N "checking for reentrant libc: __error... $ECHO_C" >&6
if test "${wine_cv_libc_r___error+set}" = set; then if test "${wine_cv_libc_r___error+set}" = set; then
@ -10172,7 +10470,7 @@ else
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
int myerrno = 0; int myerrno = 0;
char buf[256]; char buf256;
int *__error(){return &myerrno;} int *__error(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);} main(){connect(0,buf,255); exit(!myerrno);}
_ACEOF _ACEOF
@ -10197,16 +10495,12 @@ wine_cv_libc_r___error=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $wine_cv_libc_r___error" >&5 echo "$as_me:$LINENO: result: $wine_cv_libc_r___error" >&5
echo "${ECHO_T}$wine_cv_libc_r___error" >&6 echo "${ECHO_T}$wine_cv_libc_r___error" >&6
if test "$wine_cv_libc_r___error" = "yes" if test "$wine_cv_libc_r___error" = "yes"; then
then
wine_cv_libc_reentrant=__error wine_cv_libc_reentrant=__error
fi else
echo "$as_me:$LINENO: checking for reentrant libc: ___errno" >&5 echo "$as_me:$LINENO: checking for reentrant libc: ___errno" >&5
echo $ECHO_N "checking for reentrant libc: ___errno... $ECHO_C" >&6 echo $ECHO_N "checking for reentrant libc: ___errno... $ECHO_C" >&6
if test "${wine_cv_libc_r____errno+set}" = set; then if test "${wine_cv_libc_r____errno+set}" = set; then
@ -10219,7 +10513,7 @@ else
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
int myerrno = 0; int myerrno = 0;
char buf[256]; char buf256;
int *___errno(){return &myerrno;} int *___errno(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);} main(){connect(0,buf,255); exit(!myerrno);}
_ACEOF _ACEOF
@ -10244,16 +10538,12 @@ wine_cv_libc_r____errno=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $wine_cv_libc_r____errno" >&5 echo "$as_me:$LINENO: result: $wine_cv_libc_r____errno" >&5
echo "${ECHO_T}$wine_cv_libc_r____errno" >&6 echo "${ECHO_T}$wine_cv_libc_r____errno" >&6
if test "$wine_cv_libc_r____errno" = "yes" if test "$wine_cv_libc_r____errno" = "yes"; then
then
wine_cv_libc_reentrant=___errno wine_cv_libc_reentrant=___errno
fi else
echo "$as_me:$LINENO: checking for reentrant libc: __thr_errno" >&5 echo "$as_me:$LINENO: checking for reentrant libc: __thr_errno" >&5
echo $ECHO_N "checking for reentrant libc: __thr_errno... $ECHO_C" >&6 echo $ECHO_N "checking for reentrant libc: __thr_errno... $ECHO_C" >&6
if test "${wine_cv_libc_r___thr_errno+set}" = set; then if test "${wine_cv_libc_r___thr_errno+set}" = set; then
@ -10266,7 +10556,7 @@ else
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
int myerrno = 0; int myerrno = 0;
char buf[256]; char buf256;
int *__thr_errno(){return &myerrno;} int *__thr_errno(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);} main(){connect(0,buf,255); exit(!myerrno);}
_ACEOF _ACEOF
@ -10291,16 +10581,12 @@ wine_cv_libc_r___thr_errno=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $wine_cv_libc_r___thr_errno" >&5 echo "$as_me:$LINENO: result: $wine_cv_libc_r___thr_errno" >&5
echo "${ECHO_T}$wine_cv_libc_r___thr_errno" >&6 echo "${ECHO_T}$wine_cv_libc_r___thr_errno" >&6
if test "$wine_cv_libc_r___thr_errno" = "yes" if test "$wine_cv_libc_r___thr_errno" = "yes"; then
then
wine_cv_libc_reentrant=__thr_errno wine_cv_libc_reentrant=__thr_errno
fi else
echo "$as_me:$LINENO: checking for reentrant libc: __errno" >&5 echo "$as_me:$LINENO: checking for reentrant libc: __errno" >&5
echo $ECHO_N "checking for reentrant libc: __errno... $ECHO_C" >&6 echo $ECHO_N "checking for reentrant libc: __errno... $ECHO_C" >&6
if test "${wine_cv_libc_r___errno+set}" = set; then if test "${wine_cv_libc_r___errno+set}" = set; then
@ -10313,7 +10599,7 @@ else
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
int myerrno = 0; int myerrno = 0;
char buf[256]; char buf256;
int *__errno(){return &myerrno;} int *__errno(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);} main(){connect(0,buf,255); exit(!myerrno);}
_ACEOF _ACEOF
@ -10338,16 +10624,23 @@ wine_cv_libc_r___errno=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $wine_cv_libc_r___errno" >&5 echo "$as_me:$LINENO: result: $wine_cv_libc_r___errno" >&5
echo "${ECHO_T}$wine_cv_libc_r___errno" >&6 echo "${ECHO_T}$wine_cv_libc_r___errno" >&6
if test "$wine_cv_libc_r___errno" = "yes" if test "$wine_cv_libc_r___errno" = "yes"; then
then
wine_cv_libc_reentrant=__errno wine_cv_libc_reentrant=__errno
fi fi
fi
fi
fi
fi
if test "$wine_cv_libc_reentrant" != "no" if test "$wine_cv_libc_reentrant" != "no"
then then
@ -12468,10 +12761,6 @@ _ACEOF
fi fi
echo "$as_me:$LINENO: checking for f_bfree in struct statfs" >&5 echo "$as_me:$LINENO: checking for f_bfree in struct statfs" >&5
echo $ECHO_N "checking for f_bfree in struct statfs... $ECHO_C" >&6 echo $ECHO_N "checking for f_bfree in struct statfs... $ECHO_C" >&6
if test "${ac_cv_c_statfs_f_bfree+set}" = set; then if test "${ac_cv_c_statfs_f_bfree+set}" = set; then
@ -12817,8 +13106,6 @@ fi
ac_config_commands="$ac_config_commands controls" ac_config_commands="$ac_config_commands controls"
ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice" ac_config_commands="$ac_config_commands dlls/ddraw/d3ddevice"
@ -13709,6 +13996,7 @@ s,@LDSHARED@,$LDSHARED,;t t
s,@LDDLLFLAGS@,$LDDLLFLAGS,;t t s,@LDDLLFLAGS@,$LDDLLFLAGS,;t t
s,@LIBEXT@,$LIBEXT,;t t s,@LIBEXT@,$LIBEXT,;t t
s,@LDPATH@,$LDPATH,;t t s,@LDPATH@,$LDPATH,;t t
s,@LDD@,$LDD,;t t
s,@ALLOCA@,$ALLOCA,;t t s,@ALLOCA@,$ALLOCA,;t t
/@MAKE_RULES@/r $MAKE_RULES /@MAKE_RULES@/r $MAKE_RULES
s,@MAKE_RULES@,,;t t s,@MAKE_RULES@,,;t t

163
configure.ac
View File

@ -622,13 +622,9 @@ int main(void) {
fi fi
dnl Check for -mpreferred-stack-boundary dnl Check for -mpreferred-stack-boundary
AC_CACHE_CHECK([for gcc -mpreferred-stack-boundary=2 support], AC_CACHE_CHECK([for gcc -mpreferred-stack-boundary=2 support], ac_cv_c_gcc_stack_boundary,
ac_cv_c_gcc_stack_boundary, [WINE_TRY_CFLAGS([-mpreferred-stack-boundary=2],
[saved_cflags=$CFLAGS ac_cv_c_gcc_stack_boundary="yes",ac_cv_c_gcc_stack_boundary="no")])
CFLAGS="$CFLAGS -mpreferred-stack-boundary=2"
AC_TRY_COMPILE(,[return 0],ac_cv_c_gcc_stack_boundary="yes",ac_cv_c_gcc_stack_boundary="no")
CFLAGS=$saved_cflags
])
if test "$ac_cv_c_gcc_stack_boundary" = "yes" if test "$ac_cv_c_gcc_stack_boundary" = "yes"
then then
CFLAGS="$CFLAGS -mpreferred-stack-boundary=2" CFLAGS="$CFLAGS -mpreferred-stack-boundary=2"
@ -637,18 +633,13 @@ fi
dnl **** Check if we need to place .type inside a .def directive **** dnl **** Check if we need to place .type inside a .def directive ****
AC_CACHE_CHECK([whether .type must sit inside a .def directive], AC_CACHE_CHECK([whether .type must sit inside a .def directive], ac_cv_c_type_in_def,
ac_cv_c_type_in_def, WINE_TRY_ASM_LINK(
[saved_libs=$LIBS [ .globl _ac_test
LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF
.globl _ac_test
.def _ac_test; .scl 2; .type 32; .endef .def _ac_test; .scl 2; .type 32; .endef
_ac_test: _ac_test:
.long 0 .long 0],,,
EOF ac_cv_c_type_in_def="yes",ac_cv_c_type_in_def="no"))
AC_TRY_LINK(,,ac_cv_c_type_in_def="yes",ac_cv_c_type_in_def="no")
LIBS=$saved_libs])
if test "$ac_cv_c_type_in_def" = "yes" if test "$ac_cv_c_type_in_def" = "yes"
then then
AC_DEFINE(NEED_TYPE_IN_DEF, 1, [Define if .type asm directive must be inside a .def directive]) AC_DEFINE(NEED_TYPE_IN_DEF, 1, [Define if .type asm directive must be inside a .def directive])
@ -656,18 +647,14 @@ fi
dnl **** Check for underscore on external symbols **** dnl **** Check for underscore on external symbols ****
AC_CACHE_CHECK([whether external symbols need an underscore prefix], AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_extern_prefix,
ac_cv_c_extern_prefix, WINE_TRY_ASM_LINK(
[saved_libs=$LIBS [ .globl _ac_test
LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF
.globl _ac_test
_ac_test: _ac_test:
.long 0 .long 0],
EOF [extern int ac_test;],
AC_TRY_LINK([extern int ac_test;],[if (ac_test) return 1], [if (ac_test) return 1],
ac_cv_c_extern_prefix="yes",ac_cv_c_extern_prefix="no") ac_cv_c_extern_prefix="yes",ac_cv_c_extern_prefix="no"))
LIBS=$saved_libs])
if test "$ac_cv_c_extern_prefix" = "yes" if test "$ac_cv_c_extern_prefix" = "yes"
then then
AC_DEFINE(NEED_UNDERSCORE_PREFIX, 1, AC_DEFINE(NEED_UNDERSCORE_PREFIX, 1,
@ -676,43 +663,25 @@ fi
dnl **** Check whether stdcall symbols need to be decorated **** dnl **** Check whether stdcall symbols need to be decorated ****
AC_CACHE_CHECK([whether stdcall symbols need to be decorated], AC_CACHE_CHECK([whether stdcall symbols need to be decorated], ac_cv_c_stdcall_decoration,
ac_cv_c_stdcall_decoration, WINE_TRY_ASM_LINK(
[saved_libs=$LIBS [ .globl _ac_test@0
LIBS="conftest_asm.s $LIBS"
if test "$ac_cv_c_extern_prefix" = "yes"
then
cat > conftest_asm.s <<EOF
.globl _ac_test@0
_ac_test@0: _ac_test@0:
EOF
else
cat > conftest_asm.s <<EOF
.globl ac_test@0 .globl ac_test@0
ac_test@0: ac_test@0:],
EOF [extern void __attribute__((__stdcall__)) ac_test(void);],
fi [ac_test()],
AC_TRY_LINK([extern void __attribute__((__stdcall__)) ac_test(void);], ac_cv_c_stdcall_decoration="yes",ac_cv_c_stdcall_decoration="no"))
[ac_test(); return 0],
ac_cv_c_stdcall_decoration="yes",ac_cv_c_stdcall_decoration="no")
LIBS=$saved_libs])
if test "$ac_cv_c_stdcall_decoration" = "yes" if test "$ac_cv_c_stdcall_decoration" = "yes"
then then
AC_DEFINE(NEED_STDCALL_DECORATION, 1, AC_DEFINE(NEED_STDCALL_DECORATION, 1, [Define if stdcall symbols need to be decorated])
[Define if stdcall symbols need to be decorated])
fi fi
dnl **** Check for .string in assembler **** dnl **** Check for .string in assembler ****
AC_CACHE_CHECK([whether assembler accepts .string], AC_CACHE_CHECK([whether assembler accepts .string], ac_cv_c_asm_string,
ac_cv_c_asm_string, WINE_TRY_ASM_LINK(
[saved_libs=$LIBS [ .string "test"],,,ac_cv_c_asm_string="yes",ac_cv_c_asm_string="no"))
LIBS="conftest_asm.s $LIBS"
cat > conftest_asm.s <<EOF
.string "test"
EOF
AC_TRY_LINK(,,ac_cv_c_asm_string="yes",ac_cv_c_asm_string="no")
LIBS=$saved_libs])
if test "$ac_cv_c_asm_string" = "yes" if test "$ac_cv_c_asm_string" = "yes"
then then
AC_DEFINE(HAVE_ASM_STRING, 1, [Define to use .string instead of .ascii]) AC_DEFINE(HAVE_ASM_STRING, 1, [Define to use .string instead of .ascii])
@ -745,24 +714,17 @@ case $host_os in
if test "$LIBEXT" = "so" if test "$LIBEXT" = "so"
then then
AC_CACHE_CHECK([whether we can build a GNU style ELF dll],ac_cv_c_dll_gnuelf, AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf,
[saved_cflags=$CFLAGS [WINE_TRY_CFLAGS([-fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic],
CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0,-Bsymbolic" ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")])
AC_TRY_LINK(,[return 1],ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")
CFLAGS=$saved_cflags
])
if test "$ac_cv_c_dll_gnuelf" = "yes" if test "$ac_cv_c_dll_gnuelf" = "yes"
then then
LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%)" LDSHARED="\$(CC) -shared \$(SONAME:%=-Wl,-soname,%)"
LDDLLFLAGS="-Wl,-Bsymbolic" LDDLLFLAGS="-Wl,-Bsymbolic"
else else
AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll, AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll, ac_cv_c_dll_unixware,
ac_cv_c_dll_unixware, [WINE_TRY_CFLAGS([-fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic],
[saved_cflags=$CFLAGS ac_cv_c_dll_unixware="yes",ac_cv_c_dll_unixware="no")])
CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic"
AC_TRY_LINK(,[return 1],ac_cv_c_dll_unixware="yes",ac_cv_c_dll_unixware="no")
CFLAGS=$saved_cflags
])
if test "$ac_cv_c_dll_unixware" = "yes" if test "$ac_cv_c_dll_unixware" = "yes"
then then
LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)" LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"
@ -807,38 +769,31 @@ AC_SUBST(LDDLLFLAGS)
AC_SUBST(LIBEXT) AC_SUBST(LIBEXT)
AC_SUBST(LDPATH) AC_SUBST(LDPATH)
dnl **** Check for reentrant libc **** dnl **** Get the soname for libraries that we load dynamically ****
dnl
dnl For cross-compiling we blindly assume that libc is reentrant. This is
dnl ok since non-reentrant libc is quite rare (mostly old libc5 versions).
AC_DEFUN([WINE_CHECK_ERRNO], if test "$LIBEXT" = "so"
[
AC_CACHE_CHECK(for reentrant libc: $1, wine_cv_libc_r_$1,
[AC_TRY_RUN([int myerrno = 0;
char buf[256];
int *$1(){return &myerrno;}
main(){connect(0,buf,255); exit(!myerrno);}],
wine_cv_libc_r_$1=yes, wine_cv_libc_r_$1=no,
wine_cv_libc_r_$1=yes )
])
if test "$wine_cv_libc_r_$1" = "yes"
then then
wine_cv_libc_reentrant=$1 WINE_GET_SONAME(X11,XCreateWindow,[$X_LIBS $X_EXTRA_LIBS])
WINE_GET_SONAME(Xext,XextCreateExtension,[$X_LIBS -lX11 $X_EXTRA_LIBS])
WINE_GET_SONAME(Xrender,XRenderQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
fi fi
])
dnl **** Check for reentrant libc ****
wine_cv_libc_reentrant=no wine_cv_libc_reentrant=no
dnl Linux style errno location dnl Linux style errno location
WINE_CHECK_ERRNO(__errno_location) WINE_CHECK_ERRNO([__errno_location], [wine_cv_libc_reentrant=__errno_location],
dnl FreeBSD style errno location dnl FreeBSD style errno location
WINE_CHECK_ERRNO(__error) WINE_CHECK_ERRNO([__error], [wine_cv_libc_reentrant=__error],
dnl Solaris style errno location dnl Solaris style errno location
WINE_CHECK_ERRNO(___errno) WINE_CHECK_ERRNO([___errno], [wine_cv_libc_reentrant=___errno],
dnl UnixWare style errno location dnl UnixWare style errno location
WINE_CHECK_ERRNO(__thr_errno) WINE_CHECK_ERRNO([__thr_errno], [wine_cv_libc_reentrant=__thr_errno],
dnl NetBSD style errno location dnl NetBSD style errno location
WINE_CHECK_ERRNO(__errno) WINE_CHECK_ERRNO([__errno], [wine_cv_libc_reentrant=__errno])
))))
if test "$wine_cv_libc_reentrant" != "no" if test "$wine_cv_libc_reentrant" != "no"
then then
@ -1151,17 +1106,6 @@ then
fi fi
fi fi
dnl *** Check for some structure members
dnl Macro to check if a structure contains a specified member
dnl Usage: WINE_CHECK_STRUCT_MEMBER(struct,member,[includes,[action-if-found,[action-if-not-found]]])
AC_DEFUN([WINE_CHECK_STRUCT_MEMBER],
[AC_CACHE_CHECK([for $2 in struct $1], ac_cv_c_$1_$2,
AC_TRY_COMPILE([$3],[struct $1 s; s.$2 = 0],ac_cv_c_$1_$2="yes",ac_cv_c_$1_$2="no"))
AS_IF([ test "x$ac_cv_c_$1_$2" = "xyes"],[$4],[$5])
])
dnl **** FIXME: what about mixed cases, where we need two of them? *** dnl **** FIXME: what about mixed cases, where we need two of them? ***
WINE_CHECK_STRUCT_MEMBER(statfs,f_bfree, WINE_CHECK_STRUCT_MEMBER(statfs,f_bfree,
@ -1238,11 +1182,6 @@ fi
dnl **** Generate output files **** dnl **** Generate output files ****
dnl Macro to create non-existent directories from config.status
dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
AC_DEFUN([WINE_CONFIG_EXTRA_DIR],
[AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])])
AH_TOP([#define __WINE_CONFIG_H]) AH_TOP([#define __WINE_CONFIG_H])
WINE_CONFIG_EXTRA_DIR(controls) WINE_CONFIG_EXTRA_DIR(controls)

8
dlls/gdi/freetype.c
View File

@ -73,6 +73,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#include <freetype/fttrigon.h> #include <freetype/fttrigon.h>
#endif #endif
#ifndef SONAME_LIBFREETYPE
#define SONAME_LIBFREETYPE "libfreetype.so"
#endif
static FT_Library library = 0; static FT_Library library = 0;
static void *ft_handle = NULL; static void *ft_handle = NULL;
@ -242,7 +246,7 @@ static BOOL AddFontFileToList(char *file)
for(insertface = &family->FirstFace; *insertface; for(insertface = &family->FirstFace; *insertface;
insertface = &(*insertface)->next) { insertface = &(*insertface)->next) {
if(!strcmpW((*insertface)->StyleName, StyleW)) { if(!strcmpW((*insertface)->StyleName, StyleW)) {
ERR("Already loaded font %s %s\n", debugstr_w(family->FamilyName), WARN("Already loaded font %s %s\n", debugstr_w(family->FamilyName),
debugstr_w(StyleW)); debugstr_w(StyleW));
HeapFree(GetProcessHeap(), 0, StyleW); HeapFree(GetProcessHeap(), 0, StyleW);
pFT_Done_Face(ft_face); pFT_Done_Face(ft_face);
@ -449,7 +453,7 @@ BOOL WineEngInit(void)
TRACE("\n"); TRACE("\n");
ft_handle = wine_dlopen("libfreetype.so", RTLD_NOW, NULL, 0); ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0);
if(!ft_handle) { if(!ft_handle) {
WINE_MESSAGE( WINE_MESSAGE(
"Wine cannot find the FreeType font library. To enable Wine to\n" "Wine cannot find the FreeType font library. To enable Wine to\n"

6
dlls/wineps/truetype.c
View File

@ -78,6 +78,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
FT_LOAD_IGNORE_TRANSFORM | \ FT_LOAD_IGNORE_TRANSFORM | \
FT_LOAD_LINEAR_DESIGN ) FT_LOAD_LINEAR_DESIGN )
#ifndef SONAME_LIBFREETYPE
#define SONAME_LIBFREETYPE "libfreetype.so"
#endif
static void *ft_handle = NULL; static void *ft_handle = NULL;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL; #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL;
@ -590,7 +594,7 @@ BOOL PSDRV_GetTrueTypeMetrics(void)
return TRUE; return TRUE;
ft_handle = wine_dlopen("libfreetype.so", RTLD_NOW, NULL, 0); ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0);
if(!ft_handle) { if(!ft_handle) {
WINE_MESSAGE( WINE_MESSAGE(
"Wine cannot find the FreeType font library. To enable Wine to\n" "Wine cannot find the FreeType font library. To enable Wine to\n"

18
dlls/x11drv/xrender.c
View File

@ -82,6 +82,17 @@ static INT mru = -1;
static int antialias = 1; static int antialias = 1;
/* some default values just in case */
#ifndef SONAME_LIBX11
#define SONAME_LIBX11 "libX11.so"
#endif
#ifndef SONAME_LIBXEXT
#define SONAME_LIBXEXT "libXext.so"
#endif
#ifndef SONAME_LIBXRENDER
#define SONAME_LIBXRENDER "libXrender.so"
#endif
static void *xrender_handle; static void *xrender_handle;
#define MAKE_FUNCPTR(f) static typeof(f) * p##f; #define MAKE_FUNCPTR(f) static typeof(f) * p##f;
@ -111,10 +122,9 @@ void X11DRV_XRender_Init(void)
int error_base, event_base, i; int error_base, event_base, i;
XRenderPictFormat pf; XRenderPictFormat pf;
/* FIXME: should find correct soname at compile time */ if (!wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0)) return;
if (!wine_dlopen("libX11.so", RTLD_NOW|RTLD_GLOBAL, NULL, 0)) return; if (!wine_dlopen(SONAME_LIBXEXT, RTLD_NOW|RTLD_GLOBAL, NULL, 0)) return;
if (!wine_dlopen("libXext.so", RTLD_NOW|RTLD_GLOBAL, NULL, 0)) return; xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0);
xrender_handle = wine_dlopen("libXrender.so", RTLD_NOW, NULL, 0);
if(!xrender_handle) return; if(!xrender_handle) return;
#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found; #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found;

12
include/config.h.in
View File

@ -638,6 +638,18 @@
/* The size of a `long long', as computed by sizeof. */ /* The size of a `long long', as computed by sizeof. */
#undef SIZEOF_LONG_LONG #undef SIZEOF_LONG_LONG
/* Define to the soname of the libfreetype library. */
#undef SONAME_LIBFREETYPE
/* Define to the soname of the libX11 library. */
#undef SONAME_LIBX11
/* Define to the soname of the libXext library. */
#undef SONAME_LIBXEXT
/* Define to the soname of the libXrender library. */
#undef SONAME_LIBXRENDER
/* If using the C implementation of alloca, define if you know the /* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be direction of stack growth for your system; otherwise it will be
automatically deduced at run-time. automatically deduced at run-time.