From 754b65062ebc3c6905bdc6b94ac653c24fc50244 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 30 Jan 2014 11:47:20 +0100 Subject: [PATCH] configure: Merge the X_LIBS and XLIB variables. --- configure | 42 ++++++++++++++++------------------- configure.ac | 43 +++++++++++++++--------------------- dlls/glu32/Makefile.in | 2 +- dlls/winex11.drv/Makefile.in | 2 +- 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/configure b/configure index 8c0fd16c50d..2f66254bf03 100755 --- a/configure +++ b/configure @@ -713,7 +713,6 @@ DLLPREFIX dlldir CPP OPENGL_LIBS -XLIB ICOTOOL CONVERT RSVG @@ -5903,8 +5902,6 @@ _ACEOF fi -XLIB="" - OPENGL_LIBS="" @@ -9221,7 +9218,6 @@ fi if test "$have_x" = "yes" then - XLIB="-lX11" ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" @@ -9329,8 +9325,9 @@ cat >>confdefs.h <<_ACEOF #define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext" _ACEOF - XLIB="-lXext $XLIB" + X_LIBS="$X_LIBS -lXext" fi + X_LIBS="$X_LIBS -lX11" for ac_header in X11/Xlib.h \ X11/XKBlib.h \ @@ -9373,7 +9370,7 @@ if ${ac_cv_lib_X11_XkbQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lX11 $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9419,7 +9416,7 @@ if ${ac_cv_lib_soname_Xcursor+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXcursor $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXcursor $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9484,7 +9481,7 @@ if ${ac_cv_lib_soname_Xi+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXi $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXi $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9561,7 +9558,7 @@ if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXext $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9615,7 +9612,7 @@ if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXext $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9669,7 +9666,7 @@ if ${ac_cv_lib_soname_Xxf86vm+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXxf86vm $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXxf86vm $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9734,7 +9731,7 @@ if ${ac_cv_lib_soname_Xrender+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXrender $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9785,7 +9782,7 @@ if ${ac_cv_lib_Xrender_XRenderSetPictureTransform+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXrender $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9827,7 +9824,7 @@ if ${ac_cv_lib_Xrender_XRenderCreateLinearGradient+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXrender $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9896,7 +9893,7 @@ if ${ac_cv_lib_soname_Xrandr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXrandr $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXrandr $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9993,7 +9990,7 @@ if ${ac_cv_lib_soname_Xinerama+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXinerama $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXinerama $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10060,7 +10057,7 @@ if ${ac_cv_lib_soname_Xcomposite+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lXcomposite $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +LIBS="-lXcomposite $X_LIBS $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10153,7 +10150,7 @@ if ${ac_cv_lib_soname_GL+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lGL $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" +LIBS="-lGL $X_LIBS -lm $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10195,7 +10192,7 @@ if ${ac_cv_lib_soname_GL+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lGL $X_LIBS $XLIB -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS" +LIBS="-lGL $X_LIBS -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10266,7 +10263,7 @@ if ${ac_cv_lib_GLU_gluLookAt+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lGLU $OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" +LIBS="-lGLU $OPENGL_LIBS $X_LIBS -lm $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10318,7 +10315,7 @@ if ${ac_cv_lib_soname_OSMesa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lOSMesa $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" +LIBS="-lOSMesa $X_LIBS -lm $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10388,12 +10385,11 @@ fi CPPFLAGS="$ac_save_CPPFLAGS" else - XLIB="" X_CFLAGS="" X_LIBS="" enable_winex11_drv=${enable_winex11_drv:-no} fi -if test "x$XLIB" = "x"; then : +if test "x$X_LIBS" = "x"; then : case "x$with_x" in xno) ;; *) as_fn_error $? "X ${notice_platform}development files not found. Wine will be built diff --git a/configure.ac b/configure.ac index 39b4c5178f8..ea73e6a01bb 100644 --- a/configure.ac +++ b/configure.ac @@ -368,7 +368,6 @@ AC_CHECK_LIB(i386,i386_set_ldt) dnl Check for -lossaudio for NetBSD AC_CHECK_LIB(ossaudio,_oss_ioctl) -AC_SUBST(XLIB,"") AC_SUBST(OPENGL_LIBS,"") dnl **** Check for header files **** @@ -1068,12 +1067,12 @@ AC_PATH_XTRA if test "$have_x" = "yes" then - XLIB="-lX11" ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $X_CFLAGS" WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS]) - WINE_CHECK_SONAME(Xext,XextCreateExtension,[XLIB="-lXext $XLIB"],,[$X_LIBS -lX11 $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(Xext,XextCreateExtension,[X_LIBS="$X_LIBS -lXext"],,[$X_LIBS -lX11 $X_EXTRA_LIBS]) + X_LIBS="$X_LIBS -lX11" dnl *** All of the following tests require X11/Xlib.h AC_CHECK_HEADERS([X11/Xlib.h \ @@ -1101,14 +1100,13 @@ then if test "$ac_cv_header_X11_XKBlib_h" = "yes" then AC_CHECK_LIB(X11, XkbQueryExtension, - AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),, - $X_LIBS $XLIB $X_EXTRA_LIBS) + AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,[$X_LIBS $X_EXTRA_LIBS]) fi dnl *** Check for X cursor if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes" then - WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xcursor,[test "x$ac_cv_lib_soname_Xcursor" = "x"], [libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.]) @@ -1116,7 +1114,7 @@ then dnl *** Check for X input extension if test "$ac_cv_header_X11_extensions_XInput_h" = "yes" then - WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"], [libxi ${notice_platform}development files not found, the Xinput extension won't be supported.]) @@ -1132,8 +1130,7 @@ then if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" then AC_CHECK_LIB(Xext, XShmQueryExtension, - AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, - $X_LIBS $XLIB $X_EXTRA_LIBS) + AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"], [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.]) @@ -1142,8 +1139,7 @@ then if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then AC_CHECK_LIB(Xext,XShapeQueryExtension, - AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),, - $X_LIBS $XLIB $X_EXTRA_LIBS) + AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xshape,[test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"], [XShape ${notice_platform}development files not found, XShape won't be supported.]) @@ -1151,7 +1147,7 @@ then dnl *** Check for XFree86 VMODE extension if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes" then - WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xxf86vm,[test "x$ac_cv_lib_soname_Xxf86vm" = "x"], [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.]) @@ -1162,11 +1158,10 @@ then WINE_CHECK_SONAME(Xrender,XRenderQueryExtension, [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform, [AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1, - [Define if Xrender has the XRenderSetPictureTransform function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + [Define if Xrender has the XRenderSetPictureTransform function])],,[$X_LIBS $X_EXTRA_LIBS]) AC_CHECK_LIB(Xrender,XRenderCreateLinearGradient, [AC_DEFINE(HAVE_XRENDERCREATELINEARGRADIENT, 1, - [Define if Xrender has the XRenderCreateLinearGradient function])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])],, - [$X_LIBS $XLIB $X_EXTRA_LIBS]) + [Define if Xrender has the XRenderCreateLinearGradient function])],,[$X_LIBS $X_EXTRA_LIBS])],,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"], @@ -1181,8 +1176,7 @@ then [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include ]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, - [Define if Xrandr has the XRRGetScreenResources function])])],, - [$X_LIBS $XLIB $X_EXTRA_LIBS])]) + [Define if Xrandr has the XRRGetScreenResources function])])],,[$X_LIBS $X_EXTRA_LIBS])]) fi WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], [libxrandr ${notice_platform}development files not found, XRandr won't be supported.]) @@ -1192,7 +1186,7 @@ then then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include #include ]], [[static typeof(XineramaQueryScreens) * func; if (func) return 0;]])], - [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])]) + [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $X_EXTRA_LIBS])]) fi WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"], [libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.]) @@ -1200,7 +1194,7 @@ then dnl *** Check for X Composite extension if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes" then - WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $XLIB $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $X_EXTRA_LIBS]) fi WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"], [libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.]) @@ -1228,18 +1222,18 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c else opengl_msg="No OpenGL library found on this system." fi], - $X_LIBS $XLIB -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], - $X_LIBS $XLIB -lm $X_EXTRA_LIBS) + $X_LIBS -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], + $X_LIBS -lm $X_EXTRA_LIBS) if test "x$with_glu" != "xno" then - AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS]) + AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_GLU_gluLookAt" != xyes], [libGLU ${notice_platform}development files not found, GLU won't be supported.]) fi if test "x$with_osmesa" != "xno" then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -lm $X_EXTRA_LIBS]) + WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS -lm $X_EXTRA_LIBS]) WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) fi @@ -1249,12 +1243,11 @@ OpenGL and Direct3D won't be supported.]) CPPFLAGS="$ac_save_CPPFLAGS" else - XLIB="" X_CFLAGS="" X_LIBS="" enable_winex11_drv=${enable_winex11_drv:-no} fi -WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built +WINE_ERROR_WITH(x,[test "x$X_LIBS" = "x"],[X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 79418f7bee5..9b18cb49c27 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -1,7 +1,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 EXTRAINCL = $(X_CFLAGS) -EXTRALIBS = -lGLU $(OPENGL_LIBS) $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) +EXTRALIBS = -lGLU $(OPENGL_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) C_SRCS = \ glu.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index bc8c5bc6b3d..463eefdcfb7 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -2,7 +2,7 @@ MODULE = winex11.drv IMPORTS = uuid user32 gdi32 advapi32 DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) -EXTRALIBS = $(X_LIBS) @XLIB@ $(X_EXTRA_LIBS) +EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) C_SRCS = \ bitblt.c \