Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
376ec88e
Commit
376ec88e
authored
25 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add $X_EXTRA_LIBS to any X dependend checks or they will fail if some
of the $X_EXTRA_LIBS are required.
parent
9dded144
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+9
-9
9 additions, 9 deletions
configure
configure.in
+9
-9
9 additions, 9 deletions
configure.in
with
18 additions
and
18 deletions
configure
+
9
−
9
View file @
376ec88e
...
@@ -2869,7 +2869,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -2869,7 +2869,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lXpm
$X_LIBS
-lXext -lX11
$LIBS
"
LIBS
=
"-lXpm
$X_LIBS
-lXext -lX11
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 2875 "configure"
#line 2875 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -2969,7 +2969,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -2969,7 +2969,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lXext
$X_LIBS
-lXext -lX11
$LIBS
"
LIBS
=
"-lXext
$X_LIBS
-lXext -lX11
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 2975 "configure"
#line 2975 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3055,7 +3055,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3055,7 +3055,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lXxf86dga
$X_LIBS
-lXext -lX11
$LIBS
"
LIBS
=
"-lXxf86dga
$X_LIBS
-lXext -lX11
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3061 "configure"
#line 3061 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3100,7 +3100,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3100,7 +3100,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lXxf86dga
$X_LIBS
-lXext -lX11
$LIBS
"
LIBS
=
"-lXxf86dga
$X_LIBS
-lXext -lX11
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3106 "configure"
#line 3106 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3188,7 +3188,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3188,7 +3188,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lXxf86vm
$X_LIBS
-lXext -lX11
$LIBS
"
LIBS
=
"-lXxf86vm
$X_LIBS
-lXext -lX11
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3194 "configure"
#line 3194 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3306,7 +3306,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3306,7 +3306,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lGL
$X_LIBS
-lXext -lX11 -lm
$LIBS
"
LIBS
=
"-lGL
$X_LIBS
-lXext -lX11 -lm
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3312 "configure"
#line 3312 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3351,7 +3351,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3351,7 +3351,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lMesaGL
$X_LIBS
-lXext -lX11 -lm
$LIBS
"
LIBS
=
"-lMesaGL
$X_LIBS
-lXext -lX11 -lm
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3357 "configure"
#line 3357 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3426,7 +3426,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3426,7 +3426,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lMesaGL
$X_LIBS
-lXext -lX11 -lm
$LIBS
"
LIBS
=
"-lMesaGL
$X_LIBS
-lXext -lX11 -lm
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3432 "configure"
#line 3432 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
@@ -3470,7 +3470,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
...
@@ -3470,7 +3470,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo
$ac_n
"(cached)
$ac_c
"
1>&6
echo
$ac_n
"(cached)
$ac_c
"
1>&6
else
else
ac_save_LIBS
=
"
$LIBS
"
ac_save_LIBS
=
"
$LIBS
"
LIBS
=
"-lGL
$X_LIBS
-lXext -lX11 -lm
$LIBS
"
LIBS
=
"-lGL
$X_LIBS
-lXext -lX11 -lm
$X_EXTRA_LIBS
$LIBS
"
cat
>
conftest.
$ac_ext
<<
EOF
cat
>
conftest.
$ac_ext
<<
EOF
#line 3476 "configure"
#line 3476 "configure"
#include "confdefs.h"
#include "confdefs.h"
...
...
This diff is collapsed.
Click to expand it.
configure.in
+
9
−
9
View file @
376ec88e
...
@@ -127,7 +127,7 @@ then
...
@@ -127,7 +127,7 @@ then
AC_CHECK_HEADERS(X11/xpm.h)
AC_CHECK_HEADERS(X11/xpm.h)
if test "$ac_cv_header_X11_xpm_h" = "yes"
if test "$ac_cv_header_X11_xpm_h" = "yes"
then
then
AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData,AC_DEFINE(HAVE_LIBXXPM) X_PRE_LIBS="$X_PRE_LIBS -lXpm",,$X_LIBS -lXext -lX11)
AC_CHECK_LIB(Xpm,XpmCreatePixmapFromData,AC_DEFINE(HAVE_LIBXXPM) X_PRE_LIBS="$X_PRE_LIBS -lXpm",,$X_LIBS -lXext -lX11
$X_EXTRA_LIBS
)
else
else
echo "When compiling with X support, you need the Xpm library, or"
echo "When compiling with X support, you need the Xpm library, or"
echo "WINE will not work. This Xpm library is within the following RPM,"
echo "WINE will not work. This Xpm library is within the following RPM,"
...
@@ -147,16 +147,16 @@ then
...
@@ -147,16 +147,16 @@ then
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/XShm.h)
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/XShm.h)
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_XShm_h" = "yes"
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_XShm_h" = "yes"
then
then
AC_CHECK_LIB(Xext,XShmQueryExtension,AC_DEFINE(HAVE_LIBXXSHM),,$X_LIBS -lXext -lX11)
AC_CHECK_LIB(Xext,XShmQueryExtension,AC_DEFINE(HAVE_LIBXXSHM),,$X_LIBS -lXext -lX11
$X_EXTRA_LIBS
)
fi
fi
dnl Check for XFree86 DGA / DGA 2.0 extension
dnl Check for XFree86 DGA / DGA 2.0 extension
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86dga.h)
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
then
then
AC_CHECK_LIB(Xxf86dga,XDGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA2) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11)
AC_CHECK_LIB(Xxf86dga,XDGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA2) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11
$X_EXTRA_LIBS
)
if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
if test "$ac_cv_lib_Xxf86dga_XDGAQueryExtension" = "no"
then
then
AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11)
AC_CHECK_LIB(Xxf86dga,XF86DGAQueryExtension,AC_DEFINE(HAVE_LIBXXF86DGA) X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga",,$X_LIBS -lXext -lX11
$X_EXTRA_LIBS
)
fi
fi
fi
fi
...
@@ -164,7 +164,7 @@ then
...
@@ -164,7 +164,7 @@ then
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86vmode.h)
AC_CHECK_HEADERS(X11/Xlib.h X11/extensions/xf86vmode.h)
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
if test "$ac_cv_header_X11_Xlib_h" = "yes" -a "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes"
then
then
AC_CHECK_LIB(Xxf86vm,XF86VidModeQueryExtension,AC_DEFINE(HAVE_LIBXXF86VM) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm",,$X_LIBS -lXext -lX11)
AC_CHECK_LIB(Xxf86vm,XF86VidModeQueryExtension,AC_DEFINE(HAVE_LIBXXF86VM) X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm",,$X_LIBS -lXext -lX11
$X_EXTRA_LIBS
)
fi
fi
dnl Check for the presence of Mesa
dnl Check for the presence of Mesa
...
@@ -184,10 +184,10 @@ then
...
@@ -184,10 +184,10 @@ then
if test "$wine_cv_mesa_version_OK" = "yes"
if test "$wine_cv_mesa_version_OK" = "yes"
then
then
dnl Check for the presense of the library
dnl Check for the presense of the library
AC_CHECK_LIB(GL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lGL",,$X_LIBS -lXext -lX11 -lm)
AC_CHECK_LIB(GL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lGL",,$X_LIBS -lXext -lX11 -lm
$X_EXTRA_LIBS
)
if test "$ac_cv_lib_GL_glXCreateContext" = "no"
if test "$ac_cv_lib_GL_glXCreateContext" = "no"
then
then
AC_CHECK_LIB(MesaGL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm)
AC_CHECK_LIB(MesaGL,glXCreateContext,AC_DEFINE(HAVE_LIBMESAGL) X_PRE_LIBS="$X_PRE_LIBS -lMesaGL",,$X_LIBS -lXext -lX11 -lm
$X_EXTRA_LIBS
)
fi
fi
dnl Check for the Color Table and Paletted Texture extensions
dnl Check for the Color Table and Paletted Texture extensions
...
@@ -200,9 +200,9 @@ then
...
@@ -200,9 +200,9 @@ then
)
)
if test "$ac_cv_lib_GL_glXCreateContext" = "no"
if test "$ac_cv_lib_GL_glXCreateContext" = "no"
then
then
AC_CHECK_LIB(MesaGL,glColorTableEXT,AC_DEFINE(HAVE_GL_PALETTED_TEXTURE),,$X_LIBS -lXext -lX11 -lm)
AC_CHECK_LIB(MesaGL,glColorTableEXT,AC_DEFINE(HAVE_GL_PALETTED_TEXTURE),,$X_LIBS -lXext -lX11 -lm
$X_EXTRA_LIBS
)
else
else
AC_CHECK_LIB(GL,glColorTableEXT,AC_DEFINE(HAVE_GL_PALETTED_TEXTURE),,$X_LIBS -lXext -lX11 -lm)
AC_CHECK_LIB(GL,glColorTableEXT,AC_DEFINE(HAVE_GL_PALETTED_TEXTURE),,$X_LIBS -lXext -lX11 -lm
$X_EXTRA_LIBS
)
fi
fi
fi
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment