Only build both Wine binaries on Linux, pthread support doesn't work
on other platforms.
diff --git a/configure b/configure
index a3409ba..efad905 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@
# 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 WIN16_FILES WIN16_INSTALL MAIN_BINARY build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX 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 LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLL LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS LDD ALLOCA 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 WIN16_FILES WIN16_INSTALL build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX 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 LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT LIBPTHREAD JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS CAPI4LINUXLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLL LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS WINE_BINARIES MAIN_BINARY LDD ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
# Initialize some variables set by options.
@@ -1383,14 +1383,6 @@
_ACEOF
fi
-if test "x$with_nptl" = "xyes"
-then
- MAIN_BINARY="wine-pthread"
-
-else
- MAIN_BINARY="wine-kthread"
-
-fi
# Make sure we can run config.sub.
@@ -12579,11 +12571,31 @@
;;
esac
-CRTLIBS=""
-
case $host_os in
mingw32*)
- CRTLIBS="-lmsvcrt" ;;
+ CRTLIBS="-lmsvcrt"
+ ;;
+esac
+
+case $host_os in
+ linux*)
+ WINE_BINARIES="wine-kthread wine-pthread"
+
+ if test "x$with_nptl" = "xyes"
+ then
+ MAIN_BINARY="wine-pthread"
+
+ else
+ MAIN_BINARY="wine-kthread"
+
+ fi
+ ;;
+ *)
+ WINE_BINARIES="wine-kthread"
+
+ MAIN_BINARY="wine-kthread"
+
+ ;;
esac
@@ -17821,7 +17833,6 @@
s,@LIBS@,$LIBS,;t t
s,@WIN16_FILES@,$WIN16_FILES,;t t
s,@WIN16_INSTALL@,$WIN16_INSTALL,;t t
-s,@MAIN_BINARY@,$MAIN_BINARY,;t t
s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t
s,@build_vendor@,$build_vendor,;t t
@@ -17916,6 +17927,8 @@
s,@CROSSWINDRES@,$CROSSWINDRES,;t t
s,@LDPATH@,$LDPATH,;t t
s,@CRTLIBS@,$CRTLIBS,;t t
+s,@WINE_BINARIES@,$WINE_BINARIES,;t t
+s,@MAIN_BINARY@,$MAIN_BINARY,;t t
s,@LDD@,$LDD,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
diff --git a/configure.ac b/configure.ac
index 1a7dd69..75b29bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,12 +36,6 @@
then
AC_DEFINE(NO_TRACE_MSGS,1,[Define to disable trace messages.])
fi
-if test "x$with_nptl" = "xyes"
-then
- AC_SUBST(MAIN_BINARY,"wine-pthread")
-else
- AC_SUBST(MAIN_BINARY,"wine-kthread")
-fi
dnl **** Check for some programs ****
@@ -918,10 +912,25 @@
esac
dnl Mingw needs explicit msvcrt for linking libwine
-AC_SUBST(CRTLIBS,"")
case $host_os in
mingw32*)
- CRTLIBS="-lmsvcrt" ;;
+ AC_SUBST(CRTLIBS,"-lmsvcrt") ;;
+esac
+
+case $host_os in
+ linux*)
+ AC_SUBST(WINE_BINARIES,"wine-kthread wine-pthread")
+ if test "x$with_nptl" = "xyes"
+ then
+ AC_SUBST(MAIN_BINARY,"wine-pthread")
+ else
+ AC_SUBST(MAIN_BINARY,"wine-kthread")
+ fi
+ ;;
+ *)
+ AC_SUBST(WINE_BINARIES,"wine-kthread")
+ AC_SUBST(MAIN_BINARY,"wine-kthread")
+ ;;
esac
dnl **** Get the soname for libraries that we load dynamically ****
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 77f32b8..5307e80 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -12,16 +12,14 @@
KTHREAD_OBJS = main.o kthread.o
PTHREAD_OBJS = main.o pthread.o
-BINARIES = \
- wine-kthread \
- wine-pthread
+WINE_BINARIES = @WINE_BINARIES@
+MAIN_BINARY = @MAIN_BINARY@
-all: $(BINARIES) $(MODULE)
+all: $(WINE_BINARIES) $(MODULE)
@MAKE_RULES@
LIBPTHREAD = @LIBPTHREAD@
-MAIN_BINARY = @MAIN_BINARY@
LDEXECFLAGS = @LDEXECFLAGS@
wine-kthread: $(KTHREAD_OBJS) Makefile.in
@@ -33,16 +31,19 @@
$(MODULE): $(MAIN_BINARY)
$(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
-install:: $(BINARIES)
+install:: $(WINE_BINARIES)
$(MKINSTALLDIRS) $(bindir)
- $(INSTALL_PROGRAM) wine-kthread $(bindir)/wine-kthread
- $(INSTALL_PROGRAM) wine-pthread $(bindir)/wine-pthread
- cd $(bindir) && $(RM) $(MODULE) && $(LN_S) $(MAIN_BINARY) $(MODULE)
+ for f in $(WINE_BINARIES); do \
+ if [ "$(MAIN_BINARY)" = "$$f" ]; \
+ then $(INSTALL_PROGRAM) $$f $(bindir)/$(MODULE); \
+ else $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
+ fi; \
+ done
uninstall::
- $(RM) $(BINARIES:%=$(bindir)/%) $(bindir)/$(MODULE)
+ $(RM) $(WINE_BINARIES:%=$(bindir)/%) $(bindir)/$(MODULE)
clean::
- $(RM) $(BINARIES) $(MODULE)
+ $(RM) $(WINE_BINARIES) $(MODULE)
### Dependencies:
