From e1e75371d908aaae1191256e8329a1b4348f6517 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Mon, 24 Apr 2000 17:17:49 +0000 Subject: [PATCH] Implemented on-demand loading of builtin dlls using dlopen(). --- .cvsignore | 1 - Make.rules.in | 1 - Makefile.in | 21 +- configure | 409 ++++++++++++++-------------- configure.in | 9 +- debugger/Makefile.in | 3 +- dlls/Makedll.rules.in | 5 +- dlls/Makefile.in | 24 ++ dlls/commdlg/comdlg32.spec | 2 +- dlls/shell32/shellord.c | 3 +- dlls/x11drv/Makefile.in | 1 + if1632/builtin.c | 18 +- include/module.h | 2 + libtest/Makefile.in | 21 +- libtest/hello3res.rc | 2 +- programs/avitools/Makefile.in | 8 +- programs/clock/Makefile.in | 4 +- programs/cmdlgtst/Makefile.in | 4 +- programs/control/Makefile.in | 4 +- programs/notepad/Makefile.in | 4 +- programs/osversioncheck/Makefile.in | 3 +- programs/progman/Makefile.in | 4 +- programs/regapi/Makefile.in | 3 +- programs/regtest/Makefile.in | 3 +- programs/view/Makefile.in | 4 +- programs/wcmd/Makefile.in | 3 +- programs/winemine/Makefile.in | 3 +- programs/winhelp/Makefile.in | 4 +- programs/winver/Makefile.in | 4 +- relay32/builtin32.c | 57 +++- wine.ini | 1 - 31 files changed, 359 insertions(+), 276 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3da020d18bf..32af49c5330 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,4 +5,3 @@ config.log config.status libwine.so.1.0 wine -wine.sym diff --git a/Make.rules.in b/Make.rules.in index 3df71748706..0e89c0126dd 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -30,7 +30,6 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ DLL_LINK = @DLL_LINK@ -WINELIB = $(DLL_LINK) LIBS = @LIBS@ YACC = @YACC@ LEX = @LEX@ diff --git a/Makefile.in b/Makefile.in index 2d1f6a8b639..ebfa2c26e9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -131,7 +131,7 @@ EXTRA_OBJS = $(LIBOBJS) EMU_TARGET = @EMU_TARGET@ -all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET) +all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) lib$(MODULE).$(LIBEXT) $(DLLDIR) $(EMU_TARGET) @echo "Wine build complete." LIBLINTS = $(LIBOBJS:.o=.ln) @@ -144,15 +144,12 @@ 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 -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 +wine: lib$(MODULE).$(LIBEXT) $(DLLDIR) $(EMUOBJS) + $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) llib-lwine.ln : $(LIBLINTS) $(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) @@ -168,8 +165,6 @@ install_a: lib$(MODULE).a 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:: $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=install_%) @@ -179,7 +174,7 @@ install:: $(PROGRAMS) $(LIBPROGRAMS) $(EMU_TARGET:%=install_%) $(LIBEXT:%=instal $(INSTALL_PROGRAM) debugger/winedbg $(bindir)/winedbg uninstall:: - cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) wine.sym + cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION) cd $(bindir) && $(RM) wine wineserver dosmod winedbg lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in Make.rules.in @@ -194,12 +189,14 @@ lib$(MODULE).a: $(OBJS) Makefile.in Make.rules.in $(RANLIB) $@ checklink:: - $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -lwine $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) && $(RM) checklink + $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -lwine $(LIBS) && $(RM) checklink $(EMUOBJS) $(LIBOBJS) $(DLLOBJS) $(PROGRAMS) $(LIBPROGRAMS): $(TOOLSUBDIRS) dummy @cd `dirname $@` && $(MAKE) `basename $@` -$(LIBPROGRAMS): lib$(MODULE).$(LIBEXT) $(DLLOBJS) +$(DLLDIR): $(TOOLSUBDIRS) dummy + +$(LIBPROGRAMS): lib$(MODULE).$(LIBEXT) $(DLLDIR) $(LIBLINTS) $(EMULINTS): dummy @cd `dirname $@` && $(MAKE) lint @@ -232,7 +229,7 @@ htmlpages: for i in $(LIBSUBDIRS); do (cd $$i && $(MAKE) html); done clean:: - $(RM) wine wine.sym libwine.so.1.0 TAGS + $(RM) wine libwine.so.1.0 TAGS distclean: clean $(RM) config.* Make.rules dlls/Makedll.rules include/config.h documentation/wine.man documentation/wine.conf.man diff --git a/configure b/configure index 4c4cc18066d..2cf87c37d6e 100755 --- a/configure +++ b/configure @@ -2883,18 +2883,20 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then EOF LIBS="$LIBS -ldl" - else echo "$ac_t""no" 1>&6 +LIBEXT="a" + fi fi done - else echo "$ac_t""no" 1>&6 +LIBEXT="a" + fi done @@ -2915,17 +2917,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2919: checking for $ac_hdr" >&5 +echo "configure:2921: 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 -#line 2924 "configure" +#line 2926 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2931: \"$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* @@ -2954,7 +2956,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:2958: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:2960: 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 @@ -2962,7 +2964,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2966 "configure" +#line 2968 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2973,7 +2975,7 @@ int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:2977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2979: \"$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 @@ -3016,17 +3018,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3020: checking for $ac_hdr" >&5 +echo "configure:3022: 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 -#line 3025 "configure" +#line 3027 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3032: \"$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* @@ -3055,7 +3057,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:3059: checking for XShmQueryExtension in -lXext" >&5 +echo "configure:3061: 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 @@ -3063,7 +3065,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3067 "configure" +#line 3069 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3074,7 +3076,7 @@ int main() { XShmQueryExtension() ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3080: \"$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 @@ -3102,17 +3104,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3106: checking for $ac_hdr" >&5 +echo "configure:3108: 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 -#line 3111 "configure" +#line 3113 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3118: \"$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* @@ -3141,7 +3143,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:3145: checking for XDGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3147: 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 @@ -3150,7 +3152,7 @@ else LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3154 "configure" +#line 3156 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3161,7 +3163,7 @@ int main() { XDGAQueryExtension() ; return 0; } EOF -if { (eval echo configure:3165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3167: \"$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 @@ -3194,7 +3196,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:3198: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo "configure:3200: 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 @@ -3202,7 +3204,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3206 "configure" +#line 3208 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3213,7 +3215,7 @@ int main() { XF86DGAQueryExtension() ; return 0; } EOF -if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3219: \"$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 @@ -3246,17 +3248,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3250: checking for $ac_hdr" >&5 +echo "configure:3252: 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 -#line 3255 "configure" +#line 3257 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3262: \"$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* @@ -3285,7 +3287,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:3289: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 +echo "configure:3291: 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 @@ -3293,7 +3295,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3297 "configure" +#line 3299 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3304,7 +3306,7 @@ int main() { XF86VidModeQueryExtension() ; return 0; } EOF -if { (eval echo configure:3308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3310: \"$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 @@ -3333,17 +3335,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3337: checking for $ac_hdr" >&5 +echo "configure:3339: 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 -#line 3342 "configure" +#line 3344 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3349: \"$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* @@ -3372,19 +3374,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:3376: checking "for up-to-date Mesa version"" >&5 +echo "configure:3378: 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 <<EOF -#line 3381 "configure" +#line 3383 "configure" #include "confdefs.h" #include <GL/gl.h> int main() { GLenum test = GL_UNSIGNED_SHORT_5_6_5; ; return 0; } EOF -if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_mesa_version_OK="yes" else @@ -3401,21 +3403,21 @@ fi echo "$ac_t""$wine_cv_mesa_version_OK" 1>&6 echo $ac_n "checking "for thread-safe Mesa version"""... $ac_c" 1>&6 -echo "configure:3405: checking "for thread-safe Mesa version"" >&5 +echo "configure:3407: checking "for thread-safe Mesa version"" >&5 if eval "test \"`echo '$''{'wine_cv_mesa_version_threadsafe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else saved_libs=$LIBS LIBS="$X_LIBS -lGL" cat > conftest.$ac_ext <<EOF -#line 3412 "configure" +#line 3414 "configure" #include "confdefs.h" int main() { pthread_getspecific(); ; return 0; } EOF -if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* wine_cv_mesa_version_threadsafe="yes" else @@ -3434,7 +3436,7 @@ echo "$ac_t""$wine_cv_mesa_version_threadsafe" 1>&6 if test "$wine_cv_mesa_version_OK" = "yes" -a "$wine_cv_mesa_version_threadsafe" = "no" then echo $ac_n "checking for glXCreateContext in -lGL""... $ac_c" 1>&6 -echo "configure:3438: checking for glXCreateContext in -lGL" >&5 +echo "configure:3440: 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 @@ -3442,7 +3444,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3446 "configure" +#line 3448 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3453,7 +3455,7 @@ int main() { glXCreateContext() ; return 0; } EOF -if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3459: \"$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 @@ -3482,7 +3484,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:3486: checking for glXCreateContext in -lMesaGL" >&5 +echo "configure:3488: 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 @@ -3490,7 +3492,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3494 "configure" +#line 3496 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3501,7 +3503,7 @@ int main() { glXCreateContext() ; return 0; } EOF -if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3507: \"$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 @@ -3530,19 +3532,19 @@ fi fi echo $ac_n "checking "for the OpenGL Color Index extension"""... $ac_c" 1>&6 -echo "configure:3534: checking "for the OpenGL Color Index extension"" >&5 +echo "configure:3536: 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 <<EOF -#line 3539 "configure" +#line 3541 "configure" #include "confdefs.h" #include <GL/gl.h> int main() { GLenum test = GL_COLOR_INDEX8_EXT; ; return 0; } EOF -if { (eval echo configure:3546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_GL_COLOR_TABLE 1 @@ -3560,7 +3562,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:3564: checking for glColorTableEXT in -lMesaGL" >&5 +echo "configure:3566: 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 @@ -3568,7 +3570,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3572 "configure" +#line 3574 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3579,7 +3581,7 @@ int main() { glColorTableEXT() ; return 0; } EOF -if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3585: \"$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 @@ -3604,7 +3606,7 @@ fi else echo $ac_n "checking for glColorTableEXT in -lGL""... $ac_c" 1>&6 -echo "configure:3608: checking for glColorTableEXT in -lGL" >&5 +echo "configure:3610: 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 @@ -3612,7 +3614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3616 "configure" +#line 3618 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3623,7 +3625,7 @@ int main() { glColorTableEXT() ; return 0; } EOF -if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3629: \"$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 @@ -3664,17 +3666,17 @@ then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3668: checking for $ac_hdr" >&5 +echo "configure:3670: 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 -#line 3673 "configure" +#line 3675 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3680: \"$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* @@ -3703,7 +3705,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:3707: checking for waddch in -lncurses" >&5 +echo "configure:3709: 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 @@ -3711,7 +3713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3715 "configure" +#line 3717 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3722,7 +3724,7 @@ int main() { waddch() ; return 0; } EOF -if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3728: \"$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 @@ -3753,7 +3755,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:3757: checking for resizeterm in -lncurses" >&5 +echo "configure:3759: 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 @@ -3761,7 +3763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3765 "configure" +#line 3767 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3772,7 +3774,7 @@ int main() { resizeterm() ; return 0; } EOF -if { (eval echo configure:3776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3778: \"$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 @@ -3796,7 +3798,7 @@ else fi echo $ac_n "checking for getbkgd in -lncurses""... $ac_c" 1>&6 -echo "configure:3800: checking for getbkgd in -lncurses" >&5 +echo "configure:3802: 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 @@ -3804,7 +3806,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3808 "configure" +#line 3810 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3815,7 +3817,7 @@ int main() { getbkgd() ; return 0; } EOF -if { (eval echo configure:3819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3821: \"$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 @@ -3843,17 +3845,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3847: checking for $ac_hdr" >&5 +echo "configure:3849: 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 -#line 3852 "configure" +#line 3854 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3859: \"$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* @@ -3882,7 +3884,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:3886: checking for waddch in -lcurses" >&5 +echo "configure:3888: 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 @@ -3890,7 +3892,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3894 "configure" +#line 3896 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3901,7 +3903,7 @@ int main() { waddch() ; return 0; } EOF -if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3907: \"$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 @@ -3931,7 +3933,7 @@ fi if test "$ac_cv_lib_curses_waddch" = "yes" then echo $ac_n "checking for resizeterm in -lcurses""... $ac_c" 1>&6 -echo "configure:3935: checking for resizeterm in -lcurses" >&5 +echo "configure:3937: 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 @@ -3939,7 +3941,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3943 "configure" +#line 3945 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3950,7 +3952,7 @@ int main() { resizeterm() ; return 0; } EOF -if { (eval echo configure:3954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3956: \"$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 @@ -3974,7 +3976,7 @@ else fi echo $ac_n "checking for getbkgd in -lcurses""... $ac_c" 1>&6 -echo "configure:3978: checking for getbkgd in -lcurses" >&5 +echo "configure:3980: 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 @@ -3982,7 +3984,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3986 "configure" +#line 3988 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3993,7 +3995,7 @@ int main() { getbkgd() ; return 0; } EOF -if { (eval echo configure:3997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3999: \"$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 @@ -4022,12 +4024,12 @@ fi fi echo $ac_n "checking "for GNU style IPX support"""... $ac_c" 1>&6 -echo "configure:4026: checking "for GNU style IPX support"" >&5 +echo "configure:4028: 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 <<EOF -#line 4031 "configure" +#line 4033 "configure" #include "confdefs.h" #include <sys/socket.h> #include <netipx/ipx.h> @@ -4035,7 +4037,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_gnu="yes" else @@ -4060,12 +4062,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:4064: checking "for linux style IPX support"" >&5 +echo "configure:4066: 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 <<EOF -#line 4069 "configure" +#line 4071 "configure" #include "confdefs.h" #include <sys/socket.h> #include <asm/types.h> @@ -4074,7 +4076,7 @@ int main() { ((struct sockaddr_ipx *)0)->sipx_family == AF_IPX ; return 0; } EOF -if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_ipx_linux="yes" else @@ -4101,17 +4103,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:4105: checking for $ac_hdr" >&5 +echo "configure:4107: 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 -#line 4110 "configure" +#line 4112 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4117: \"$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* @@ -4139,12 +4141,12 @@ done echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 -echo "configure:4143: checking "for Open Sound System"" >&5 +echo "configure:4145: 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 <<EOF -#line 4148 "configure" +#line 4150 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -4165,7 +4167,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" else @@ -4188,12 +4190,12 @@ EOF fi echo $ac_n "checking "for Open Sound System/MIDI interface"""... $ac_c" 1>&6 -echo "configure:4192: checking "for Open Sound System/MIDI interface"" >&5 +echo "configure:4194: 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 <<EOF -#line 4197 "configure" +#line 4199 "configure" #include "confdefs.h" #if defined(HAVE_SYS_SOUNDCARD_H) @@ -4214,7 +4216,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem_midi="yes" else @@ -4243,7 +4245,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:4247: checking "for gcc strength-reduce bug"" >&5 +echo "configure:4249: 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 @@ -4251,7 +4253,7 @@ else ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <<EOF -#line 4255 "configure" +#line 4257 "configure" #include "confdefs.h" int main(void) { @@ -4262,7 +4264,7 @@ int main(void) { exit( Array[1] != -2 ); } EOF -if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4268: \"$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 @@ -4285,7 +4287,7 @@ fi echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 -echo "configure:4289: checking "whether external symbols need an underscore prefix"" >&5 +echo "configure:4291: 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 @@ -4297,14 +4299,14 @@ _ac_test: .long 0 EOF cat > conftest.$ac_ext <<EOF -#line 4301 "configure" +#line 4303 "configure" #include "confdefs.h" extern int ac_test; int main() { if (ac_test) return 1 ; return 0; } EOF -if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4310: \"$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 @@ -4328,7 +4330,7 @@ fi echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 -echo "configure:4332: checking "whether assembler accepts .string"" >&5 +echo "configure:4334: 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 @@ -4338,14 +4340,14 @@ cat > conftest_asm.s <<EOF .string "test" EOF cat > conftest.$ac_ext <<EOF -#line 4342 "configure" +#line 4344 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4351: \"$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 @@ -4372,21 +4374,21 @@ LDSHARED="" if test "$LIBEXT" = "so" then echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6 -echo "configure:4376: checking "whether we can build a Linux dll"" >&5 +echo "configure:4378: 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 <<EOF -#line 4383 "configure" +#line 4385 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4392: \"$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 @@ -4406,21 +4408,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:4410: checking whether we can build a UnixWare (Solaris) dll" >&5 +echo "configure:4412: 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 <<EOF -#line 4417 "configure" +#line 4419 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4426: \"$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 @@ -4440,21 +4442,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:4444: checking "whether we can build a NetBSD dll"" >&5 +echo "configure:4446: 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 <<EOF -#line 4451 "configure" +#line 4453 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4460: \"$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 @@ -4483,28 +4485,29 @@ fi DLLFLAGS="" BUILDFLAGS="" -DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine" if test "$LIBEXT" = "so"; then BUILDFLAGS="-pic" DLLFLAGS="-fPIC" + DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine" else + DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine \$(X_LIBS) \$(XLIB)" echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 -echo "configure:4494: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 +echo "configure:4497: 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 <<EOF -#line 4501 "configure" +#line 4504 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4511: \"$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 @@ -4524,21 +4527,21 @@ echo "$ac_t""$ac_cv_c_whole_archive" 1>&6 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:4528: checking whether the linker supports -z {all,default}extract (Linux)" >&5 +echo "configure:4531: 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 <<EOF -#line 4535 "configure" +#line 4538 "configure" #include "confdefs.h" int main() { return 1 ; return 0; } EOF -if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_c_allextract="yes" else @@ -4569,7 +4572,7 @@ fi wine_cv_libc_reentrant=no echo $ac_n "checking "for reentrant libc: __errno_location"""... $ac_c" 1>&6 -echo "configure:4573: checking "for reentrant libc: __errno_location"" >&5 +echo "configure:4576: 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 @@ -4577,14 +4580,14 @@ else wine_cv_libc_r__errno_location=yes else cat > conftest.$ac_ext <<EOF -#line 4581 "configure" +#line 4584 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__errno_location(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4591: \"$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 @@ -4609,7 +4612,7 @@ EOF wine_cv_libc_reentrant=__errno_location fi echo $ac_n "checking "for reentrant libc: __error"""... $ac_c" 1>&6 -echo "configure:4613: checking "for reentrant libc: __error"" >&5 +echo "configure:4616: 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 @@ -4617,14 +4620,14 @@ else wine_cv_libc_r__error=yes else cat > conftest.$ac_ext <<EOF -#line 4621 "configure" +#line 4624 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__error(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4631: \"$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 @@ -4649,7 +4652,7 @@ EOF wine_cv_libc_reentrant=__error fi echo $ac_n "checking "for reentrant libc: ___errno"""... $ac_c" 1>&6 -echo "configure:4653: checking "for reentrant libc: ___errno"" >&5 +echo "configure:4656: 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 @@ -4657,14 +4660,14 @@ else wine_cv_libc_r___errno=yes else cat > conftest.$ac_ext <<EOF -#line 4661 "configure" +#line 4664 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *___errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4671: \"$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 @@ -4689,7 +4692,7 @@ EOF wine_cv_libc_reentrant=___errno fi echo $ac_n "checking "for reentrant libc: __thr_errno"""... $ac_c" 1>&6 -echo "configure:4693: checking "for reentrant libc: __thr_errno"" >&5 +echo "configure:4696: 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 @@ -4697,14 +4700,14 @@ else wine_cv_libc_r__thr_errno=yes else cat > conftest.$ac_ext <<EOF -#line 4701 "configure" +#line 4704 "configure" #include "confdefs.h" int myerrno = 0; char buf[256]; int *__thr_errno(){return &myerrno;} main(){connect(0,buf,255); exit(!myerrno);} EOF -if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4711: \"$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 @@ -4740,7 +4743,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:4744: checking "for reentrant X libraries"" >&5 +echo "configure:4747: 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 @@ -4786,14 +4789,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4790: checking whether byte ordering is bigendian" >&5 +echo "configure:4793: 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 <<EOF -#line 4797 "configure" +#line 4800 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4804,11 +4807,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4811: \"$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 <<EOF -#line 4812 "configure" +#line 4815 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4819,7 +4822,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4839,7 +4842,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 <<EOF -#line 4843 "configure" +#line 4846 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -4852,7 +4855,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4859: \"$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 @@ -4880,19 +4883,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:4884: checking for working alloca.h" >&5 +echo "configure:4887: 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 <<EOF -#line 4889 "configure" +#line 4892 "configure" #include "confdefs.h" #include <alloca.h> int main() { void *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4899: \"$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 @@ -4913,12 +4916,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4917: checking for alloca" >&5 +echo "configure:4920: 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 <<EOF -#line 4922 "configure" +#line 4925 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -4946,7 +4949,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:4950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4953: \"$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 @@ -4978,12 +4981,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4982: checking whether alloca needs Cray hooks" >&5 +echo "configure:4985: 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 <<EOF -#line 4987 "configure" +#line 4990 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5008,12 +5011,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&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:5012: checking for $ac_func" >&5 +echo "configure:5015: 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 <<EOF -#line 5017 "configure" +#line 5020 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5036,7 +5039,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5043: \"$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 @@ -5063,7 +5066,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5067: checking stack direction for C alloca" >&5 +echo "configure:5070: 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 @@ -5071,7 +5074,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 5075 "configure" +#line 5078 "configure" #include "confdefs.h" find_stack_direction () { @@ -5090,7 +5093,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5097: \"$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 @@ -5141,12 +5144,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5145: checking for $ac_func" >&5 +echo "configure:5148: 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 <<EOF -#line 5150 "configure" +#line 5153 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5169,7 +5172,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5176: \"$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 @@ -5246,17 +5249,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:5250: checking for $ac_hdr" >&5 +echo "configure:5253: 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 -#line 5255 "configure" +#line 5258 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5263: \"$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* @@ -5283,12 +5286,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:5287: checking whether stat file-mode macros are broken" >&5 +echo "configure:5290: 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 <<EOF -#line 5292 "configure" +#line 5295 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5341,12 +5344,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5345: checking for working const" >&5 +echo "configure:5348: 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 <<EOF -#line 5350 "configure" +#line 5353 "configure" #include "confdefs.h" int main() { @@ -5395,7 +5398,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5416,21 +5419,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5420: checking for inline" >&5 +echo "configure:5423: 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 <<EOF -#line 5427 "configure" +#line 5430 "configure" #include "confdefs.h" int main() { } int $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5456,12 +5459,12 @@ EOF esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5460: checking for ANSI C header files" >&5 +echo "configure:5463: 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 <<EOF -#line 5465 "configure" +#line 5468 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5469,7 +5472,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5476: \"$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* @@ -5486,7 +5489,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 -#line 5490 "configure" +#line 5493 "configure" #include "confdefs.h" #include <string.h> EOF @@ -5504,7 +5507,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 -#line 5508 "configure" +#line 5511 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -5525,7 +5528,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 5529 "configure" +#line 5532 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5536,7 +5539,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5560,12 +5563,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5564: checking for size_t" >&5 +echo "configure:5567: 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 <<EOF -#line 5569 "configure" +#line 5572 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5593,7 +5596,7 @@ EOF fi echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:5597: checking size of long long" >&5 +echo "configure:5600: 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 @@ -5601,7 +5604,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <<EOF -#line 5605 "configure" +#line 5608 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -5612,7 +5615,7 @@ main() exit(0); } EOF -if { (eval echo configure:5616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5619: \"$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 @@ -5635,12 +5638,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:5639: checking "whether linux/joystick.h uses the Linux 2.2+ API"" >&5 +echo "configure:5642: 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 <<EOF -#line 5644 "configure" +#line 5647 "configure" #include "confdefs.h" #include <sys/ioctl.h> @@ -5655,7 +5658,7 @@ int main() { /*empty*/ ; return 0; } EOF -if { (eval echo configure:5659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_linux_joystick_22_api=yes else @@ -5682,12 +5685,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:5686: checking "whether sys/vfs.h defines statfs"" >&5 +echo "configure:5689: 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 <<EOF -#line 5691 "configure" +#line 5694 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5704,7 +5707,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_vfs_has_statfs=yes else @@ -5731,12 +5734,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:5735: checking "whether sys/statfs.h defines statfs"" >&5 +echo "configure:5738: 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 <<EOF -#line 5740 "configure" +#line 5743 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5751,7 +5754,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_statfs_has_statfs=yes else @@ -5778,12 +5781,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:5782: checking "whether sys/mount.h defines statfs"" >&5 +echo "configure:5785: 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 <<EOF -#line 5787 "configure" +#line 5790 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5798,7 +5801,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_sys_mount_has_statfs=yes else @@ -5824,7 +5827,7 @@ fi echo $ac_n "checking "for statfs.f_bfree"""... $ac_c" 1>&6 -echo "configure:5828: checking "for statfs.f_bfree"" >&5 +echo "configure:5831: 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 @@ -5833,7 +5836,7 @@ else wine_cv_statfs_bfree=no else cat > conftest.$ac_ext <<EOF -#line 5837 "configure" +#line 5840 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5860,7 +5863,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bfree=yes else @@ -5884,7 +5887,7 @@ EOF fi echo $ac_n "checking "for statfs.f_bavail"""... $ac_c" 1>&6 -echo "configure:5888: checking "for statfs.f_bavail"" >&5 +echo "configure:5891: 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 @@ -5893,7 +5896,7 @@ else wine_cv_statfs_bavail=no else cat > conftest.$ac_ext <<EOF -#line 5897 "configure" +#line 5900 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5920,7 +5923,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wine_cv_statfs_bavail=yes else @@ -5945,12 +5948,12 @@ fi echo $ac_n "checking "for msg_accrights in struct msghdr"""... $ac_c" 1>&6 -echo "configure:5949: checking "for msg_accrights in struct msghdr"" >&5 +echo "configure:5952: 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 <<EOF -#line 5954 "configure" +#line 5957 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5958,7 +5961,7 @@ int main() { struct msghdr hdr; hdr.msg_accrights=0 ; return 0; } EOF -if { (eval echo configure:5962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_msg_accrights="yes" else @@ -5981,12 +5984,12 @@ fi echo $ac_n "checking "for sun_len in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:5985: checking "for sun_len in struct sockaddr_un"" >&5 +echo "configure:5988: checking "for sun_len in struct sockaddr_un"" >&5 if eval "test \"`echo '$''{'ac_cv_c_sun_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5990 "configure" +#line 5993 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -5995,7 +5998,7 @@ int main() { static struct sockaddr_un addr; addr.sun_len = 1 ; return 0; } EOF -if { (eval echo configure:5999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_sun_len="yes" else @@ -6018,12 +6021,12 @@ fi echo $ac_n "checking "whether we need to define __i386__"""... $ac_c" 1>&6 -echo "configure:6022: checking "whether we need to define __i386__"" >&5 +echo "configure:6025: 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 <<EOF -#line 6027 "configure" +#line 6030 "configure" #include "confdefs.h" #if (defined(i386) || defined(__i386)) && !defined(__i386__) yes diff --git a/configure.in b/configure.in index 2324bf9ea1d..020151b73fe 100644 --- a/configure.in +++ b/configure.in @@ -110,9 +110,11 @@ AC_CHECK_HEADERS(dlfcn.h, AC_DEFINE(HAVE_DL_API), AC_CHECK_LIB(dl,dlopen, AC_DEFINE(HAVE_DL_API) - LIBS="$LIBS -ldl" + LIBS="$LIBS -ldl", + LIBEXT="a" ) - ) + ), + LIBEXT="a" ) AC_SUBST(XLIB) AC_SUBST(X_SRCS) @@ -467,12 +469,13 @@ fi DLLFLAGS="" BUILDFLAGS="" -DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine" if test "$LIBEXT" = "so"; then BUILDFLAGS="-pic" DLLFLAGS="-fPIC" + DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine" else + DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine \$(X_LIBS) \$(XLIB)" AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)], ac_cv_c_whole_archive, [saved_cflags=$CFLAGS diff --git a/debugger/Makefile.in b/debugger/Makefile.in index a6d15b98475..692fe4d42dd 100644 --- a/debugger/Makefile.in +++ b/debugger/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winedbg -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) WRCEXTRA = -A -p $* C_SRCS = \ @@ -45,6 +44,6 @@ lex.yy.c: debug.l $(LEX) -8 -I $(SRCDIR)/debug.l winedbg: $(OBJS) - $(CC) -o $@ $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o $@ $(OBJS) $(DLL_LINK) $(LIBS) ### Dependencies: diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 67f9391a2bf..a9331c8d899 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -5,6 +5,7 @@ # SOVERSION : version of the .so file # ALTNAMES : alternate names for this dll (optional) # IMPORTS : dlls to import (optional) +# EXTRALIBS : extra libraries to link in (optional) # # plus all variables required by the global Make.rules.in # @@ -23,7 +24,7 @@ all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%=lib%.$(LIBEXT)) # Rules for .so files lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in - $(LDSHARED) $(OBJS) -o $@ + $(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS) $(ALLNAMES): lib$(MODULE).so.$(SOVERSION) $(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@ @@ -43,7 +44,7 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT)) checklink:: 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 + $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine $(EXTRALIBS) $(LIBS) && $(RM) checklink $(IMPORTLIBS): dummy @cd $(DLLDIR) && $(MAKE) `basename $@` diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8e175e806d5..f976c99415c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -305,6 +305,30 @@ libwsock32.@LIBEXT@ libwinsock.@LIBEXT@: winsock/libwsock32.@LIBEXT@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@ $(RM) $@ && $(LN_S) x11drv/libx11drv.@LIBEXT@ $@ +# Inter-dll dependencies (only necessary for .so) + +avifil32/libavifil32.so: libmsvfw32.so libwinmm.so +commdlg/libcomdlg32.so: libwinspool.so +ddraw/libddraw.so: libx11drv.so +dplayx/libdplayx.so: libole32.so +msvideo/libmsvfw32.so: libwinmm.so +oleaut32/liboleaut32.so: libole32.so libcomctl32.so +olecli/libolecli32.so: libolesvr32.so libole32.so +olepro32/libolepro32.so: liboleaut32.so libole32.so +shell32/libshell32.so: libole32.so +urlmon/liburlmon.so: libole32.so +version/libversion.so: liblz32.so +winmm/joystick/libjoystick.drv.so: libwinmm.so +winmm/mcianim/libmcianim.drv.so: libwinmm.so +winmm/mciavi/libmciavi.drv.so: libwinmm.so +winmm/mcicda/libmcicda.drv.so: libwinmm.so +winmm/mciseq/libmciseq.drv.so: libwinmm.so +winmm/mciwave/libmciwave.drv.so: libwinmm.so +winmm/midimap/libmidimap.drv.so: libwinmm.so +winmm/wavemap/libmsacm.drv.so: libwinmm.so +winmm/wineoss/libwineoss.drv.so: libwinmm.so + + $(DLLFILES): dummy @cd `dirname $@` && $(MAKE) diff --git a/dlls/commdlg/comdlg32.spec b/dlls/commdlg/comdlg32.spec index d2a80f91cfd..375eadd5694 100644 --- a/dlls/commdlg/comdlg32.spec +++ b/dlls/commdlg/comdlg32.spec @@ -5,7 +5,7 @@ rsrc comdlg32 import shell32.dll import comctl32.dll -import winspool.dll +import winspool.drv 0 stub ArrowBtnWndProc 1 stdcall ChooseColorA(ptr) ChooseColorA diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 9c6199dacd4..f7f0d16ba89 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -461,7 +461,8 @@ LPVOID WINAPI SHAlloc(DWORD len) DWORD WINAPI SHRegisterDragDrop(HWND hWnd,IDropTarget * pDropTarget) { FIXME("(0x%08x,%p):stub.\n", hWnd, pDropTarget); - return RegisterDragDrop(hWnd, pDropTarget); + if (GetShellOle()) return pRegisterDragDrop(hWnd, pDropTarget); + return 0; } /************************************************************************* diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in index ff208147a22..24568ead432 100644 --- a/dlls/x11drv/Makefile.in +++ b/dlls/x11drv/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = x11drv SOVERSION = 1.0 +EXTRALIBS = $(X_LIBS) $(XLIB) SPEC_SRCS = x11drv.spec diff --git a/if1632/builtin.c b/if1632/builtin.c index c123dc2fa7c..f7805658c84 100644 --- a/if1632/builtin.c +++ b/if1632/builtin.c @@ -183,6 +183,7 @@ BOOL BUILTIN_Init(void) HMODULE16 BUILTIN_LoadModule( LPCSTR name ) { char dllname[16], *p; + void *handle; int i; /* Fix the name in case we have a full path and extension */ @@ -198,9 +199,24 @@ HMODULE16 BUILTIN_LoadModule( LPCSTR name ) const BUILTIN16_DESCRIPTOR *descr = builtin_dlls[i]; NE_MODULE *pModule = (NE_MODULE *)descr->module_start; OFSTRUCT *pOfs = (OFSTRUCT *)((LPBYTE)pModule + pModule->fileinfo); - if (!lstrcmpiA( pOfs->szPathName, dllname )) + if (!strcasecmp( pOfs->szPathName, dllname )) return BUILTIN_DoLoadModule16( descr ); } + + if ((handle = BUILTIN32_dlopen( dllname ))) + { + for (i = 0; i < nb_dlls; i++) + { + const BUILTIN16_DESCRIPTOR *descr = builtin_dlls[i]; + NE_MODULE *pModule = (NE_MODULE *)descr->module_start; + OFSTRUCT *pOfs = (OFSTRUCT *)((LPBYTE)pModule + pModule->fileinfo); + if (!strcasecmp( pOfs->szPathName, dllname )) + return BUILTIN_DoLoadModule16( descr ); + } + ERR( "loaded .so but dll %s still not found\n", dllname ); + BUILTIN32_dlclose( handle ); + } + return (HMODULE16)2; } diff --git a/include/module.h b/include/module.h index a8d6a992fdc..12083e1135c 100644 --- a/include/module.h +++ b/include/module.h @@ -236,5 +236,7 @@ HGLOBAL16 NE_LoadPEResource( NE_MODULE *pModule, WORD type, LPVOID bits, DWORD s extern WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR name, DWORD flags); extern HMODULE BUILTIN32_LoadExeModule( LPCSTR *filename ); extern void BUILTIN32_UnloadLibrary(WINE_MODREF *wm); +extern void *BUILTIN32_dlopen( const char *name ); +extern int BUILTIN32_dlclose( void *handle ); #endif /* __WINE_MODULE_H */ diff --git a/libtest/Makefile.in b/libtest/Makefile.in index a04f2472969..d0fcb832023 100644 --- a/libtest/Makefile.in +++ b/libtest/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) WRCEXTRA = -s -p $* SPEC_SRCS = \ @@ -27,33 +26,33 @@ all: check_wrc $(PROGRAMS) @MAKE_RULES@ expand: expand.o expand.spec.o - $(CC) -o expand $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o expand $+ -L$(DLLDIR) -llz32 $(DLL_LINK) $(LIBS) hello: hello.o hello.spec.o - $(CC) -o hello $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o hello $+ $(DLL_LINK) $(LIBS) hello2: hello2.o hello2.spec.o - $(CC) -o hello2 $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o hello2 $+ $(DLL_LINK) $(LIBS) hello3: hello3.o hello3.spec.o hello3res.o - $(CC) -o hello3 $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o hello3 $+ -L$(DLLDIR) -lcomdlg32 -lwinspool $(DLL_LINK) $(LIBS) hello4: hello4.o hello4.spec.o - $(CC) -o hello4 $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o hello4 $+ $(DLL_LINK) $(LIBS) hello5: hello5.o hello5.spec.o - $(CC) -o hello5 $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o hello5 $+ $(DLL_LINK) $(LIBS) new: new.o new.spec.o - $(CC) -o new $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o new $+ $(DLL_LINK) $(LIBS) rolex: rolex.o rolex.spec.o - $(CC) -o rolex $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o rolex $+ $(DLL_LINK) $(LIBS) vartest: vartest.o vartest.spec.o - $(CC) -o vartest $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o vartest $+ -L$(DLLDIR) -loleaut32 -lole32 $(DLL_LINK) $(LIBS) volinfo: volinfo.o volinfo.spec.o - $(CC) -o volinfo $+ $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o volinfo $+ $(DLL_LINK) $(LIBS) ### Dependencies: diff --git a/libtest/hello3res.rc b/libtest/hello3res.rc index 9b7d2d7e80d..3e9110599f0 100644 --- a/libtest/hello3res.rc +++ b/libtest/hello3res.rc @@ -9,7 +9,7 @@ MAIN MENU } } -BITDEMO BITMAP "../rc/winelogo.bmp" +/*BITDEMO BITMAP "../rc/winelogo.bmp"*/ DIADEMO DIALOG 20, 20, 179, 118 STYLE DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_VISIBLE | WS_SYSMENU diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 09f90aea926..63d8d24cd31 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = icinfo aviinfo aviplay -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = msvfw32 winmm ddraw x11drv WRCEXTRA = -s -p $* SPEC_SRCS = \ @@ -18,13 +18,13 @@ all: check_wrc $(PROGRAMS) @MAKE_RULES@ icinfo: icinfo.o icinfo.spec.o - $(CC) -o icinfo icinfo.o icinfo.spec.o $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o icinfo icinfo.o icinfo.spec.o $(DLL_LINK) $(LIBS) aviinfo: aviinfo.o aviinfo.spec.o - $(CC) -o aviinfo aviinfo.o aviinfo.spec.o $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o aviinfo aviinfo.o aviinfo.spec.o $(DLL_LINK) $(LIBS) aviplay: aviplay.o aviplay.spec.o - $(CC) -o aviplay aviplay.o aviplay.spec.o $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o aviplay aviplay.o aviplay.spec.o $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) icinfo $(bindir)/icinfo diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 4419c11c436..ab98afd9582 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = clock -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 comdlg32 ole32 winspool WRCEXTRA = -s -p clock LICENSELANG = En @@ -31,7 +31,7 @@ all: check_wrc $(PROGRAMS) clock: $(OBJS) - $(CC) -o clock $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o clock $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) clock $(bindir)/clock diff --git a/programs/cmdlgtst/Makefile.in b/programs/cmdlgtst/Makefile.in index 07b497866af..89d526d142b 100644 --- a/programs/cmdlgtst/Makefile.in +++ b/programs/cmdlgtst/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = cmdlgtst -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = comdlg32 winspool WRCEXTRA = -s -p cmdlgtst C_SRCS = \ @@ -22,7 +22,7 @@ all: check_wrc $(PROGRAMS) @MAKE_RULES@ cmdlgtst: $(OBJS) - $(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o cmdlgtst $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index 70e98d0d381..2682f5c488d 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = control -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 ole32 C_SRCS = control.c @@ -16,7 +16,7 @@ all: $(PROGRAMS) @MAKE_RULES@ control: $(OBJS) - $(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o control $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) control $(bindir)/control diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index a83922bfb4b..31e08f44645 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = notepad -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 ole32 comdlg32 winspool WRCEXTRA = -s -p notepad LICENSELANG = En @@ -31,7 +31,7 @@ all: check_wrc $(PROGRAMS) $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s notepad: $(OBJS) - $(CC) -o notepad $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o notepad $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) notepad $(bindir)/notepad diff --git a/programs/osversioncheck/Makefile.in b/programs/osversioncheck/Makefile.in index bf361c713f3..39339a8c9ba 100644 --- a/programs/osversioncheck/Makefile.in +++ b/programs/osversioncheck/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = osversioncheck -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) C_SRCS = osversioncheck.c @@ -16,7 +15,7 @@ all: $(PROGRAMS) @MAKE_RULES@ osversioncheck: $(OBJS) - $(CC) -o osversioncheck $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o osversioncheck $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) osversioncheck $(bindir)/osversioncheck diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index f69ce7c4fd6..808e1e38e0c 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = progman -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 comdlg32 ole32 winspool WRCEXTRA = -s -p progman LICENSELANG = En @@ -33,7 +33,7 @@ all: check_wrc $(PROGRAMS) $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s progman: $(OBJS) - $(CC) -o progman $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o progman $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) progman $(bindir)/progman diff --git a/programs/regapi/Makefile.in b/programs/regapi/Makefile.in index d3d8127a8ea..998d1a74526 100644 --- a/programs/regapi/Makefile.in +++ b/programs/regapi/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = regapi -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) C_SRCS = \ regapi.c @@ -18,7 +17,7 @@ all: $(PROGRAMS) @MAKE_RULES@ regapi: $(OBJS) - $(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o regapi $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) regapi $(bindir)/regapi diff --git a/programs/regtest/Makefile.in b/programs/regtest/Makefile.in index 1cc86f1641d..c129fee1936 100644 --- a/programs/regtest/Makefile.in +++ b/programs/regtest/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = regtest -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) C_SRCS = regtest.c @@ -16,7 +15,7 @@ all: $(PROGRAMS) @MAKE_RULES@ regtest: $(OBJS) - $(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o regtest $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) regtest $(bindir)/regtest diff --git a/programs/view/Makefile.in b/programs/view/Makefile.in index f34739ed78a..d330ae35126 100644 --- a/programs/view/Makefile.in +++ b/programs/view/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = view -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = comdlg32 winspool WRCEXTRA = -s -p view C_SRCS = \ @@ -24,7 +24,7 @@ all: check_wrc $(PROGRAMS) @MAKE_RULES@ view: $(OBJS) - $(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o view $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) view $(bindir)/view diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in index 2da5eb1d29f..882307136ca 100644 --- a/programs/wcmd/Makefile.in +++ b/programs/wcmd/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = wcmd -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) WRCEXTRA = -s -p wcmd C_SRCS = \ @@ -25,7 +24,7 @@ all: check_wrc $(PROGRAMS) @MAKE_RULES@ wcmd: $(OBJS) - $(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o wcmd $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) wcmd $(bindir)/wcmd diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index ddd4d012fb6..7c9b943ab23 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -5,7 +5,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winemine -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) WRCEXTRA = -s -p winemine LICENSELANG = En @@ -28,7 +27,7 @@ all: check_wrc $(PROGRAMS) $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s winemine: $(OBJS) - $(CC) -o winemine $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o winemine $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) winemine $(bindir)/winemine diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index 9d0d9c7ebeb..fc82eb6838a 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winhelp hlp2sgml -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 ole32 comdlg32 winspool WRCEXTRA = -s -p winhelp C_SRCS = \ @@ -32,7 +32,7 @@ depend: y.tab.h $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s winhelp: $(OBJS) - $(CC) -o winhelp $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o winhelp $(OBJS) $(DLL_LINK) $(LIBS) hlp2sgml: hlp2sgml.o hlpfile.o $(CC) -o hlp2sgml hlp2sgml.o hlpfile.o diff --git a/programs/winver/Makefile.in b/programs/winver/Makefile.in index b8b34468881..bc031afadb7 100644 --- a/programs/winver/Makefile.in +++ b/programs/winver/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none PROGRAMS = winver -ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS) +IMPORTS = shell32 ole32 C_SRCS = winver.c @@ -16,7 +16,7 @@ all: $(PROGRAMS) @MAKE_RULES@ winver: $(OBJS) - $(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS) + $(CC) -o winver $(OBJS) $(DLL_LINK) $(LIBS) install:: $(INSTALL_PROGRAM) winver $(bindir)/winver diff --git a/relay32/builtin32.c b/relay32/builtin32.c index bed350a3c96..e771460bd0e 100644 --- a/relay32/builtin32.c +++ b/relay32/builtin32.c @@ -4,14 +4,21 @@ * Copyright 1997 Alexandre Julliard */ +#include "config.h" + #include <assert.h> #include <string.h> #include <stdio.h> #include <ctype.h> +#ifdef HAVE_DL_API +#include <dlfcn.h> +#endif + #include "windef.h" #include "wingdi.h" #include "winuser.h" #include "builtin32.h" +#include "elfdll.h" #include "neexe.h" #include "heap.h" #include "main.h" @@ -74,6 +81,39 @@ static void BUILTIN32_WarnSecondInstance( const char *name ) } } +/*********************************************************************** + * BUILTIN32_dlopen + */ +void *BUILTIN32_dlopen( const char *name ) +{ +#ifdef HAVE_DL_API + void *handle; + char buffer[128], *p; + if ((p = strrchr( name, '/' ))) name = p + 1; + if ((p = strrchr( name, '\\' ))) name = p + 1; + sprintf( buffer, "lib%s", name ); + for (p = buffer; *p; p++) *p = tolower(*p); + if ((p = strrchr( buffer, '.' )) && (!strcmp( p, ".dll" ) || !strcmp( p, ".exe" ))) *p = 0; + strcat( buffer, ".so" ); + + if (!(handle = ELFDLL_dlopen( buffer, RTLD_NOW ))) + ERR( "failed to load %s: %s\n", buffer, dlerror() ); + return handle; +#else + return NULL; +#endif +} + +/*********************************************************************** + * BUILTIN32_dlclose + */ +int BUILTIN32_dlclose( void *handle ) +{ +#ifdef HAVE_DL_API + return dlclose( handle ); +#endif +} + /*********************************************************************** * BUILTIN32_DoLoadImage * @@ -357,6 +397,7 @@ WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR path, DWORD flags) NE_MODULE *pModule; WINE_MODREF *wm; char dllname[MAX_PATH], *p; + void *handle; int i; /* Fix the name in case we have a full path and extension */ @@ -368,14 +409,20 @@ WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR path, DWORD flags) /* Search built-in descriptor */ for (i = 0; i < nb_dlls; i++) - if (!lstrcmpiA( builtin_dlls[i]->filename, dllname )) break; + if (!strcasecmp( builtin_dlls[i]->filename, dllname )) goto found; - if (i == nb_dlls) + if ((handle = BUILTIN32_dlopen( dllname ))) { - SetLastError( ERROR_FILE_NOT_FOUND ); - return NULL; + for (i = 0; i < nb_dlls; i++) + if (!strcasecmp( builtin_dlls[i]->filename, dllname )) goto found; + ERR( "loaded .so but dll %s still not found\n", dllname ); + BUILTIN32_dlclose( handle ); } + SetLastError( ERROR_FILE_NOT_FOUND ); + return NULL; + + found: /* Load built-in module */ if (!dll_modules[i]) { @@ -418,8 +465,6 @@ WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR path, DWORD flags) */ HMODULE BUILTIN32_LoadExeModule( LPCSTR *filename ) { - HMODULE16 hModule16; - NE_MODULE *pModule; int i, exe = -1; /* Search built-in EXE descriptor */ diff --git a/wine.ini b/wine.ini index d6ce44545b8..c2b45fba174 100644 --- a/wine.ini +++ b/wine.ini @@ -55,7 +55,6 @@ System=c:\windows\system Temp=e:\ Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ Profile=c:\windows\Profiles\Administrator -SymbolTableFile=./wine.sym # <wineconf> -- GitLab