Alexandre Julliard : configure:
Default to building wine-pthread on non-x86 platforms.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Feb 17 07:20:56 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 266391744dc933e0083efbf9f1b7adea5d8ea44c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=266391744dc933e0083efbf9f1b7adea5d8ea44c
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Feb 17 14:12:29 2006 +0100
configure: Default to building wine-pthread on non-x86 platforms.
---
configure | 32 +++++++++++---------------------
configure.ac | 20 ++++++--------------
loader/Makefile.in | 5 +++--
3 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/configure b/configure
index 99ead32..b966c82 100755
--- a/configure
+++ b/configure
@@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS WINE_BINARIES MAIN_BINARY LDD LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS'
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
# Initialize some variables set by options.
@@ -13115,29 +13115,19 @@ case $host_os in
;;
esac
-case $host_os in
- linux* | k*bsd*-gnu)
- case $host_cpu in
- *i[3456789]86*) WINE_BINARIES="wine-glibc wine-kthread wine-pthread wine-preloader"
- ;;
- *) WINE_BINARIES="wine-glibc wine-kthread wine-pthread"
- ;;
- esac
+case $host in
+ *i[3456789]86*-linux* | *i[3456789]86*-k*bsd*-gnu)
MAIN_BINARY="wine-glibc"
- ;;
- darwin*)
- WINE_BINARIES="wine-pthread"
-
- MAIN_BINARY="wine-pthread"
-
- ;;
- *)
- WINE_BINARIES="wine-kthread"
-
- MAIN_BINARY="wine-kthread"
+ EXTRA_BINARIES="wine-kthread wine-pthread wine-preloader"
;;
+ darwin*) MAIN_BINARY="wine-pthread"
+ ;;
+ *i[3456789]86*) MAIN_BINARY="wine-kthread"
+ ;;
+ *) MAIN_BINARY="wine-pthread"
+ ;;
esac
@@ -19863,8 +19853,8 @@ s, at CROSSWINDRES@,$CROSSWINDRES,;t t
s, at LDPATH@,$LDPATH,;t t
s, at CRTLIBS@,$CRTLIBS,;t t
s, at SOCKETLIBS@,$SOCKETLIBS,;t t
-s, at WINE_BINARIES@,$WINE_BINARIES,;t t
s, at MAIN_BINARY@,$MAIN_BINARY,;t t
+s, at EXTRA_BINARIES@,$EXTRA_BINARIES,;t t
s, at LDD@,$LDD,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/configure.ac b/configure.ac
index de05da6..582df4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1081,22 +1081,14 @@ case $host_os in
;;
esac
-case $host_os in
- linux* | k*bsd*-gnu)
- case $host_cpu in
- *i[[3456789]]86*) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread wine-preloader") ;;
- *) AC_SUBST(WINE_BINARIES,"wine-glibc wine-kthread wine-pthread") ;;
- esac
+case $host in
+ *i[[3456789]]86*-linux* | *i[[3456789]]86*-k*bsd*-gnu)
AC_SUBST(MAIN_BINARY,"wine-glibc")
+ AC_SUBST(EXTRA_BINARIES,"wine-kthread wine-pthread wine-preloader")
;;
- darwin*)
- AC_SUBST(WINE_BINARIES,"wine-pthread")
- AC_SUBST(MAIN_BINARY,"wine-pthread")
- ;;
- *)
- AC_SUBST(WINE_BINARIES,"wine-kthread")
- AC_SUBST(MAIN_BINARY,"wine-kthread")
- ;;
+ darwin*) AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
+ *i[[3456789]]86*) AC_SUBST(MAIN_BINARY,"wine-kthread") ;;
+ *) AC_SUBST(MAIN_BINARY,"wine-pthread") ;;
esac
dnl **** Get the soname for libraries that we load dynamically ****
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 30c9c0e..741fa65 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -14,8 +14,9 @@ C_SRCS = \
KTHREAD_OBJS = kthread.o main.o
PTHREAD_OBJS = pthread.o main.o
-WINE_BINARIES = @WINE_BINARIES@
-MAIN_BINARY = @MAIN_BINARY@
+MAIN_BINARY = @MAIN_BINARY@
+EXTRA_BINARIES = @EXTRA_BINARIES@
+WINE_BINARIES = $(MAIN_BINARY) $(EXTRA_BINARIES)
MANPAGES = wine.man
More information about the wine-cvs
mailing list