configure: Don't use X_PRE_LIBS.
This commit is contained in:
parent
74b191a605
commit
bb50d6fd95
|
@ -9308,7 +9308,7 @@ if ${ac_cv_lib_GLU_gluLookAt+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
ac_check_lib_save_LIBS=$LIBS
|
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
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
@ -9360,7 +9360,7 @@ if ${ac_cv_lib_soname_OSMesa+:} false; then :
|
||||||
$as_echo_n "(cached) " >&6
|
$as_echo_n "(cached) " >&6
|
||||||
else
|
else
|
||||||
ac_check_soname_save_LIBS=$LIBS
|
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
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
|
|
@ -1206,14 +1206,14 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
|
||||||
$X_LIBS $XLIB -lm $X_EXTRA_LIBS)
|
$X_LIBS $XLIB -lm $X_EXTRA_LIBS)
|
||||||
if test "x$with_glu" != "xno"
|
if test "x$with_glu" != "xno"
|
||||||
then
|
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],
|
WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_GLU_gluLookAt" != xyes],
|
||||||
[libGLU ${notice_platform}development files not found, GLU won't be supported.])
|
[libGLU ${notice_platform}development files not found, GLU won't be supported.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "x$with_osmesa" != "xno"
|
if test "x$with_osmesa" != "xno"
|
||||||
then
|
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"],
|
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.])
|
[libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
MODULE = glu32.dll
|
MODULE = glu32.dll
|
||||||
IMPORTLIB = glu32
|
IMPORTLIB = glu32
|
||||||
EXTRAINCL = @X_CFLAGS@
|
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 = \
|
C_SRCS = \
|
||||||
glu.c
|
glu.c
|
||||||
|
|
|
@ -2,7 +2,7 @@ MODULE = winex11.drv
|
||||||
IMPORTS = uuid user32 gdi32 advapi32
|
IMPORTS = uuid user32 gdi32 advapi32
|
||||||
DELAYIMPORTS = comctl32 ole32 shell32 imm32
|
DELAYIMPORTS = comctl32 ole32 shell32 imm32
|
||||||
EXTRAINCL = @X_CFLAGS@
|
EXTRAINCL = @X_CFLAGS@
|
||||||
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
|
EXTRALIBS = @X_LIBS@ @XLIB@ @X_EXTRA_LIBS@
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
bitblt.c \
|
bitblt.c \
|
||||||
|
|
Loading…
Reference in New Issue