commit a851854a36b979979907f04342dc74dab82ae6ee
author Alexandre Julliard <julliard@winehq.org> Mon Jul 09 22:43:45 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 09 22:43:45 2007 +0200
tree 97dd4cf97ec31695b3ac5317a24e2705ddf4a484
parent 24a55f38629a08bc55885dc2db7f4407632d017e

configure: Merge the libX11 and libXext existence check with the soname check.

configure.ac

diff --git a/configure.ac b/configure.ac
index 3246f4a..0240fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,6 +481,9 @@
     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])
+
     dnl *** All of the following tests require X11/Xlib.h
     AC_CHECK_HEADERS([X11/Xlib.h \
                       X11/XKBlib.h \
@@ -547,7 +550,7 @@
         fi
 
         dnl *** Check for Transform functions in Xrender
-        if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes"
+        if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x"
         then
             WINE_CHECK_SONAME(Xrender,XRenderQueryExtension,
               [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,
@@ -1139,9 +1142,6 @@
 
 AC_DEFINE_UNQUOTED(SONAME_EXT,[".$LIBEXT"],[Define to the file extension of shared libraries.])
 
-WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS])
-WINE_CHECK_SONAME(Xext,XextCreateExtension,,,[$X_LIBS -lX11 $X_EXTRA_LIBS])
-
 
 dnl **** Check for functions ****