commit e1e75371d908aaae1191256e8329a1b4348f6517
author Alexandre Julliard <julliard@winehq.org> Mon Apr 24 17:17:49 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 24 17:17:49 2000 +0000
tree 8b63482e2075cd8a392ea7fb8ec4fa7f69356a6b
parent 59b0d7b20235a98d9164f22a1dbed94c74d68b71

Implemented on-demand loading of builtin dlls using dlopen().

configure.in

diff --git a/configure.in b/configure.in
index 2324bf9..020151b 100644
--- a/configure.in
+++ b/configure.in
@@ -110,9 +110,11 @@
 		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 @@
 
 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