From 318f4cefd27156ead30bc4ec0cf3dcae809fda91 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 31 Jan 2000 05:02:49 +0000 Subject: [PATCH] Build most dlls as separate shared libraries. --- Make.rules.in | 86 +++- Makefile.in | 148 ++---- configure | 701 ++++++++++++++-------------- configure.in | 64 +-- debugger/Makefile.in | 3 - dlls/Makefile.in | 306 +++++++++--- dlls/avifil32/.cvsignore | 3 +- dlls/avifil32/Makefile.in | 8 +- dlls/comctl32/.cvsignore | 3 +- dlls/comctl32/Makefile.in | 7 +- dlls/commdlg/.cvsignore | 3 +- dlls/commdlg/Makefile.in | 10 +- dlls/dciman32/.cvsignore | 3 +- dlls/dciman32/Makefile.in | 7 +- dlls/dplayx/.cvsignore | 3 +- dlls/dplayx/Makefile.in | 8 +- dlls/dsound/.cvsignore | 3 +- dlls/dsound/Makefile.in | 7 +- dlls/icmp/.cvsignore | 3 +- dlls/icmp/Makefile.in | 7 +- dlls/imagehlp/.cvsignore | 3 +- dlls/imagehlp/Makefile.in | 7 +- dlls/imm32/.cvsignore | 3 +- dlls/imm32/Makefile.in | 7 +- dlls/lzexpand/.cvsignore | 3 +- dlls/lzexpand/Makefile.in | 9 +- dlls/msacm/.cvsignore | 3 +- dlls/msacm/Makefile.in | 7 +- dlls/msacm32/.cvsignore | 3 +- dlls/msacm32/Makefile.in | 7 +- dlls/msnet32/.cvsignore | 3 +- dlls/msnet32/Makefile.in | 7 +- dlls/msvideo/.cvsignore | 3 +- dlls/msvideo/Makefile.in | 9 +- dlls/odbc32/.cvsignore | 3 +- dlls/odbc32/Makefile.in | 7 +- dlls/ole32/.cvsignore | 3 +- dlls/ole32/Makefile.in | 7 +- dlls/ole32/defaulthandler.c | 26 +- dlls/oleaut32/.cvsignore | 3 +- dlls/oleaut32/Makefile.in | 8 +- dlls/olecli/.cvsignore | 3 +- dlls/olecli/Makefile.in | 10 +- dlls/oledlg/.cvsignore | 3 +- dlls/oledlg/Makefile.in | 7 +- dlls/olesvr/.cvsignore | 3 +- dlls/olesvr/Makefile.in | 9 +- dlls/psapi/.cvsignore | 3 +- dlls/psapi/Makefile.in | 7 +- dlls/rasapi32/.cvsignore | 3 +- dlls/rasapi32/Makefile.in | 7 +- dlls/setupx/.cvsignore | 3 +- dlls/setupx/Makefile.in | 7 +- dlls/shell32/.cvsignore | 3 +- dlls/shell32/Makefile.in | 8 +- dlls/sound/.cvsignore | 3 +- dlls/sound/Makefile.in | 7 +- dlls/stress/.cvsignore | 3 +- dlls/stress/Makefile.in | 7 +- dlls/tapi32/.cvsignore | 3 +- dlls/tapi32/Makefile.in | 7 +- dlls/version/.cvsignore | 3 +- dlls/version/Makefile.in | 8 +- dlls/win32s/.cvsignore | 3 +- dlls/win32s/Makefile.in | 7 +- dlls/win87em/.cvsignore | 3 +- dlls/win87em/Makefile.in | 7 +- dlls/windebug/.cvsignore | 3 +- dlls/windebug/Makefile.in | 7 +- dlls/wing/.cvsignore | 3 +- dlls/wing/Makefile.in | 7 +- dlls/winmm/mcianim/.cvsignore | 3 +- dlls/winmm/mcianim/Makefile.in | 8 +- dlls/winmm/mciavi/.cvsignore | 3 +- dlls/winmm/mciavi/Makefile.in | 8 +- dlls/winmm/mcicda/.cvsignore | 3 +- dlls/winmm/mcicda/Makefile.in | 8 +- dlls/winmm/mciseq/.cvsignore | 3 +- dlls/winmm/mciseq/Makefile.in | 8 +- dlls/winmm/mciwave/.cvsignore | 3 +- dlls/winmm/mciwave/Makefile.in | 8 +- dlls/winmm/midimap/.cvsignore | 3 +- dlls/winmm/midimap/Makefile.in | 8 +- dlls/winmm/wavemap/.cvsignore | 3 +- dlls/winmm/wavemap/Makefile.in | 8 +- dlls/winmm/wineoss/.cvsignore | 3 +- dlls/winmm/wineoss/Makefile.in | 8 +- dlls/winsock/.cvsignore | 3 +- dlls/winsock/Makefile.in | 9 +- dlls/winspool/.cvsignore | 3 +- dlls/winspool/Makefile.in | 7 +- dlls/wnaspi32/.cvsignore | 3 +- dlls/wnaspi32/Makefile.in | 7 +- include/Makefile.in | 16 +- library/checklink.c | 4 + loader/loadorder.c | 2 +- programs/avitools/Makefile.in | 8 +- programs/clock/Makefile.in | 6 +- programs/cmdlgtst/Makefile.in | 6 +- programs/control/Makefile.in | 6 +- programs/notepad/Makefile.in | 6 +- programs/osversioncheck/Makefile.in | 6 +- programs/progman/Makefile.in | 4 +- programs/regapi/Makefile.in | 8 +- programs/regtest/Makefile.in | 6 +- programs/view/Makefile.in | 6 +- programs/wcmd/Makefile.in | 6 +- programs/winhelp/Makefile.in | 4 +- programs/winver/Makefile.in | 6 +- win32/device.c | 4 +- wine.ini | 2 +- 111 files changed, 1125 insertions(+), 772 deletions(-) create mode 100644 library/checklink.c diff --git a/Make.rules.in b/Make.rules.in index af7113d87cf..9a9dad28159 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -25,7 +25,8 @@ OPTIONS = @OPTIONS@ -D_REENTRANT X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ -WINELIB = $(WINESTUB) -L$(TOPOBJDIR) -lwine +DLL_LINK = @DLL_LINK@ +WINELIB = $(WINESTUB) $(DLL_LINK) LIBS = @LIBS@ YACC = @YACC@ LEX = @LEX@ @@ -75,11 +76,58 @@ prog_manext = 1 conf_manext = 5 includedir = @includedir@/wine -OBJS = $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) \ - $(SPEC_SRCS:.spec=.spec.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) +OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \ + $(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) LINTS = $(C_SRCS:.c=.ln) +# DLL list + +DLLS = \ + avifil32 \ + comctl32 \ + comdlg32 \ + dciman32 \ + dplayx \ + dsound \ + icmp \ + imagehlp \ + imm32 \ + lz32 \ + mcianim.drv \ + mciavi.drv \ + mcicda.drv \ + mciseq.drv \ + mciwave.drv \ + midimap.drv \ + msacm \ + msacm.drv \ + msacm32 \ + msnet32 \ + msvfw32 \ + odbc32 \ + ole32 \ + oleaut32 \ + olecli32 \ + oledlg \ + olesvr32 \ + psapi \ + rasapi32 \ + setupx \ + shell32 \ + sound \ + stress \ + tapi32 \ + version \ + win32s \ + win87em \ + windebug \ + wineoss.drv \ + wing \ + winspool \ + wnaspi32 \ + wsock32 + # Implicit rules .SUFFIXES: @@ -121,6 +169,8 @@ LINTS = $(C_SRCS:.c=.ln) .c.ln: $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) +.PHONY: all install uninstall clean distclean depend dummy + # Rule to rebuild the resource compiler $(WRC) check_wrc: @@ -166,6 +216,36 @@ Makefile: Makefile.in $(TOPSRCDIR)/configure all: Makefile +# Rules for checking that no imports are missing + +IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT)) + +checklink_so checklink_a: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS) + $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(DLLDIR) $(IMPORTS:%=-l%) -L$(TOPOBJDIR) -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink + +checklink:: $(LIBEXT:%=checklink_%) + +$(IMPORTLIBS): dummy + @cd $(DLLDIR) && $(MAKE) `basename $@` + +# Rules for installation + +install_so: lib$(MODULE).so.$(SOVERSION) + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_PROGRAM) lib$(MODULE).so.$(SOVERSION) $(libdir)/lib$(MODULE).so.$(SOVERSION) + cd $(libdir) && $(RM) lib$(MODULE).so && $(LN_S) lib$(MODULE).so.$(SOVERSION) lib$(MODULE).so + +install_a: lib$(MODULE).a + [ -d $(libdir) ] || $(MKDIR) $(libdir) + $(INSTALL_DATA) lib$(MODULE).a $(libdir)/lib$(MODULE).a + +uninstall_so uninstall_a: + cd $(libdir) && $(RM) lib$(MODULE).so lib$(MODULE).so.$(SOVERSION) lib$(MODULE).a + +install:: $(LIBEXT:%=install_%) + +uninstall:: $(LIBEXT:%=uninstall_%) + # Rules for auto documentation man: $(C_SRCS) diff --git a/Makefile.in b/Makefile.in index f5ebbd1654c..f27dff298a0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,6 @@ # This Makefile understands the following targets: # # all (default): build wine -# lib: build libwine # clean: remove all intermediate files # distclean: also remove all files created by configure # install: install everything @@ -11,19 +10,13 @@ # manpages: compile manpages for Wine API # -# Main target to build - -MAIN_TARGET = @MAIN_TARGET@ -LIB_TARGET = @LIB_TARGET@ -LIB_TYPE = @LIB_TYPE@ -ALT_LINK = @ALT_LINK@ - # Directories TOPSRCDIR = @top_srcdir@ TOPOBJDIR = . SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = wine SOVERSION = 1.0 @@ -36,56 +29,13 @@ LIBSUBDIRS = \ console \ debugger \ dlls/advapi32 \ - dlls/avifil32 \ - dlls/comctl32 \ - dlls/commdlg \ dlls/crtdll \ - dlls/dciman32 \ dlls/display \ - dlls/dplayx \ - dlls/dsound \ - dlls/icmp \ - dlls/imagehlp \ - dlls/imm32 \ - dlls/lzexpand \ dlls/mouse \ dlls/mpr \ - dlls/msacm \ - dlls/msacm32 \ - dlls/msnet32 \ - dlls/msvideo \ dlls/ntdll \ - dlls/odbc32 \ - dlls/ole32 \ - dlls/oleaut32 \ - dlls/olecli \ - dlls/oledlg \ - dlls/olesvr \ - dlls/psapi \ - dlls/rasapi32 \ - dlls/setupx \ - dlls/shell32 \ - dlls/sound \ - dlls/stress \ - dlls/tapi32 \ - dlls/version \ - dlls/win32s \ - dlls/win87em \ dlls/winaspi \ - dlls/windebug \ - dlls/wing \ dlls/winmm \ - dlls/winmm/mcianim \ - dlls/winmm/mciavi \ - dlls/winmm/mcicda \ - dlls/winmm/mciseq \ - dlls/winmm/mciwave \ - dlls/winmm/midimap \ - dlls/winmm/wavemap \ - dlls/winmm/wineoss \ - dlls/winsock \ - dlls/winspool \ - dlls/wnaspi32 \ files \ graphics \ graphics/enhmetafiledrv \ @@ -135,18 +85,19 @@ BUILDSUBDIRS = \ $(TOOLSUBDIRS) \ $(LIBSUBDIRS) \ $(X11SUBDIRS) \ + $(DLLDIR) \ $(EMUSUBDIRS) \ $(PROGSUBDIRS) \ $(DOCSUBDIRS) # Sub-directories to run make depend into -DEPENDSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(EMUSUBDIRS) $(DOCSUBDIRS) +DEPENDSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS) # Sub-directories to run make install into -INSTALLSUBDIRS = $(DOCSUBDIRS) $(INCSUBDIRS) +INSTALLSUBDIRS = $(DLLDIR) $(DOCSUBDIRS) $(INCSUBDIRS) # Sub-directories to run make lint into -LINTSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(EMUSUBDIRS) $(DOCSUBDIRS) +LINTSUBDIRS = $(LIBSUBDIRS) $(X11SUBDIRS) $(DLLDIR) $(EMUSUBDIRS) $(DOCSUBDIRS) # Extra sub-directories to clean CLEANSUBDIRS = dlls include include/bitmaps include/wine @@ -156,56 +107,13 @@ LIBOBJS = \ console/console.o \ debugger/debugger.o \ dlls/advapi32/advapi32.o \ - dlls/avifil32/avifil32.o \ - dlls/comctl32/comctl32.o \ - dlls/commdlg/commdlg.o \ dlls/crtdll/crtdll.o \ - dlls/dciman32/dciman32.o \ dlls/display/display.o \ - dlls/dplayx/dplayx.o \ - dlls/dsound/dsound.o \ - dlls/icmp/icmp.o \ - dlls/imagehlp/imagehlp.o \ - dlls/imm32/imm32.o \ - dlls/lzexpand/lzexpand.o \ dlls/mouse/mouse.o \ dlls/mpr/mpr.o \ - dlls/msacm/msacm.o \ - dlls/msacm32/msacm32.o \ - dlls/msnet32/msnet32.o \ - dlls/msvideo/msvideo.o \ dlls/ntdll/ntdll.o \ - dlls/odbc32/odbc32.o \ - dlls/ole32/ole32.o \ - dlls/oleaut32/oleaut32.o \ - dlls/olecli/olecli.o \ - dlls/oledlg/oledlg.o \ - dlls/olesvr/olesvr.o \ - dlls/psapi/psapi.o \ - dlls/rasapi32/rasapi32.o \ - dlls/setupx/setupx.o \ - dlls/shell32/shell32.o \ - dlls/sound/sound.o \ - dlls/stress/stress.o \ - dlls/tapi32/tapi32.o \ - dlls/version/version.o \ - dlls/win32s/win32s.o \ - dlls/win87em/win87em.o \ dlls/winaspi/winaspi.o \ - dlls/windebug/windebug.o \ - dlls/wing/wing.o \ dlls/winmm/winmm.o \ - dlls/winmm/mcianim/mcianim.drv.o \ - dlls/winmm/mciavi/mciavi.drv.o \ - dlls/winmm/mcicda/mcicda.drv.o \ - dlls/winmm/mciseq/mciseq.drv.o \ - dlls/winmm/mciwave/mciwave.drv.o \ - dlls/winmm/midimap/midimap.drv.o \ - dlls/winmm/wavemap/msacm.drv.o \ - dlls/winmm/wineoss/wineoss.drv.o \ - dlls/winsock/winsock.o \ - dlls/winspool/winspool.o \ - dlls/wnaspi32/wnaspi32.o \ files/files.o \ graphics/graphics.o \ graphics/enhmetafiledrv/enhmetafiledrv.o \ @@ -237,9 +145,13 @@ X11OBJS = \ EMUOBJS = \ miscemu/miscemu.o +DLLOBJS = $(DLLS:%=dlls/lib%.@LIBEXT@) + EXTRA_OBJS = $(LIBOBJS) $(X11OBJS) -all: Makefile Make.rules $(PROGRAMS) $(MAIN_TARGET) +EMU_TARGET = @EMU_TARGET@ + +all: Make.rules $(PROGRAMS) $(EMU_TARGET) @echo "Wine build complete." LIBLINTS = $(LIBOBJS:.o=.ln) @@ -253,48 +165,36 @@ WINAPI_CHECK_EXTRA_FLAGS = --global @MAKE_RULES@ +all: lib$(MODULE).$(LIBEXT) $(DLLOBJS) + Make.rules: Make.rules.in configure @echo $? is newer than 'Make.rules', please rerun ./configure! @exit 1 -install:: install_$(MAIN_TARGET) - -emu: wine - -lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) - -wine wine.sym: $(LIB_TARGET) $(EMUOBJS) $(X11OBJS) $(LIBOBJS) - $(CC) -o wine $(EMUOBJS) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) +wine wine.sym: lib$(MODULE).$(LIBEXT) $(DLLOBJS) $(EMUOBJS) + $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) nm -n wine | grep -v _compiled >wine.sym llib-lwine.ln : $(LIBLINTS) $(X11LINTS) $(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) $(X11LINTS) -install_emu: install_lib +install_wine: wine + [ -d $(bindir) ] || $(MKDIR) $(bindir) + [ -d $(libdir) ] || $(MKDIR) $(libdir) + [ -f wine.sym ] && $(INSTALL_DATA) wine.sym $(libdir)/wine.sym $(INSTALL_PROGRAM) wine $(bindir)/wine -install_lib: install_$(LIB_TYPE) - -install_nolib: dummy - [ -d $(libdir) ] || $(MKDIR) $(libdir) - if [ -f wine.sym ]; then $(INSTALL_DATA) wine.sym $(libdir)/wine.sym; fi +install:: $(PROGRAMS) $(EMU_TARGET:%=install_%) [ -d $(bindir) ] || $(MKDIR) $(bindir) $(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver $(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv $(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod -install_dll: install_nolib - $(INSTALL_PROGRAM) $(LIB_TARGET) $(libdir) - $(LDCONFIG) || (cd $(libdir) ; $(RM) libwine.so ; $(LN_S) $(LIB_TARGET) libwine.so) - -install_static: install_nolib - $(INSTALL_DATA) $(LIB_TARGET) $(libdir) - uninstall:: - cd $(libdir) && $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym + cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym cd $(bindir) && $(RM) wine wineserver wineclipsrv dosmod -$(X11OBJS) $(EMUOBJS) $(LIBOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy +$(X11OBJS) $(EMUOBJS) $(LIBOBJS) $(DLLOBJS) $(PROGRAMS): $(TOOLSUBDIRS) dummy @cd `dirname $@` && $(MAKE) `basename $@` $(BUILDSUBDIRS): dummy @@ -311,13 +211,17 @@ uninstall_programs: dummy install:: for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) install) || exit 1; done + -$(LDCONFIG) uninstall:: for i in $(INSTALLSUBDIRS); do (cd $$i && $(MAKE) uninstall) || exit 1; done -depend:: dummy +depend:: for i in $(DEPENDSUBDIRS); do (cd $$i && $(MAKE) depend) || exit 1; done +checklink:: + @cd dlls && $(MAKE) checklink + TAGS etags: etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain` diff --git a/configure b/configure index c0dd6fb3c0d..ed253ef24b6 100755 --- a/configure +++ b/configure @@ -16,8 +16,6 @@ ac_help="$ac_help --disable-emulator build only the Wine library, not the emulator" ac_help="$ac_help --disable-dll build static libraries instead of DLLs" -ac_help="$ac_help - --disable-lib build the Wine without building libwine.a" ac_help="$ac_help --disable-debug compile out all debugging messages" ac_help="$ac_help @@ -562,29 +560,22 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. test -z "$PROGEXT" && PROGEXT="" -MAIN_TARGET=emu -LIB_TYPE=dll # one of static, dll, nolib +EMU_TARGET=wine +LIBEXT=so # library type .so or .a TRACE_MSGS=yes # the TRACE() macro DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros. # Check whether --enable-emulator or --disable-emulator was given. if test "${enable_emulator+set}" = set; then enableval="$enable_emulator" - if test "$enableval" = "no"; then MAIN_TARGET="lib"; fi + if test "$enableval" = "no"; then EMU_TARGET=""; fi fi # Check whether --enable-dll or --disable-dll was given. if test "${enable_dll+set}" = set; then enableval="$enable_dll" - if test "$enableval" = "no"; then LIB_TYPE="static"; fi -fi - - -# Check whether --enable-lib or --disable-lib was given. -if test "${enable_lib+set}" = set; then - enableval="$enable_lib" - if test "$enableval" = "no"; then LIB_TYPE="nolib"; fi + if test "$enableval" = "no"; then LIBEXT="a"; fi fi @@ -634,7 +625,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:638: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:629: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -663,7 +654,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:667: checking for $ac_word" >&5 +echo "configure:658: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -693,7 +684,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:697: checking for $ac_word" >&5 +echo "configure:688: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -744,7 +735,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:748: checking for $ac_word" >&5 +echo "configure:739: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -776,7 +767,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:780: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -787,12 +778,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 791 "configure" +#line 782 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -818,12 +809,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:822: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:827: checking whether we are using GNU C" >&5 +echo "configure:818: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -832,7 +823,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -851,7 +842,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:855: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:846: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -883,7 +874,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:887: checking how to run the C preprocessor" >&5 +echo "configure:878: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -898,13 +889,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -915,13 +906,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -932,13 +923,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:942: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -967,7 +958,7 @@ echo "$ac_t""$CPP" 1>&6 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:971: checking for X" >&5 +echo "configure:962: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1029,12 +1020,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1103,14 +1094,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1216,17 +1207,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1220: checking whether -R must be followed by a space" >&5 +echo "configure:1211: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1242,14 +1233,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1281,7 +1272,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1285: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1276: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1289,7 +1280,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1322,7 +1313,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:1326: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1317: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1330,7 +1321,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1370,12 +1361,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1374: checking for gethostbyname" >&5 +echo "configure:1365: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1419,7 +1410,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1423: checking for gethostbyname in -lnsl" >&5 +echo "configure:1414: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1427,7 +1418,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1468,12 +1459,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1472: checking for connect" >&5 +echo "configure:1463: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1517,7 +1508,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1521: checking for connect in -lsocket" >&5 +echo "configure:1512: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1525,7 +1516,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1560,12 +1551,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1564: checking for remove" >&5 +echo "configure:1555: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1609,7 +1600,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1613: checking for remove in -lposix" >&5 +echo "configure:1604: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1617,7 +1608,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1652,12 +1643,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1656: checking for shmat" >&5 +echo "configure:1647: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -1701,7 +1692,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:1705: checking for shmat in -lipc" >&5 +echo "configure:1696: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1709,7 +1700,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1753,7 +1744,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:1757: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:1748: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1761,7 +1752,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1801,7 +1792,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1805: checking for $ac_word" >&5 +echo "configure:1796: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1834,7 +1825,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1838: checking for $ac_word" >&5 +echo "configure:1829: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1868,7 +1859,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:1872: checking for yywrap in -l$ac_lib" >&5 +echo "configure:1863: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1867,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1912,7 +1903,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1916: checking for $ac_word" >&5 +echo "configure:1907: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1951,7 +1942,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1955: checking for a BSD compatible install" >&5 +echo "configure:1946: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2004,7 +1995,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2008: checking whether ln -s works" >&5 +echo "configure:1999: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2027,7 +2018,7 @@ fi # Extract the first word of "c2man", so it can be a program name with args. set dummy c2man; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2031: checking for $ac_word" >&5 +echo "configure:2022: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_C2MAN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2057,7 +2048,7 @@ fi # Extract the first word of "ldconfig", so it can be a program name with args. set dummy ldconfig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2061: checking for $ac_word" >&5 +echo "configure:2052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2079,7 +2070,7 @@ else fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG="false" + test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG="true" ;; esac fi @@ -2096,7 +2087,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2100: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2134,7 +2125,7 @@ then echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:2138: checking for sqrt in -lm" >&5 +echo "configure:2129: checking for sqrt in -lm" >&5 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2142,7 +2133,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2181,7 +2172,7 @@ else fi echo $ac_n "checking for i386_set_ldt in -li386""... $ac_c" 1>&6 -echo "configure:2185: checking for i386_set_ldt in -li386" >&5 +echo "configure:2176: checking for i386_set_ldt in -li386" >&5 ac_lib_var=`echo i386'_'i386_set_ldt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2189,7 +2180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-li386 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2228,7 +2219,7 @@ else fi echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 -echo "configure:2232: checking for _oss_ioctl in -lossaudio" >&5 +echo "configure:2223: checking for _oss_ioctl in -lossaudio" >&5 ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2236,7 +2227,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lossaudio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2275,7 +2266,7 @@ else fi echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6 -echo "configure:2279: checking for iswalnum in -lw" >&5 +echo "configure:2270: checking for iswalnum in -lw" >&5 ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2283,7 +2274,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2324,12 +2315,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2328: checking for $ac_func" >&5 +echo "configure:2319: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2374,7 +2365,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2378: checking for gethostbyname in -lnsl" >&5 +echo "configure:2369: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2382,7 +2373,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl -lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2412,7 +2403,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lsocket""... $ac_c" 1>&6 -echo "configure:2416: checking for gethostbyname in -lsocket" >&5 +echo "configure:2407: checking for gethostbyname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2420,7 +2411,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket -lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2459,12 +2450,12 @@ done for ac_func in connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2463: checking for $ac_func" >&5 +echo "configure:2454: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2509,7 +2500,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2513: checking for connect in -lsocket" >&5 +echo "configure:2504: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2517,7 +2508,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2559,7 +2550,7 @@ fi done echo $ac_n "checking for setrunelocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:2563: checking for setrunelocale in -lxpg4" >&5 +echo "configure:2554: checking for setrunelocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setrunelocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2567,7 +2558,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2606,7 +2597,7 @@ else fi echo $ac_n "checking for mmap in -lmmap""... $ac_c" 1>&6 -echo "configure:2610: checking for mmap in -lmmap" >&5 +echo "configure:2601: checking for mmap in -lmmap" >&5 ac_lib_var=`echo mmap'_'mmap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2614,7 +2605,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmmap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2655,12 +2646,12 @@ fi for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2659: checking for $ac_func" >&5 +echo "configure:2650: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2705,7 +2696,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:2709: checking for openpty in -lutil" >&5 +echo "configure:2700: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2713,7 +2704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2757,17 +2748,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2761: checking for $ac_hdr" >&5 +echo "configure:2752: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2790,12 +2781,12 @@ EOF for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2794: checking for $ac_func" >&5 +echo "configure:2785: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2843,7 +2834,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2847: checking for dlopen in -ldl" >&5 +echo "configure:2838: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2851,7 +2842,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2908,17 +2899,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2912: checking for $ac_hdr" >&5 +echo "configure:2903: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2947,7 +2938,7 @@ done if test "$ac_cv_header_X11_xpm_h" = "yes" then echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:2951: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:2942: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2955,7 +2946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3008,17 +2999,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3012: checking for $ac_hdr" >&5 +echo "configure:3003: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3047,7 +3038,7 @@ done if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_XShm_h" = "yes" then echo $ac_n "checking for XShmQueryExtension in -lXext""... $ac_c" 1>&6 -echo "configure:3051: checking for XShmQueryExtension in -lXext" >&5 +echo "configure:3042: checking for XShmQueryExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3055,7 +3046,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3094,17 +3085,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3098: checking for $ac_hdr" >&5 +echo "configure:3089: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3133,7 +3124,7 @@ done if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes" then echo $ac_n "checking for XDGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:3137: checking for XDGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3128: checking for XDGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XDGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3141,7 +3132,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3181,7 +3172,7 @@ fi if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no" then echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:3185: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3176: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3189,7 +3180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3230,17 +3221,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3234: checking for $ac_hdr" >&5 +echo "configure:3225: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3269,7 +3260,7 @@ done if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" then echo $ac_n "checking for XF86VidModeQueryExtension in -lXxf86vm""... $ac_c" 1>&6 -echo "configure:3273: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo "configure:3264: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 ac_lib_var=`echo Xxf86vm'_'XF86VidModeQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3277,7 +3268,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3317,17 +3308,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3321: checking for $ac_hdr" >&5 +echo "configure:3312: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3356,19 +3347,19 @@ done if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" then echo $ac_n "checking "for up-to-date Mesa version"""... $ac_c" 1>&6 -echo "configure:3360: checking "for up-to-date Mesa version"" >&5 +echo "configure:3351: checking "for up-to-date Mesa version"" >&5 if eval "test \"`echo '$''{'wine_cv_mesa_version_OK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { GLenum test = GL_UNSIGNED_SHORT_5_6_5; ; return 0; } EOF -if { (eval echo configure:3372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_mesa_version_OK="yes" else @@ -3387,7 +3378,7 @@ echo "$ac_t""$wine_cv_mesa_version_OK" 1>&6 if test "$wine_cv_mesa_version_OK" = "yes" then echo $ac_n "checking for glXCreateContext in -lGL""... $ac_c" 1>&6 -echo "configure:3391: checking for glXCreateContext in -lGL" >&5 +echo "configure:3382: checking for glXCreateContext in -lGL" >&5 ac_lib_var=`echo GL'_'glXCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3395,7 +3386,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3432,7 +3423,7 @@ fi if test "$ac_cv_lib_GL_glXCreateContext" = "no" then echo $ac_n "checking for glXCreateContext in -lMesaGL""... $ac_c" 1>&6 -echo "configure:3436: checking for glXCreateContext in -lMesaGL" >&5 +echo "configure:3427: checking for glXCreateContext in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glXCreateContext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3440,7 +3431,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3477,19 +3468,19 @@ fi fi echo $ac_n "checking "for the OpenGL Color Index extension"""... $ac_c" 1>&6 -echo "configure:3481: checking "for the OpenGL Color Index extension"" >&5 +echo "configure:3472: checking "for the OpenGL Color Index extension"" >&5 if eval "test \"`echo '$''{'dummy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { GLenum test = GL_COLOR_INDEX8_EXT; ; return 0; } EOF -if { (eval echo configure:3493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_GL_COLOR_TABLE 1 @@ -3507,7 +3498,7 @@ echo "$ac_t""$dummy" 1>&6 if test "$ac_cv_lib_GL_glXCreateContext" = "no" then echo $ac_n "checking for glColorTableEXT in -lMesaGL""... $ac_c" 1>&6 -echo "configure:3511: checking for glColorTableEXT in -lMesaGL" >&5 +echo "configure:3502: checking for glColorTableEXT in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glColorTableEXT | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3515,7 +3506,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3551,7 +3542,7 @@ fi else echo $ac_n "checking for glColorTableEXT in -lGL""... $ac_c" 1>&6 -echo "configure:3555: checking for glColorTableEXT in -lGL" >&5 +echo "configure:3546: checking for glColorTableEXT in -lGL" >&5 ac_lib_var=`echo GL'_'glColorTableEXT | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3559,7 +3550,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3608,17 +3599,17 @@ for ac_hdr in ncurses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3612: checking for $ac_hdr" >&5 +echo "configure:3603: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3647,7 +3638,7 @@ done if test "$ac_cv_header_ncurses_h" = "yes" then echo $ac_n "checking for waddch in -lncurses""... $ac_c" 1>&6 -echo "configure:3651: checking for waddch in -lncurses" >&5 +echo "configure:3642: checking for waddch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3655,7 +3646,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3697,7 +3688,7 @@ fi if test "$ac_cv_lib_ncurses_waddch" = "yes" then echo $ac_n "checking for resizeterm in -lncurses""... $ac_c" 1>&6 -echo "configure:3701: checking for resizeterm in -lncurses" >&5 +echo "configure:3692: checking for resizeterm in -lncurses" >&5 ac_lib_var=`echo ncurses'_'resizeterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3705,7 +3696,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3740,7 +3731,7 @@ else fi echo $ac_n "checking for getbkgd in -lncurses""... $ac_c" 1>&6 -echo "configure:3744: checking for getbkgd in -lncurses" >&5 +echo "configure:3735: checking for getbkgd in -lncurses" >&5 ac_lib_var=`echo ncurses'_'getbkgd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3748,7 +3739,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3787,17 +3778,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3791: checking for $ac_hdr" >&5 +echo "configure:3782: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3826,7 +3817,7 @@ done if test "$ac_cv_header_curses_h" = "yes" then echo $ac_n "checking for waddch in -lcurses""... $ac_c" 1>&6 -echo "configure:3830: checking for waddch in -lcurses" >&5 +echo "configure:3821: checking for waddch in -lcurses" >&5 ac_lib_var=`echo curses'_'waddch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3834,7 +3825,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3873,7 +3864,7 @@ else fi echo $ac_n "checking for resizeterm in -lcurses""... $ac_c" 1>&6 -echo "configure:3877: checking for resizeterm in -lcurses" >&5 +echo "configure:3868: checking for resizeterm in -lcurses" >&5 ac_lib_var=`echo curses'_'resizeterm | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3881,7 +3872,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3916,7 +3907,7 @@ else fi echo $ac_n "checking for getbkgd in -lcurses""... $ac_c" 1>&6 -echo "configure:3920: checking for getbkgd in -lcurses" >&5 +echo "configure:3911: checking for getbkgd in -lcurses" >&5 ac_lib_var=`echo curses'_'getbkgd | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3924,7 +3915,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3962,12 +3953,12 @@ fi fi echo $ac_n "checking "for GNU style IPX support"""... $ac_c" 1>&6 -echo "configure:3966: checking "for GNU style IPX support"" >&5 +echo "configure:3957: checking "for GNU style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3975,7 +3966,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:3979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_gnu="yes" else @@ -4000,12 +3991,12 @@ fi if test "$ac_cv_c_ipx_gnu" = "no" then echo $ac_n "checking "for linux style IPX support"""... $ac_c" 1>&6 -echo "configure:4004: checking "for linux style IPX support"" >&5 +echo "configure:3995: checking "for linux style IPX support"" >&5 if eval "test \"`echo '$''{'ac_cv_c_ipx_linux'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4014,7 +4005,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_linux="yes" else @@ -4041,17 +4032,17 @@ for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4045: checking for $ac_hdr" >&5 +echo "configure:4036: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4079,12 +4070,12 @@ done echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 -echo "configure:4083: checking "for Open Sound System"" >&5 +echo "configure:4074: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" else @@ -4128,12 +4119,12 @@ EOF fi echo $ac_n "checking "for Open Sound System/MIDI interface"""... $ac_c" 1>&6 -echo "configure:4132: checking "for Open Sound System/MIDI interface"" >&5 +echo "configure:4123: checking "for Open Sound System/MIDI interface"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem_midi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem_midi="yes" else @@ -4183,7 +4174,7 @@ if test "x${GCC}" = "xyes" then CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:4187: checking "for gcc strength-reduce bug"" >&5 +echo "configure:4178: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4191,7 +4182,7 @@ else ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@ -4225,7 +4216,7 @@ fi echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 -echo "configure:4229: checking "whether external symbols need an underscore prefix"" >&5 +echo "configure:4220: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4237,14 +4228,14 @@ _ac_test: .long 0 EOF cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_extern_prefix="yes" else @@ -4268,7 +4259,7 @@ fi echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 -echo "configure:4272: checking "whether assembler accepts .string"" >&5 +echo "configure:4263: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4278,14 +4269,14 @@ cat > conftest_asm.s < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_asm_string="yes" else @@ -4309,24 +4300,24 @@ fi LDSHARED="" -if test "$LIB_TYPE" = "dll" +if test "$LIBEXT" = "so" then echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6 -echo "configure:4316: checking "whether we can build a Linux dll"" >&5 +echo "configure:4307: checking "whether we can build a Linux dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_linux="yes" else @@ -4346,21 +4337,21 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6 LDSHARED="\$(CC) -shared -Wl,-soname,\$(SONAME),-rpath,\$(libdir)" else echo $ac_n "checking whether we can build a UnixWare (Solaris) dll""... $ac_c" 1>&6 -echo "configure:4350: checking whether we can build a UnixWare (Solaris) dll" >&5 +echo "configure:4341: checking whether we can build a UnixWare (Solaris) dll" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_unixware'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -Wl,-G,-h,conftest.so.1.0" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_unixware="yes" else @@ -4380,21 +4371,21 @@ echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6 LDSHARED="\$(CC) -Wl,-G,-h,\$(libdir)/\$(SONAME)" else echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6 -echo "configure:4384: checking "whether we can build a NetBSD dll"" >&5 +echo "configure:4375: checking "whether we can build a NetBSD dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_dll_netbsd="yes" else @@ -4417,43 +4408,34 @@ echo "$ac_t""$ac_cv_c_dll_netbsd" 1>&6 fi if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_unixware" = "no" -a "$ac_cv_c_dll_netbsd" = "no" then - LIB_TYPE="static" + LIBEXT="a" fi fi DLLFLAGS="" BUILDFLAGS="" -LIBEXT="a" +DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine" -if test "$LIB_TYPE" = "nolib"; then - ALT_LINK="\$(LIBOBJS) \$(X11OBJS)" - LIB_TARGET="" +if test "$LIBEXT" = "so"; then + BUILDFLAGS="-pic" + DLLFLAGS="-fPIC" else - ALT_LINK="-L\$(TOPOBJDIR) -lwine" - - if test "$LIB_TYPE" = "dll"; then - LIB_TARGET="libwine.so" - BUILDFLAGS="-pic" - DLLFLAGS="-fPIC" - LIBEXT="so" - else - LIB_TARGET="libwine.a" - echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 -echo "configure:4443: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 + echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 +echo "configure:4425: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,--whole-archive -Wl,--no-whole-archive" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_whole_archive="yes" else @@ -4468,26 +4450,26 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_c_whole_archive" 1>&6 - if test "$ac_cv_c_whole_archive" = "yes" - then - ALT_LINK="-Wl,--whole-archive -L\$(TOPOBJDIR) -lwine -Wl,--no-whole-archive" - else - echo $ac_n "checking whether the linker supports -z {all,default}extract (Linux)""... $ac_c" 1>&6 -echo "configure:4477: checking whether the linker supports -z {all,default}extract (Linux)" >&5 + if test "$ac_cv_c_whole_archive" = "yes" + then + DLL_LINK="-Wl,--whole-archive $DLL_LINK -Wl,--no-whole-archive" + else + echo $ac_n "checking whether the linker supports -z {all,default}extract (Linux)""... $ac_c" 1>&6 +echo "configure:4459: checking whether the linker supports -z {all,default}extract (Linux)" >&5 if eval "test \"`echo '$''{'ac_cv_c_allextract'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_cflags=$CFLAGS CFLAGS="$CFLAGS -Wl,-z,allextract -Wl,-z,defaultextract" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_allextract="yes" else @@ -4502,10 +4484,9 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_c_allextract" 1>&6 - if test "$ac_cv_c_allextract" = "yes" - then - ALT_LINK="-Wl,-z,allextract -L\$(TOPOBJDIR) -lwine -Wl,-z,defaultextract" - fi + if test "$ac_cv_c_allextract" = "yes" + then + DLL_LINK="-Wl,-z,allextract $DLL_LINK -Wl,-z,defaultextract" fi fi fi @@ -4517,11 +4498,9 @@ fi - - wine_cv_libc_reentrant=no echo $ac_n "checking "for reentrant libc: __errno_location"""... $ac_c" 1>&6 -echo "configure:4525: checking "for reentrant libc: __errno_location"" >&5 +echo "configure:4504: checking "for reentrant libc: __errno_location"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__errno_location'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4529,14 +4508,14 @@ else wine_cv_libc_r__errno_location=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__errno_location=yes else @@ -4561,7 +4540,7 @@ EOF wine_cv_libc_reentrant=__errno_location fi echo $ac_n "checking "for reentrant libc: __error"""... $ac_c" 1>&6 -echo "configure:4565: checking "for reentrant libc: __error"" >&5 +echo "configure:4544: checking "for reentrant libc: __error"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__error'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4569,14 +4548,14 @@ else wine_cv_libc_r__error=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__error=yes else @@ -4601,7 +4580,7 @@ EOF wine_cv_libc_reentrant=__error fi echo $ac_n "checking "for reentrant libc: ___errno"""... $ac_c" 1>&6 -echo "configure:4605: checking "for reentrant libc: ___errno"" >&5 +echo "configure:4584: checking "for reentrant libc: ___errno"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r___errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4609,14 +4588,14 @@ else wine_cv_libc_r___errno=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r___errno=yes else @@ -4641,7 +4620,7 @@ EOF wine_cv_libc_reentrant=___errno fi echo $ac_n "checking "for reentrant libc: __thr_errno"""... $ac_c" 1>&6 -echo "configure:4645: checking "for reentrant libc: __thr_errno"" >&5 +echo "configure:4624: checking "for reentrant libc: __thr_errno"" >&5 if eval "test \"`echo '$''{'wine_cv_libc_r__thr_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4649,14 +4628,14 @@ else wine_cv_libc_r__thr_errno=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wine_cv_libc_r__thr_errno=yes else @@ -4692,7 +4671,7 @@ fi if test "$have_x" = "yes" -a "$wine_cv_libc_reentrant" != "no" then echo $ac_n "checking "for reentrant X libraries"""... $ac_c" 1>&6 -echo "configure:4696: checking "for reentrant X libraries"" >&5 +echo "configure:4675: checking "for reentrant X libraries"" >&5 if eval "test \"`echo '$''{'wine_cv_x_reentrant'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4738,14 +4717,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4742: checking whether byte ordering is bigendian" >&5 +echo "configure:4721: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4756,11 +4735,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4771,7 +4750,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4791,7 +4770,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -4832,19 +4811,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4836: checking for working alloca.h" >&5 +echo "configure:4815: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4865,12 +4844,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4869: checking for alloca" >&5 +echo "configure:4848: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4930,12 +4909,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4934: checking whether alloca needs Cray hooks" >&5 +echo "configure:4913: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4964: checking for $ac_func" >&5 +echo "configure:4943: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5015,7 +4994,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5019: checking stack direction for C alloca" >&5 +echo "configure:4998: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5023,7 +5002,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5093,12 +5072,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5097: checking for $ac_func" >&5 +echo "configure:5076: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5200,17 +5179,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5204: checking for $ac_hdr" >&5 +echo "configure:5183: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5237,12 +5216,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:5241: checking whether stat file-mode macros are broken" >&5 +echo "configure:5220: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5295,12 +5274,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5299: checking for working const" >&5 +echo "configure:5278: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5370,21 +5349,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5374: checking for inline" >&5 +echo "configure:5353: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5410,12 +5389,12 @@ EOF esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5414: checking for ANSI C header files" >&5 +echo "configure:5393: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5423,7 +5402,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5440,7 +5419,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5458,7 +5437,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5479,7 +5458,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5490,7 +5469,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5514,12 +5493,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5518: checking for size_t" >&5 +echo "configure:5497: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5547,7 +5526,7 @@ EOF fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:5551: checking size of long long" >&5 +echo "configure:5530: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5555,7 +5534,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -5566,7 +5545,7 @@ main() exit(0); } EOF -if { (eval echo configure:5570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -5589,12 +5568,12 @@ EOF if test "$ac_cv_header_linux_joystick_h" = "yes" then echo $ac_n "checking "whether linux/joystick.h uses the Linux 2.2+ API"""... $ac_c" 1>&6 -echo "configure:5593: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:5572: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 if eval "test \"`echo '$''{'wine_cv_linux_joystick_22_api'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5609,7 +5588,7 @@ int main() { /*empty*/ ; return 0; } EOF -if { (eval echo configure:5613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -5636,12 +5615,12 @@ fi if test "$ac_cv_header_sys_vfs_h" = "yes" then echo $ac_n "checking "whether sys/vfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5640: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:5619: checking "whether sys/vfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_vfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5658,7 +5637,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -5685,12 +5664,12 @@ fi if test "$ac_cv_header_sys_statfs_h" = "yes" then echo $ac_n "checking "whether sys/statfs.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5689: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:5668: checking "whether sys/statfs.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_statfs_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5705,7 +5684,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -5732,12 +5711,12 @@ fi if test "$ac_cv_header_sys_mount_h" = "yes" then echo $ac_n "checking "whether sys/mount.h defines statfs"""... $ac_c" 1>&6 -echo "configure:5736: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:5715: checking "whether sys/mount.h defines statfs"" >&5 if eval "test \"`echo '$''{'wine_cv_sys_mount_has_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5752,7 +5731,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -5778,7 +5757,7 @@ fi echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:5782: checking "for statfs.f_bfree"" >&5 +echo "configure:5761: checking "for statfs.f_bfree"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bfree'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5787,7 +5766,7 @@ else wine_cv_statfs_bfree=no else cat > conftest.$ac_ext < @@ -5814,7 +5793,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -5838,7 +5817,7 @@ EOF fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:5842: checking "for statfs.f_bavail"" >&5 +echo "configure:5821: checking "for statfs.f_bavail"" >&5 if eval "test \"`echo '$''{'wine_cv_statfs_bavail'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5847,7 +5826,7 @@ else wine_cv_statfs_bavail=no else cat > conftest.$ac_ext < @@ -5874,7 +5853,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -5899,7 +5878,7 @@ fi echo $ac_n "checking "for working sigaltstack"""... $ac_c" 1>&6 -echo "configure:5903: checking "for working sigaltstack"" >&5 +echo "configure:5882: checking "for working sigaltstack"" >&5 if eval "test \"`echo '$''{'ac_cv_c_working_sigaltstack'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5908,7 +5887,7 @@ else else cat > conftest.$ac_ext < @@ -5946,7 +5925,7 @@ else } EOF -if { (eval echo configure:5950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_working_sigaltstack="yes" else @@ -5973,12 +5952,12 @@ fi echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:5977: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:5956: checking "for msg_accrights in struct msghdr"" >&5 if eval "test \"`echo '$''{'ac_cv_c_msg_accrights'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5986,7 +5965,7 @@ int main() { struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:5990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -6009,12 +5988,12 @@ fi echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:6013: checking "whether we need to define __i386__"" >&5 +echo "configure:5992: checking "whether we need to define __i386__"" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_def_i386'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include "winbase.h" -#include "oleauto.h" /* for SysFreeString(BSTR) */ #include "winerror.h" #include "ole2.h" #include "wine/obj_oleview.h" @@ -95,8 +94,8 @@ struct DefaultHandler /* * Name of the container and object contained */ - BSTR containerApp; - BSTR containerObj; + LPWSTR containerApp; + LPWSTR containerObj; }; @@ -500,13 +499,13 @@ static void DefaultHandler_Destroy( */ if (ptrToDestroy->containerApp!=NULL) { - SysFreeString(ptrToDestroy->containerApp); + HeapFree( GetProcessHeap(), 0, ptrToDestroy->containerApp ); ptrToDestroy->containerApp = NULL; } if (ptrToDestroy->containerObj!=NULL) { - SysFreeString(ptrToDestroy->containerObj); + HeapFree( GetProcessHeap(), 0, ptrToDestroy->containerObj ); ptrToDestroy->containerObj = NULL; } @@ -814,13 +813,13 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( */ if (this->containerApp!=NULL) { - SysFreeString(this->containerApp); + HeapFree( GetProcessHeap(), 0, this->containerApp ); this->containerApp = NULL; } if (this->containerObj!=NULL) { - SysFreeString(this->containerObj); + HeapFree( GetProcessHeap(), 0, this->containerObj ); this->containerObj = NULL; } @@ -828,11 +827,18 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( * Copy the string supplied. */ if (szContainerApp != NULL) - this->containerApp = SysAllocString(szContainerApp); + { + if ((this->containerApp = HeapAlloc( GetProcessHeap(), 0, + (lstrlenW(szContainerApp) + 1) * sizeof(WCHAR) ))) + lstrcpyW( this->containerApp, szContainerApp ); + } if (szContainerObj != NULL) - this->containerObj = SysAllocString(szContainerObj); - + { + if ((this->containerObj = HeapAlloc( GetProcessHeap(), 0, + (lstrlenW(szContainerObj) + 1) * sizeof(WCHAR) ))) + lstrcpyW( this->containerObj, szContainerObj ); + } return S_OK; } diff --git a/dlls/oleaut32/.cvsignore b/dlls/oleaut32/.cvsignore index 227d8393cc8..3bdf2c13559 100644 --- a/dlls/oleaut32/.cvsignore +++ b/dlls/oleaut32/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +liboleaut32.so.1.0 diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 3da313fe235..4b79ff72a3e 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = oleaut32 +SOVERSION = 1.0 +IMPORTS = ole32 comctl32 SPEC_SRCS = oleaut32.spec ole2disp.spec typelib.spec @@ -16,9 +19,12 @@ C_SRCS = \ typelib.c \ variant.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/olecli/.cvsignore b/dlls/olecli/.cvsignore index 227d8393cc8..47d4052375f 100644 --- a/dlls/olecli/.cvsignore +++ b/dlls/olecli/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libolecli32.so.1.0 diff --git a/dlls/olecli/Makefile.in b/dlls/olecli/Makefile.in index e2cc793087d..afb440f6004 100644 --- a/dlls/olecli/Makefile.in +++ b/dlls/olecli/Makefile.in @@ -3,16 +3,22 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = olecli +LIBEXT = @LIBEXT@ +MODULE = olecli32 +SOVERSION = 1.0 +IMPORTS = olesvr32 ole32 SPEC_SRCS = olecli32.spec olecli.spec C_SRCS = \ olecli_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/oledlg/.cvsignore b/dlls/oledlg/.cvsignore index 227d8393cc8..6c8c74d7aa9 100644 --- a/dlls/oledlg/.cvsignore +++ b/dlls/oledlg/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +liboledlg.so.1.0 diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 30cf519a176..afb4dc7b3a3 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = oledlg +SOVERSION = 1.0 SPEC_SRCS = oledlg.spec C_SRCS = \ oledlg_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/olesvr/.cvsignore b/dlls/olesvr/.cvsignore index 227d8393cc8..ac3ffaaaf87 100644 --- a/dlls/olesvr/.cvsignore +++ b/dlls/olesvr/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libolesvr32.so.1.0 diff --git a/dlls/olesvr/Makefile.in b/dlls/olesvr/Makefile.in index 866e0456b5e..9cc1b491f98 100644 --- a/dlls/olesvr/Makefile.in +++ b/dlls/olesvr/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = olesvr +LIBEXT = @LIBEXT@ +MODULE = olesvr32 +SOVERSION = 1.0 SPEC_SRCS = olesvr32.spec olesvr.spec C_SRCS = \ olesvr_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/psapi/.cvsignore b/dlls/psapi/.cvsignore index 227d8393cc8..da6c601152d 100644 --- a/dlls/psapi/.cvsignore +++ b/dlls/psapi/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libpsapi.so.1.0 diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in index 886decf6038..d02fa9108a1 100644 --- a/dlls/psapi/Makefile.in +++ b/dlls/psapi/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = psapi +SOVERSION = 1.0 SPEC_SRCS = psapi.spec C_SRCS = \ psapi_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/rasapi32/.cvsignore b/dlls/rasapi32/.cvsignore index 227d8393cc8..4e2fccf80a0 100644 --- a/dlls/rasapi32/.cvsignore +++ b/dlls/rasapi32/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +librasapi32.so.1.0 diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index 1bf13bb838d..ca642bc3ce9 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = rasapi32 +SOVERSION = 1.0 SPEC_SRCS = rasapi32.spec rasapi16.spec C_SRCS = rasapi.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/setupx/.cvsignore b/dlls/setupx/.cvsignore index 227d8393cc8..ffff87836c0 100644 --- a/dlls/setupx/.cvsignore +++ b/dlls/setupx/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libsetupx.so.1.0 diff --git a/dlls/setupx/Makefile.in b/dlls/setupx/Makefile.in index e1526ae6aab..b1b1bdb70f5 100644 --- a/dlls/setupx/Makefile.in +++ b/dlls/setupx/Makefile.in @@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = setupx +SOVERSION = 1.0 SPEC_SRCS = setupx.spec C_SRCS = \ setupx_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/shell32/.cvsignore b/dlls/shell32/.cvsignore index cf67e18c15b..a904018808e 100644 --- a/dlls/shell32/.cvsignore +++ b/dlls/shell32/.cvsignore @@ -1,4 +1,5 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libshell32.so.1.0 shres.s diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 78af119aacb..1d94f6dad5e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = shell32 +SOVERSION = 1.0 +IMPORTS = ole32 comctl32 WRCEXTRA = -s -p$(MODULE) SPEC_SRCS = \ @@ -42,11 +45,14 @@ RC_SRCS= \ #GEN_ASM_SRCS = \ # shellres.s -all: check_wrc $(MODULE).o +all: check_wrc lib$(MODULE).$(LIBEXT) @MAKE_RULES@ $(RC_SRCS:.rc=.s): $(WRC) +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/sound/.cvsignore b/dlls/sound/.cvsignore index 227d8393cc8..bf7fa35186a 100644 --- a/dlls/sound/.cvsignore +++ b/dlls/sound/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libsound.so.1.0 diff --git a/dlls/sound/Makefile.in b/dlls/sound/Makefile.in index b764a3ff570..9c056b88258 100644 --- a/dlls/sound/Makefile.in +++ b/dlls/sound/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = sound +SOVERSION = 1.0 SPEC_SRCS = sound.spec C_SRCS = \ sound_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/stress/.cvsignore b/dlls/stress/.cvsignore index 227d8393cc8..75aa39e70e1 100644 --- a/dlls/stress/.cvsignore +++ b/dlls/stress/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libstress.so.1.0 diff --git a/dlls/stress/Makefile.in b/dlls/stress/Makefile.in index 8a30033a346..885b6a7b5b1 100644 --- a/dlls/stress/Makefile.in +++ b/dlls/stress/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = stress +SOVERSION = 1.0 SPEC_SRCS = stress.spec C_SRCS = \ stress_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/tapi32/.cvsignore b/dlls/tapi32/.cvsignore index f1566dac650..7e0cb329d02 100644 --- a/dlls/tapi32/.cvsignore +++ b/dlls/tapi32/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -tapi32.spec.c +libtapi32.so.1.0 diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index 3e53a17b780..cc7b74f7b4e 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = tapi32 +SOVERSION = 1.0 SPEC_SRCS = tapi32.spec @@ -12,9 +14,12 @@ C_SRCS = \ line.c \ phone.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/version/.cvsignore b/dlls/version/.cvsignore index 227d8393cc8..e23cc1075f5 100644 --- a/dlls/version/.cvsignore +++ b/dlls/version/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libversion.so.1.0 diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index 07dbeee4df3..5c31a4e5a4a 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -3,7 +3,10 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = version +SOVERSION = 1.0 +IMPORTS = lz32 SPEC_SRCS = ver.spec version.spec @@ -13,8 +16,11 @@ C_SRCS = \ resource.c \ ver16.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/win32s/.cvsignore b/dlls/win32s/.cvsignore index 227d8393cc8..3cc1e5a6313 100644 --- a/dlls/win32s/.cvsignore +++ b/dlls/win32s/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libwin32s.so.1.0 diff --git a/dlls/win32s/Makefile.in b/dlls/win32s/Makefile.in index f4ceb3721a0..db28947979b 100644 --- a/dlls/win32s/Makefile.in +++ b/dlls/win32s/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = win32s +SOVERSION = 1.0 SPEC_SRCS = w32sys.spec win32s16.spec w32skrnl.spec @@ -12,9 +14,12 @@ C_SRCS = \ w32sys.c \ win32s16.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/win87em/.cvsignore b/dlls/win87em/.cvsignore index 227d8393cc8..16f2c0f3446 100644 --- a/dlls/win87em/.cvsignore +++ b/dlls/win87em/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libwin87em.so.1.0 diff --git a/dlls/win87em/Makefile.in b/dlls/win87em/Makefile.in index 7c9804e17d6..36eef493792 100644 --- a/dlls/win87em/Makefile.in +++ b/dlls/win87em/Makefile.in @@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = win87em +SOVERSION = 1.0 SPEC_SRCS = win87em.spec C_SRCS = \ emulate.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/windebug/.cvsignore b/dlls/windebug/.cvsignore index 227d8393cc8..d17a6bf1b19 100644 --- a/dlls/windebug/.cvsignore +++ b/dlls/windebug/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libwindebug.so.1.0 diff --git a/dlls/windebug/Makefile.in b/dlls/windebug/Makefile.in index 0264957b77a..ca2e742989f 100644 --- a/dlls/windebug/Makefile.in +++ b/dlls/windebug/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = windebug +SOVERSION = 1.0 SPEC_SRCS = windebug.spec C_SRCS = \ windebug_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/wing/.cvsignore b/dlls/wing/.cvsignore index 227d8393cc8..d9bf7e98bee 100644 --- a/dlls/wing/.cvsignore +++ b/dlls/wing/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libwing.so.1.0 diff --git a/dlls/wing/Makefile.in b/dlls/wing/Makefile.in index a106e6a43f6..830b1bf2b0a 100644 --- a/dlls/wing/Makefile.in +++ b/dlls/wing/Makefile.in @@ -3,16 +3,21 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = wing +SOVERSION = 1.0 SPEC_SRCS = wing.spec C_SRCS = \ wing_main.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/winmm/mcianim/.cvsignore b/dlls/winmm/mcianim/.cvsignore index 952ce1bbace..3d9caf244a4 100644 --- a/dlls/winmm/mcianim/.cvsignore +++ b/dlls/winmm/mcianim/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -mcianim.spec.c +libmcianim.drv.so.1.0 diff --git a/dlls/winmm/mcianim/Makefile.in b/dlls/winmm/mcianim/Makefile.in index e1613bea6be..69f17e65db0 100644 --- a/dlls/winmm/mcianim/Makefile.in +++ b/dlls/winmm/mcianim/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = mcianim.drv +SOVERSION = 1.0 SPEC_SRCS = \ mcianim.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ mcianim.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/mciavi/.cvsignore b/dlls/winmm/mciavi/.cvsignore index bcd93c7f865..c976ab6fc3c 100644 --- a/dlls/winmm/mciavi/.cvsignore +++ b/dlls/winmm/mciavi/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -mciavi.spec.c +libmciavi.drv.so.1.0 diff --git a/dlls/winmm/mciavi/Makefile.in b/dlls/winmm/mciavi/Makefile.in index 0ef35842b3a..ee31b734e77 100644 --- a/dlls/winmm/mciavi/Makefile.in +++ b/dlls/winmm/mciavi/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = mciavi.drv +SOVERSION = 1.0 SPEC_SRCS = \ mciavi.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ mciavi.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/mcicda/.cvsignore b/dlls/winmm/mcicda/.cvsignore index 0dc9119da4e..11529e8e38a 100644 --- a/dlls/winmm/mcicda/.cvsignore +++ b/dlls/winmm/mcicda/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -mcicda.spec.c +libmcicda.drv.so.1.0 diff --git a/dlls/winmm/mcicda/Makefile.in b/dlls/winmm/mcicda/Makefile.in index d5d299db37e..edc778c2e70 100644 --- a/dlls/winmm/mcicda/Makefile.in +++ b/dlls/winmm/mcicda/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = mcicda.drv +SOVERSION = 1.0 SPEC_SRCS = \ mcicda.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ mcicda.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/mciseq/.cvsignore b/dlls/winmm/mciseq/.cvsignore index 0b4b6f071e8..f01595e8eb5 100644 --- a/dlls/winmm/mciseq/.cvsignore +++ b/dlls/winmm/mciseq/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -mciseq.spec.c +libmciseq.drv.so.1.0 diff --git a/dlls/winmm/mciseq/Makefile.in b/dlls/winmm/mciseq/Makefile.in index f6b7d860998..1c16515f5e9 100644 --- a/dlls/winmm/mciseq/Makefile.in +++ b/dlls/winmm/mciseq/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = mciseq.drv +SOVERSION = 1.0 SPEC_SRCS = \ mciseq.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ mcimidi.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/mciwave/.cvsignore b/dlls/winmm/mciwave/.cvsignore index d9dfe65475d..3f3c0ab476c 100644 --- a/dlls/winmm/mciwave/.cvsignore +++ b/dlls/winmm/mciwave/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -mciwave.spec.c +libmciwave.drv.so.1.0 diff --git a/dlls/winmm/mciwave/Makefile.in b/dlls/winmm/mciwave/Makefile.in index 350a271cbfd..87d1c6b5285 100644 --- a/dlls/winmm/mciwave/Makefile.in +++ b/dlls/winmm/mciwave/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = mciwave.drv +SOVERSION = 1.0 SPEC_SRCS = \ mciwave.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ mciwave.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/midimap/.cvsignore b/dlls/winmm/midimap/.cvsignore index 7c829838d67..bd2dda279f5 100644 --- a/dlls/winmm/midimap/.cvsignore +++ b/dlls/winmm/midimap/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -midimap.spec.c +libmidimap.drv.so.1.0 diff --git a/dlls/winmm/midimap/Makefile.in b/dlls/winmm/midimap/Makefile.in index 6d587abfd25..b774fb807b6 100644 --- a/dlls/winmm/midimap/Makefile.in +++ b/dlls/winmm/midimap/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = midimap.drv +SOVERSION = 1.0 SPEC_SRCS = \ midimap.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ midimap.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/wavemap/.cvsignore b/dlls/winmm/wavemap/.cvsignore index 313661889f4..9dba6352627 100644 --- a/dlls/winmm/wavemap/.cvsignore +++ b/dlls/winmm/wavemap/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -msacm.spec.c +libmsacm.drv.so.1.0 diff --git a/dlls/winmm/wavemap/Makefile.in b/dlls/winmm/wavemap/Makefile.in index 7b356982760..c854fec4d3e 100644 --- a/dlls/winmm/wavemap/Makefile.in +++ b/dlls/winmm/wavemap/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = msacm.drv +SOVERSION = 1.0 SPEC_SRCS = \ msacm.spec @@ -11,11 +13,11 @@ SPEC_SRCS = \ C_SRCS = \ wavemap.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winmm/wineoss/.cvsignore b/dlls/winmm/wineoss/.cvsignore index d30434f8a29..94bef0e9459 100644 --- a/dlls/winmm/wineoss/.cvsignore +++ b/dlls/winmm/wineoss/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -wineoss.spec.c +libwineoss.drv.so.1.0 diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index 1bce0c75e32..e7c58232df8 100644 --- a/dlls/winmm/wineoss/Makefile.in +++ b/dlls/winmm/wineoss/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = wineoss.drv +SOVERSION = 1.0 SPEC_SRCS = \ wineoss.spec @@ -16,11 +18,11 @@ C_SRCS = \ mmaux.c \ oss.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ -call32.s: $(BUILD) - $(BUILD) @BUILDFLAGS@ -o $@ -call32 +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) ### Dependencies: diff --git a/dlls/winsock/.cvsignore b/dlls/winsock/.cvsignore index 227d8393cc8..3262b93a0ca 100644 --- a/dlls/winsock/.cvsignore +++ b/dlls/winsock/.cvsignore @@ -1,3 +1,4 @@ -Makefile *.spec.c *.spec.glue.s +Makefile +libwsock32.so.1.0 diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in index 9e50c8ac2fc..7cbba7d456f 100644 --- a/dlls/winsock/Makefile.in +++ b/dlls/winsock/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = winsock +LIBEXT = @LIBEXT@ +MODULE = wsock32 +SOVERSION = 1.0 SPEC_SRCS = winsock.spec wsock32.spec @@ -11,8 +13,11 @@ C_SRCS = \ async.c \ socket.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/winspool/.cvsignore b/dlls/winspool/.cvsignore index 9c9bc14d486..818ae497e76 100644 --- a/dlls/winspool/.cvsignore +++ b/dlls/winspool/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -winspool.spec.c +libwinspool.so.1.0 diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in index 7e491bcb7df..7ada8095606 100644 --- a/dlls/winspool/Makefile.in +++ b/dlls/winspool/Makefile.in @@ -3,7 +3,9 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = winspool +SOVERSION = 1.0 SPEC_SRCS = winspool.spec @@ -11,9 +13,12 @@ C_SRCS = \ info.c \ wspool.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/dlls/wnaspi32/.cvsignore b/dlls/wnaspi32/.cvsignore index 97ab63dbf10..490a329b553 100644 --- a/dlls/wnaspi32/.cvsignore +++ b/dlls/wnaspi32/.cvsignore @@ -1,2 +1,3 @@ +*.spec.c Makefile -wnaspi32.spec.c +libwnaspi32.so.1.0 diff --git a/dlls/wnaspi32/Makefile.in b/dlls/wnaspi32/Makefile.in index 3053a98cc16..7ca0a9a979d 100644 --- a/dlls/wnaspi32/Makefile.in +++ b/dlls/wnaspi32/Makefile.in @@ -3,15 +3,20 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +LIBEXT = @LIBEXT@ MODULE = wnaspi32 +SOVERSION = 1.0 SPEC_SRCS = wnaspi32.spec C_SRCS = \ winaspi32.c -all: $(MODULE).o +all: lib$(MODULE).$(LIBEXT) @MAKE_RULES@ +clean:: + $(RM) lib$(MODULE).$(LIBEXT).$(SOVERSION) + ### Dependencies: diff --git a/include/Makefile.in b/include/Makefile.in index 72e7d85602f..878a5b8af7f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -4,8 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none -LIB_TARGET = @LIB_TARGET@ - INSTALLED_INCLUDES = \ windef.h \ windows.h \ @@ -14,15 +12,9 @@ INSTALLED_INCLUDES = \ @MAKE_RULES@ -# Testing LIB_TARGET prevents installing header files -# when --disable-lib is used -install:: dummy - if [ $(LIB_TARGET) ]; then \ - [ -d $(includedir) ] || $(MKDIR) $(includedir); \ - for f in $(INSTALLED_INCLUDES); do \ - $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir); \ - done; \ - fi +install:: + [ -d $(includedir) ] || $(MKDIR) $(includedir) + for f in $(INSTALLED_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir); done # Don't just do a rm -rf on $(includedir) -- don't want to wipe out # anything extra the user may have put there. @@ -30,6 +22,4 @@ uninstall:: cd $(includedir); $(RM) $(INSTALLED_INCLUDES) -rmdir $(includedir) -dummy: - ### Dependencies: diff --git a/library/checklink.c b/library/checklink.c new file mode 100644 index 00000000000..58fe69254d0 --- /dev/null +++ b/library/checklink.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} diff --git a/loader/loadorder.c b/loader/loadorder.c index 13708fd9320..554f57ef612 100644 --- a/loader/loadorder.c +++ b/loader/loadorder.c @@ -381,7 +381,7 @@ BOOL MODULE_InitLoadOrder(void) #endif /* Get the default load order */ - nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,e,s,b", buffer, sizeof(buffer)); + nbuffer = PROFILE_GetWineIniString("DllDefaults", "DefaultLoadOrder", "n,b,e,s", buffer, sizeof(buffer)); if(!nbuffer) { MESSAGE("MODULE_InitLoadOrder: mysteriously read nothing from default loadorder\n"); diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 86679a13f07..7dae5edddb6 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -21,8 +21,6 @@ MOSTOBJS = $(MOSTSRCS:.c=.o) all: check_wrc $(PROGRAMS) -depend:: - @MAKE_RULES@ # Override resource compiler rules @@ -34,14 +32,12 @@ aviinfo: aviinfo.o $(WINESTUB) aviplay: aviplay.o $(WINESTUB) $(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) icinfo $(bindir)/icinfo $(INSTALL_PROGRAM) aviinfo $(bindir)/aviinfo $(INSTALL_PROGRAM) aviplay $(bindir)/aviplay -uninstall: dummy +uninstall:: $(RM) $(bindir)/aviinfo $(bindir)/icinfo $(bindir)/aviplay -dummy: - ### Dependencies: diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index c14d4ba77e3..3cefec0559f 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -21,8 +21,6 @@ RC_SRCS = rsrc.rc all: check_wrc $(PROGRAMS) -depend:: - @MAKE_RULES@ # Override resource compiler rules @@ -33,10 +31,10 @@ depend:: clock: $(OBJS) $(WINESTUB) $(CC) -o clock $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install:: dummy +install:: $(INSTALL_PROGRAM) clock $(bindir)/clock -uninstall:: dummy +uninstall:: $(RM) $(bindir)/clock ### Dependencies: diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index f4445d3b010..918cccdb59a 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -32,14 +32,12 @@ depend:: $(RC_SRCS:.rc=.h) cmdlgtst: $(OBJS) $(WINESTUB) $(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst -uninstall: dummy +uninstall:: $(RM) $(bindir)/cmdlgtst $(RC_SRCS:.rc=.s): $(WRC) -dummy: - ### Dependencies: diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index f9b6fe18a31..c0fdf1f820f 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -16,12 +16,10 @@ all: $(PROGRAMS) control: $(OBJS) $(WINESTUB) $(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) control $(bindir)/control -uninstall: dummy +uninstall:: $(RM) $(bindir)/control -dummy: - ### Dependencies: diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index defede0a00c..d7a104bcb7f 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -22,8 +22,6 @@ RC_SRCS = rsrc.rc all: check_wrc $(PROGRAMS) -depend:: - @MAKE_RULES@ # Override resource compiler rules @@ -33,10 +31,10 @@ depend:: notepad: $(OBJS) $(WINESTUB) $(CC) -o notepad $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install:: dummy +install:: $(INSTALL_PROGRAM) notepad $(bindir)/notepad -uninstall:: dummy +uninstall:: $(RM) $(bindir)/notepad ### Dependencies: diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in index b7eb5864d52..a3227e377b6 100644 --- a/programs/osversioncheck/Makefile.in +++ b/programs/osversioncheck/Makefile.in @@ -19,12 +19,10 @@ WINESTUB = osversioncheck: $(OBJS) $(CC) -o osversioncheck $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) osversioncheck $(bindir)/osversioncheck -uninstall: dummy +uninstall:: $(RM) $(bindir)/osversioncheck -dummy: - ### Dependencies: diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 2762804792b..cd761c60314 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -33,10 +33,10 @@ all: check_wrc $(PROGRAMS) progman: $(OBJS) $(WINESTUB) $(CC) -o progman $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install:: dummy +install:: $(INSTALL_PROGRAM) progman $(bindir)/progman -uninstall:: dummy +uninstall:: $(RM) $(bindir)/progman ### Dependencies: diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in index 410d2b6aca4..0e34628d33f 100644 --- a/programs/regapi/Makefile.in +++ b/programs/regapi/Makefile.in @@ -14,19 +14,15 @@ C_SRCS = \ all: $(PROGRAMS) -depend:: - @MAKE_RULES@ regapi: $(OBJS) $(WINESTUB) $(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) regapi $(bindir)/regapi -uninstall: dummy +uninstall:: $(RM) $(bindir)/regapi -dummy: - ### Dependencies: diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in index 250e954db22..dd14a8d381b 100644 --- a/programs/regtest/Makefile.in +++ b/programs/regtest/Makefile.in @@ -18,12 +18,10 @@ all: $(PROGRAMS) regtest: $(OBJS) $(WINESTUB) $(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) regtest $(bindir)/regtest -uninstall: dummy +uninstall:: $(RM) $(bindir)/regtest -dummy: - ### Dependencies: diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index c9d3fb87f0a..d70bf4d7d30 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -34,14 +34,12 @@ depend:: $(RC_SRCS:.rc=.h) view: $(OBJS) $(WINESTUB) $(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) view $(bindir)/view -uninstall: dummy +uninstall:: $(RM) $(bindir)/view $(RC_SRCS:.rc=.s): $(WRC) -dummy: - ### Dependencies: diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in index c4360a1c260..526c864afd0 100644 --- a/programs/wcmd/Makefile.in +++ b/programs/wcmd/Makefile.in @@ -30,14 +30,12 @@ WINESTUB = wcmd: $(OBJS) $(WINESTUB) $(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) wcmd $(bindir)/wcmd -uninstall: dummy +uninstall:: $(RM) $(bindir)/wcmd $(RC_SRCS:.rc=.s): $(WRC) -dummy: - ### Dependencies: diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index 6637746c9f0..e0cd0ee7773 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -35,11 +35,11 @@ winhelp: $(OBJS) $(WINESTUB) hlp2sgml: hlp2sgml.o hlpfile.o $(CC) -o hlp2sgml hlp2sgml.o hlpfile.o -install:: dummy +install:: $(INSTALL_PROGRAM) winhelp $(bindir)/winhelp $(INSTALL_PROGRAM) hlp2sgml $(bindir)/hlp2sgml -uninstall:: dummy +uninstall:: $(RM) $(bindir)/winhelp $(bindir)/hlp2sgml y.tab.c y.tab.h: macro.yacc.y diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index 013de746cbe..706b6e56ff6 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -18,12 +18,10 @@ all: check_wrc $(PROGRAMS) winver: $(OBJS) $(WINESTUB) $(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS) -install: dummy +install:: $(INSTALL_PROGRAM) winver $(bindir)/winver -uninstall: dummy +uninstall:: $(RM) $(bindir)/winver -dummy: - ### Dependencies: diff --git a/win32/device.c b/win32/device.c index fe4f94ac0e8..c9e753e79fb 100644 --- a/win32/device.c +++ b/win32/device.c @@ -23,12 +23,12 @@ #include #include #include "winbase.h" +#include "winuser.h" #include "winreg.h" #include "winerror.h" #include "winversion.h" #include "file.h" #include "process.h" -#include "mmsystem.h" #include "heap.h" #include "winioctl.h" #include "winnt.h" @@ -452,7 +452,7 @@ static BOOL DeviceIo_VTDAPI(DWORD dwIoControlCode, LPVOID lpvInBuffer, DWORD cbI { case 5: if (lpvOutBuffer && (cbOutBuffer>=4)) - *(DWORD*)lpvOutBuffer = timeGetTime(); + *(DWORD*)lpvOutBuffer = GetTickCount(); if (lpcbBytesReturned) *lpcbBytesReturned = 4; diff --git a/wine.ini b/wine.ini index e7e071df253..601dd239d18 100644 --- a/wine.ini +++ b/wine.ini @@ -61,7 +61,7 @@ SymbolTableFile=./wine.sym [DllDefaults] EXTRA_LD_LIBRARY_PATH=${HOME}/wine/cvs/lib -DefaultLoadOrder = native, elfdll, so, builtin +DefaultLoadOrder = native, builtin, elfdll, so [DllPairs] krnl386 = kernel32