Configure update for Darwin
Pierre d'Herbemont
stegefin at free.fr
Sun Jun 13 12:19:11 CDT 2004
Hi!
Here is a fix for configure when using darwin. Strip to work has to be
used with some argument ('strip file' doesn't work) on darwin. I also
add support for the WINE_GET_SONAME function.
Pierre
ChangeLog:
- strip support for darwin
- WINE_GET_SONAME support for darwin
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.278
diff -u -r1.278 configure.ac
--- configure.ac 3 Jun 2004 00:03:23 -0000 1.278
+++ configure.ac 13 Jun 2004 17:17:49 -0000
@@ -933,7 +933,8 @@
LDDLLFLAGS="-bundle -flat_namespace -undefined suppress"
LDSHARED="\$(CC) -dynamiclib"
CFLAGS="$CFLAGS -ffixed-r13 -no-cpp-precomp"
- fi
+ STRIP="$STRIP -u -r"
+ fi
fi
fi
fi
@@ -988,22 +989,22 @@
dnl **** Get the soname for libraries that we load dynamically ****
-if test "$LIBEXT" = "so"
+if [ test $LIBEXT = "so" -o $LIBEXT = "dylib" ]
then
- WINE_GET_SONAME(X11,XCreateWindow,[$X_LIBS $X_EXTRA_LIBS])
- WINE_GET_SONAME(Xext,XextCreateExtension,[$X_LIBS -lX11 $X_EXTRA_LIBS])
- WINE_GET_SONAME(Xi,XOpenDevice,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
- WINE_GET_SONAME(Xrender,XRenderQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
- WINE_GET_SONAME(Xrandr,XRRQueryExtension,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
- WINE_GET_SONAME(freetype,FT_Init_FreeType,[$X_LIBS])
- WINE_GET_SONAME(GL,glXQueryExtension,[$X_LIBS $X_EXTRA_LIBS])
- WINE_GET_SONAME(cups,cupsGetDefault)
- WINE_GET_SONAME(jack,jack_client_new)
- WINE_GET_SONAME(fontconfig,FcInit)
- WINE_GET_SONAME(ssl,SSL_library_init)
- WINE_GET_SONAME(crypto,BIO_new_socket)
- WINE_GET_SONAME(ncurses,waddch)
- WINE_GET_SONAME(curses,waddch)
+ WINE_GET_SONAME(X11,XCreateWindow,$LIBEXT,[$X_LIBS $X_EXTRA_LIBS])
+ WINE_GET_SONAME(Xext,XextCreateExtension,$LIBEXT,[$X_LIBS -lX11 $X_EXTRA_LIBS])
+ WINE_GET_SONAME(Xi,XOpenDevice,$LIBEXT,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+ WINE_GET_SONAME(Xrender,XRenderQueryExtension,$LIBEXT,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+ WINE_GET_SONAME(Xrandr,XRRQueryExtension,$LIBEXT,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
+ WINE_GET_SONAME(freetype,FT_Init_FreeType,$LIBEXT,[$X_LIBS])
+ WINE_GET_SONAME(GL,glXQueryExtension,$LIBEXT,[$X_LIBS $X_EXTRA_LIBS])
+ WINE_GET_SONAME(cups,cupsGetDefault,$LIBEXT)
+ WINE_GET_SONAME(jack,jack_client_new,$LIBEXT)
+ WINE_GET_SONAME(fontconfig,FcInit,$LIBEXT)
+ WINE_GET_SONAME(ssl,SSL_library_init,$LIBEXT)
+ WINE_GET_SONAME(crypto,BIO_new_socket,$LIBEXT)
+ WINE_GET_SONAME(ncurses,waddch,$LIBEXT)
+ WINE_GET_SONAME(curses,waddch,$LIBEXT)
fi
Index: aclocal.m4
===================================================================
RCS file: /home/wine/wine/aclocal.m4,v
retrieving revision 1.11
diff -u -r1.11 aclocal.m4
--- aclocal.m4 26 Jul 2003 20:27:47 -0000 1.11
+++ aclocal.m4 13 Jun 2004 17:17:50 -0000
@@ -30,20 +30,20 @@
dnl **** Extract the soname of a library ****
dnl
-dnl Usage: WINE_GET_SONAME(LIBRARY, FUNCTION, [OTHER_LIBRARIES])
+dnl Usage: WINE_GET_SONAME(LIBRARY, FUNCTION, LIBEXT, [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"
+LIBS="-l$1 $4 $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/^.*\(lib$1\.so[[^ ]]*\).*$/\1/'`
+ [ac_cv_lib_soname_$1=`$ac_cv_path_LDD conftest$ac_exeext | grep lib$1\\.$3 | sed 's/^.*\(lib$1\.$3[[^ ]]*\).*$/\1/'`
if test "x$ac_cv_lib_soname_$1" = "x"
then
- ac_cv_lib_soname_$1="lib$1.so"
+ ac_cv_lib_soname_$1="lib$1.$3"
fi],
- [ac_cv_lib_soname_$1="lib$1.so"])
+ [ac_cv_lib_soname_$1="lib$1.$3"])
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",
More information about the wine-patches
mailing list