Changelog:
Francois Gouget <fgouget@codeweavers.com>
* tools/winemaker
Fix the Wine detection for when using the Wine source tree
Note:
This code should probably be updated to take into account that ntdll no
longer needs to be imported. There may be a few other changes too.
--
Francois Gouget
fgouget@codeweavers.com
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.44
diff -u -r1.44 winemaker
--- tools/winemaker 6 Sep 2002 18:36:19 -0000 1.44
+++ tools/winemaker 9 Sep 2002 07:40:53 -0000
@@ -2653,6 +2590,8 @@
then
WINE_INCLUDE_ROOT="$WINE_ROOT/include:$WINE_ROOT/include/wine"
WINE_LIBRARY_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/library"
+ WINE_UNICODE_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/unicode"
+ WINE_UUID_ROOT="$WINE_ROOT:$WINE_ROOT/lib:$WINE_ROOT/ole"
WINE_TOOL_PATH="$WINE_ROOT:$WINE_ROOT/bin:$WINE_ROOT/tools/wrc:$WINE_ROOT/tools/winebuild"
WINE_DLL_ROOT="$WINE_ROOT/dlls:$WINE_ROOT/lib"
fi
@@ -2679,6 +2618,8 @@
if test -n "$WINE_LIBRARIES"
then
WINE_LIBRARY_ROOT="$WINE_LIBRARIES"
+ WINE_UNICODE_ROOT="$WINE_LIBRARIES:$WINE_LIBRARIES/unicode:$WINE_LIBRARIES/../unicode"
+ WINE_UUID_ROOT="$WINE_LIBRARIES:$WINE_LIBRARIES/ole:$WINE_LIBRARIES/../ole"
fi
AC_ARG_WITH(wine-dlls,
@@ -2742,13 +2683,49 @@
WINE_LIBRARY_PATH=""
fi
+if test -z "$WINE_UNICODE_ROOT"
+then
+ WINE_UNICODE_ROOT=":/usr/lib/wine:/usr/local/lib:/usr/local/lib/wine:/opt/wine/lib"
+else
+ AC_PATH_FILE(WINE_UNICODE_ROOT,[libwine_unicode.so],[
+ AC_MSG_ERROR([Could not find the Wine libraries (libwine_unicode.so)])
+ ],$WINE_UNICODE_ROOT)
+fi
+AC_PATH_LIBRARY(WINE_UNICODE_ROOT,[-lwine_unicode],[$WINE_LIBRARY_PATH -lwine],[
+ AC_MSG_ERROR([Could not link with the Wine libraries (libwine_unicode.so)])
+],[$WINE_UNICODE_ROOT])
+
+if test -n "$WINE_UNICODE_ROOT" -a "$WINE_UNICODE_ROOT" != "$WINE_LIBRARY_ROOT"
+then
+ WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UNICODE_ROOT"
+ LD_PATH="$LD_PATH:$WINE_UNICODE_ROOT"
+fi
+
+if test -z "$WINE_UUID_ROOT"
+then
+ WINE_UUID_ROOT=":/usr/lib/wine:/usr/local/lib:/usr/local/lib/wine:/opt/wine/lib"
+else
+ AC_PATH_FILE(WINE_UUID_ROOT,[libwine_uuid.a],[
+ AC_MSG_ERROR([Could not find the Wine libraries (libwine_uuid.a)])
+ ],$WINE_UUID_ROOT)
+fi
+AC_PATH_LIBRARY(WINE_UUID_ROOT,[-lwine_uuid],[$WINE_LIBRARY_PATH -lwine],[
+ AC_MSG_ERROR([Could not link with the Wine libraries (libwine_uuid.a)])
+],[$WINE_UUID_ROOT])
+
+if test -n "$WINE_UUID_ROOT" -a "$WINE_UUID_ROOT" != "$WINE_LIBRARY_ROOT"
+then
+ WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$WINE_UUID_ROOT"
+ LD_PATH="$LD_PATH:$WINE_UUID_ROOT"
+fi
+
if test -z "$WINE_DLL_ROOT"
then
if test -n "$WINE_LIBRARY_ROOT"
then
WINE_DLL_ROOT="$WINE_LIBRARY_ROOT:$WINE_LIBRARY_ROOT/dlls"
else
- WINE_DLL_ROOT="/lib:/lib/dlls:/usr/lib:/usr/lib/dlls:/usr/local/lib:/usr/local/lib/dlls"
+ WINE_DLL_ROOT="/lib:/lib/wine:/usr/lib:/usr/lib/wine:/usr/local/lib:/usr/local/lib/wine"
fi
fi
AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.dll.so],[
