[PATCH] winemaker + DLL paths

Martin Wilck Martin.Wilck at fujitsu-siemens.com
Mon Apr 8 09:55:06 CDT 2002


I found that winemaker-generated configure scripts bail out with recent
CVS versions of wine. The appended patch fixes this.

It may be not exactly what the winemaker authors intended, but at least
it generates working configure scripts for me.

Martin

-- 
Martin Wilck                Phone: +49 5251 8 15113
Fujitsu Siemens Computers   Fax:   +49 5251 8 20409
Heinz-Nixdorf-Ring 1	    mailto:Martin.Wilck at Fujitsu-Siemens.com
D-33106 Paderborn           http://www.fujitsu-siemens.com/primergy

--- tools/winemaker.OLD	Tue Apr  2 16:51:51 2002
+++ tools/winemaker	Mon Apr  8 16:45:17 2002
@@ -2732,14 +2732,14 @@
     WINE_DLL_ROOT="/lib:/lib/dlls:/usr/lib:/usr/lib/dlls:/usr/local/lib:/usr/local/lib/dlls"
   fi
 fi
-AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.so],[
-  AC_MSG_ERROR([Could not find the Wine dlls (libntdll.so)])
+AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.dll.so],[
+  AC_MSG_ERROR([Could not find the Wine dlls (libntdll.dll.so)])
 ],[$WINE_DLL_ROOT])

-AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[
-  AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.so)])
+AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[
+  AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.dll.so)])
 ],[$WINE_DLL_ROOT])
-WINE_DLL_PATH="-L$WINE_DLL_ROOT"
+WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine"

 if test -n "$LD_PATH"
 then






More information about the wine-devel mailing list