Rafał Mużyło : configure: Don' t use X_PRE_LIBS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bb50d6fd9512a9a05306c56112bbcdc6de6c8d65
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bb50d6fd9512a9a05306c56112...

Author: Rafał Mużyło 
Date:   Wed Sep  4 21:57:45 2013 +0200

configure: Don't use X_PRE_LIBS.

---

configure                    |    4 ++--
 configure.ac                 |    4 ++--
 dlls/glu32/Makefile.in       |    2 +-
 dlls/winex11.drv/Makefile.in |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 6b2c2c8..3143509 100755
--- a/configure
+++ b/configure
@@ -9308,7 +9308,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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
+LIBS="-lGLU $OPENGL_LIBS $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

@@ -9360,7 +9360,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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
+LIBS="-lOSMesa $X_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */

diff --git a/configure.ac b/configure.ac
index 7c1cb1c..7b662b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1206,14 +1206,14 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
    	     $X_LIBS $XLIB -lm $X_EXTRA_LIBS)
         if test "x$with_glu" != "xno"
         then
-            AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
+            AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $XLIB -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 $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $XLIB -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
diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in
index df2b39e..21a6b85 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@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
+EXTRALIBS = -lGLU @OPENGL_LIBS@ @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@

C_SRCS = \
    glu.c
diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in
index 194c409..35553f3 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@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
+EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@

C_SRCS = \
    bitblt.c \