configure: Don't assume libXext is available.
This commit is contained in:
Alexandre Julliard
parent
a35652d654
commit
fd03c50693
|
|
@ -7674,7 +7674,7 @@ fi
|
|||
|
||||
if test "$have_x" = "yes"
|
||||
then
|
||||
XLIB="-lXext -lX11"
|
||||
XLIB="-lX11"
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
|
|
@ -7776,7 +7776,7 @@ cat >>confdefs.h <<_ACEOF
|
|||
#define SONAME_LIBXEXT "$ac_cv_lib_soname_Xext"
|
||||
_ACEOF
|
||||
|
||||
|
||||
XLIB="-lXext $XLIB"
|
||||
fi
|
||||
|
||||
for ac_header in X11/Xlib.h \
|
||||
|
|
@ -7819,7 +7819,7 @@ if test "${ac_cv_lib_X11_XkbQueryExtension+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lX11 $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lX11 $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -7865,7 +7865,7 @@ if test "${ac_cv_lib_soname_Xcursor+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXcursor $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXcursor $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -7927,7 +7927,7 @@ if test "${ac_cv_lib_soname_Xi+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXi $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXi $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -7989,7 +7989,7 @@ if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8043,7 +8043,7 @@ if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lXext $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8097,7 +8097,7 @@ if test "${ac_cv_lib_soname_Xxf86vm+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXxf86vm $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXxf86vm $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8159,7 +8159,7 @@ if test "${ac_cv_lib_soname_Xrender+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8207,7 +8207,7 @@ if test "${ac_cv_lib_Xrender_XRenderSetPictureTransform+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lXrender $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXrender $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8276,7 +8276,7 @@ if test "${ac_cv_lib_soname_Xrandr+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXrandr $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXrandr $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8353,7 +8353,7 @@ if test "${ac_cv_lib_soname_Xinerama+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXinerama $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXinerama $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8417,7 +8417,7 @@ if test "${ac_cv_lib_soname_Xcomposite+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lXcomposite $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lXcomposite $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8542,7 +8542,7 @@ if test "${ac_cv_lib_soname_GL+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lGL $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8581,7 +8581,7 @@ if test "${ac_cv_lib_soname_GL+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lGL $X_LIBS -lXext -lX11 -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 $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"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8655,7 +8655,7 @@ if test "${ac_cv_lib_soname_GLU+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_soname_save_LIBS=$LIBS
|
||||
LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8759,7 +8759,7 @@ if test "${ac_cv_lib_audio_AuCreateFlow+set}" = set; then :
|
|||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"
|
||||
LIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
|
@ -8830,9 +8830,9 @@ fi
|
|||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauGetBestAuthByAddr" >&5
|
||||
$as_echo "$ac_cv_lib_Xau_XauGetBestAuthByAddr" >&6; }
|
||||
if test "x$ac_cv_lib_Xau_XauGetBestAuthByAddr" = x""yes; then :
|
||||
NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
|
||||
NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"
|
||||
else
|
||||
NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
|
||||
NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
|||
36
configure.ac
36
configure.ac
|
|
@ -776,12 +776,12 @@ AC_PATH_XTRA
|
|||
|
||||
if test "$have_x" = "yes"
|
||||
then
|
||||
XLIB="-lXext -lX11"
|
||||
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,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(Xext,XextCreateExtension,[XLIB="-lXext $XLIB"],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
||||
|
||||
dnl *** All of the following tests require X11/Xlib.h
|
||||
AC_CHECK_HEADERS([X11/Xlib.h \
|
||||
|
|
@ -808,13 +808,13 @@ then
|
|||
then
|
||||
AC_CHECK_LIB(X11, XkbQueryExtension,
|
||||
AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,
|
||||
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||
$X_LIBS $XLIB $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 -lXext -lX11 $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -822,7 +822,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 -lXext -lX11 $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -832,7 +832,7 @@ then
|
|||
then
|
||||
AC_CHECK_LIB(Xext, XShmQueryExtension,
|
||||
AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
|
||||
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||
$X_LIBS $XLIB $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.])
|
||||
|
|
@ -842,7 +842,7 @@ then
|
|||
then
|
||||
AC_CHECK_LIB(Xext,XShapeQueryExtension,
|
||||
AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
|
||||
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||
$X_LIBS $XLIB $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.])
|
||||
|
|
@ -850,7 +850,7 @@ then
|
|||
dnl *** Check for XFree86 VMODE extension
|
||||
if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -862,7 +862,7 @@ then
|
|||
[AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,
|
||||
[AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1,
|
||||
[Define if Xrender has the XRenderSetPictureTransform function])],,
|
||||
[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])],,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
|
||||
[$X_LIBS $XLIB $X_EXTRA_LIBS])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])
|
||||
|
||||
fi
|
||||
WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"],
|
||||
|
|
@ -873,7 +873,7 @@ then
|
|||
then
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func;]])],
|
||||
[WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
|
||||
[WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -883,7 +883,7 @@ then
|
|||
then
|
||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])],
|
||||
[WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
|
||||
[WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -891,7 +891,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 -lXext -lX11 $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $XLIB $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.])
|
||||
|
|
@ -936,11 +936,11 @@ 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 -lXext -lX11 -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 -lXext -lX11 -lm $X_EXTRA_LIBS)
|
||||
$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)
|
||||
if test "$ac_cv_header_GL_glu_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS])
|
||||
WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
|
||||
fi
|
||||
WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"],
|
||||
[libGLU ${notice_platform}development files not found, GLU won't be supported.])
|
||||
|
|
@ -966,11 +966,11 @@ OpenGL and Direct3D won't be supported.])
|
|||
AC_CHECK_LIB(audio,AuCreateFlow,
|
||||
[AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
|
||||
AC_CHECK_LIB(Xau,XauGetBestAuthByAddr,
|
||||
[NASLIBS="-lXau -laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],
|
||||
[NASLIBS="-laudio -lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS"],
|
||||
[NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
|
||||
[NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
|
||||
[$X_LIBS])
|
||||
],,
|
||||
[-lXt $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])])
|
||||
[-lXt $X_LIBS $XLIB $X_EXTRA_LIBS])])
|
||||
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue