mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 04:48:36 +00:00
configure: Use AC_CHECK_HEADER for headers that don't need to be in config.h.
This commit is contained in:
Alexandre Julliard
parent
4a4d352441
commit
b5edd14814
208
configure
vendored
208
configure
vendored
|
|
@ -14295,180 +14295,66 @@ printf "%s\n" "#define SONAME_LIBXEXT \"$ac_cv_lib_soname_Xext\"" >>confdefs.h
|
|||
fi
|
||||
X_LIBS="$X_LIBS -lX11"
|
||||
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_Xlib_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_XLIB_H 1" >>confdefs.h
|
||||
xlib_includes="#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>"
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_XKBlib_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_XKBLIB_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/Xutil.h" "ac_cv_header_X11_Xutil_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_Xutil_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_XUTIL_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/Xcursor/Xcursor.h" "ac_cv_header_X11_Xcursor_Xcursor_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_Xcursor_Xcursor_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_XCURSOR_XCURSOR_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/shape.h" "ac_cv_header_X11_extensions_shape_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_shape_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_SHAPE_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput.h" "ac_cv_header_X11_extensions_XInput_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_XInput_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XINPUT_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput2.h" "ac_cv_header_X11_extensions_XInput2_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput2.h" "ac_cv_header_X11_extensions_XInput2_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_XInput2_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XINPUT2_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XShm.h" "ac_cv_header_X11_extensions_XShm_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XShm.h" "ac_cv_header_X11_extensions_XShm_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_XShm_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XSHM_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xcomposite.h" "ac_cv_header_X11_extensions_Xcomposite_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xcomposite_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XCOMPOSITE_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xfixes.h" "ac_cv_header_X11_extensions_Xfixes_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xfixes.h" "ac_cv_header_X11_extensions_Xfixes_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xfixes_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XFIXES_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xinerama_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XINERAMA_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xrandr_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XRANDR_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xrender_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XRENDER_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmode.h" "ac_cv_header_X11_extensions_xf86vmode_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_X11_EXTENSIONS_XF86VMODE_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmproto.h" "ac_cv_header_X11_extensions_xf86vmproto_h" "#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/xf86vmproto.h" "ac_cv_header_X11_extensions_xf86vmproto_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_xf86vmproto_h" = xyes
|
||||
then :
|
||||
|
|
@ -14477,9 +14363,11 @@ then :
|
|||
fi
|
||||
|
||||
|
||||
if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXcursor" >&5
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/Xcursor/Xcursor.h" "ac_cv_header_X11_Xcursor_Xcursor_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_Xcursor_Xcursor_h" = xyes
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXcursor" >&5
|
||||
printf %s "checking for -lXcursor... " >&6; }
|
||||
if test ${ac_cv_lib_soname_Xcursor+y}
|
||||
then :
|
||||
|
|
@ -14533,7 +14421,8 @@ printf "%s\n" "#define SONAME_LIBXCURSOR \"$ac_cv_lib_soname_Xcursor\"" >>confde
|
|||
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_lib_soname_Xcursor" = "x"
|
||||
then :
|
||||
case "x$with_xcursor" in
|
||||
|
|
@ -14545,9 +14434,11 @@ esac
|
|||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXi" >&5
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/XInput.h" "ac_cv_header_X11_extensions_XInput_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_XInput_h" = xyes
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXi" >&5
|
||||
printf %s "checking for -lXi... " >&6; }
|
||||
if test ${ac_cv_lib_soname_Xi+y}
|
||||
then :
|
||||
|
|
@ -14601,7 +14492,8 @@ printf "%s\n" "#define SONAME_LIBXI \"$ac_cv_lib_soname_Xi\"" >>confdefs.h
|
|||
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_lib_soname_Xi" = "x"
|
||||
then :
|
||||
case "x$with_xinput" in
|
||||
|
|
@ -15231,9 +15123,11 @@ esac
|
|||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXcomposite" >&5
|
||||
ac_fn_c_check_header_compile "$LINENO" "X11/extensions/Xcomposite.h" "ac_cv_header_X11_extensions_Xcomposite_h" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_header_X11_extensions_Xcomposite_h" = xyes
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lXcomposite" >&5
|
||||
printf %s "checking for -lXcomposite... " >&6; }
|
||||
if test ${ac_cv_lib_soname_Xcomposite+y}
|
||||
then :
|
||||
|
|
@ -15287,7 +15181,8 @@ printf "%s\n" "#define SONAME_LIBXCOMPOSITE \"$ac_cv_lib_soname_Xcomposite\"" >>
|
|||
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$ac_cv_lib_soname_Xcomposite" = "x"
|
||||
then :
|
||||
case "x$with_xcomposite" in
|
||||
|
|
@ -15299,9 +15194,7 @@ esac
|
|||
|
||||
fi
|
||||
|
||||
ac_fn_c_check_member "$LINENO" "XICCallback" "callback" "ac_cv_member_XICCallback_callback" "#ifdef HAVE_X11_XLIB_H
|
||||
#include <X11/Xlib.h>
|
||||
#endif
|
||||
ac_fn_c_check_member "$LINENO" "XICCallback" "callback" "ac_cv_member_XICCallback_callback" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_member_XICCallback_callback" = xyes
|
||||
then :
|
||||
|
|
@ -15310,9 +15203,7 @@ printf "%s\n" "#define HAVE_XICCALLBACK_CALLBACK 1" >>confdefs.h
|
|||
|
||||
|
||||
fi
|
||||
ac_fn_c_check_member "$LINENO" "XEvent" "xcookie" "ac_cv_member_XEvent_xcookie" "#ifdef HAVE_X11_XLIB_H
|
||||
#include <X11/Xlib.h>
|
||||
#endif
|
||||
ac_fn_c_check_member "$LINENO" "XEvent" "xcookie" "ac_cv_member_XEvent_xcookie" "$xlib_includes
|
||||
"
|
||||
if test "x$ac_cv_member_XEvent_xcookie" = xyes
|
||||
then :
|
||||
|
|
@ -15582,13 +15473,10 @@ fi
|
|||
rm -f conftest.err
|
||||
ac_save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $WAYLAND_CLIENT_CFLAGS"
|
||||
for ac_header in wayland-client.h
|
||||
do :
|
||||
ac_fn_c_check_header_compile "$LINENO" "wayland-client.h" "ac_cv_header_wayland_client_h" "$ac_includes_default"
|
||||
ac_fn_c_check_header_compile "$LINENO" "wayland-client.h" "ac_cv_header_wayland_client_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_wayland_client_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_WAYLAND_CLIENT_H 1" >>confdefs.h
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wl_display_connect in -lwayland-client" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wl_display_connect in -lwayland-client" >&5
|
||||
printf %s "checking for wl_display_connect in -lwayland-client... " >&6; }
|
||||
if test ${ac_cv_lib_wayland_client_wl_display_connect+y}
|
||||
then :
|
||||
|
|
@ -15677,7 +15565,6 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
done
|
||||
CPPFLAGS=$ac_save_CPPFLAGS
|
||||
|
||||
fi
|
||||
|
|
@ -16953,13 +16840,10 @@ fi
|
|||
rm -f conftest.err
|
||||
ac_save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$CPPFLAGS $PULSE_CFLAGS"
|
||||
for ac_header in pulse/pulseaudio.h
|
||||
do :
|
||||
ac_fn_c_check_header_compile "$LINENO" "pulse/pulseaudio.h" "ac_cv_header_pulse_pulseaudio_h" "$ac_includes_default"
|
||||
ac_fn_c_check_header_compile "$LINENO" "pulse/pulseaudio.h" "ac_cv_header_pulse_pulseaudio_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_pulse_pulseaudio_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_PULSE_PULSEAUDIO_H 1" >>confdefs.h
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pa_stream_is_corked in -lpulse" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pa_stream_is_corked in -lpulse" >&5
|
||||
printf %s "checking for pa_stream_is_corked in -lpulse... " >&6; }
|
||||
if test ${ac_cv_lib_pulse_pa_stream_is_corked+y}
|
||||
then :
|
||||
|
|
@ -17005,7 +16889,6 @@ else $as_nop
|
|||
PULSE_LIBS=""
|
||||
fi
|
||||
|
||||
done
|
||||
CPPFLAGS=$ac_save_CPPFLAGS
|
||||
|
||||
fi
|
||||
|
|
@ -17847,13 +17730,7 @@ CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS"
|
|||
ac_fn_c_check_header_compile "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes
|
||||
then :
|
||||
printf "%s\n" "#define HAVE_FONTCONFIG_FONTCONFIG_H 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
|
||||
then
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5
|
||||
printf %s "checking for -lfontconfig... " >&6; }
|
||||
if test ${ac_cv_lib_soname_fontconfig+y}
|
||||
then :
|
||||
|
|
@ -17907,9 +17784,10 @@ printf "%s\n" "#define SONAME_LIBFONTCONFIG \"$ac_cv_lib_soname_fontconfig\"" >>
|
|||
|
||||
|
||||
fi
|
||||
else
|
||||
FONTCONFIG_CFLAGS=""
|
||||
fi
|
||||
else $as_nop
|
||||
FONTCONFIG_CFLAGS=""
|
||||
fi
|
||||
|
||||
CPPFLAGS=$ac_save_CPPFLAGS
|
||||
|
||||
fi
|
||||
|
|
|
|||
58
configure.ac
58
configure.ac
|
|
@ -1176,42 +1176,32 @@ then
|
|||
WINE_CHECK_SONAME(Xext,XextCreateExtension,[X_LIBS="$X_LIBS -lXext"],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
|
||||
X_LIBS="$X_LIBS -lX11"
|
||||
|
||||
xlib_includes="#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>"
|
||||
|
||||
dnl *** All of the following tests require X11/Xlib.h
|
||||
AC_CHECK_HEADERS([X11/Xlib.h \
|
||||
X11/XKBlib.h \
|
||||
X11/Xutil.h \
|
||||
X11/Xcursor/Xcursor.h \
|
||||
X11/extensions/shape.h \
|
||||
X11/extensions/XInput.h \
|
||||
AC_CHECK_HEADERS([X11/extensions/shape.h \
|
||||
X11/extensions/XInput2.h \
|
||||
X11/extensions/XShm.h \
|
||||
X11/extensions/Xcomposite.h \
|
||||
X11/extensions/Xfixes.h \
|
||||
X11/extensions/Xinerama.h \
|
||||
X11/extensions/Xrandr.h \
|
||||
X11/extensions/Xrender.h \
|
||||
X11/extensions/xf86vmode.h \
|
||||
X11/extensions/xf86vmproto.h],,,
|
||||
[#ifdef HAVE_X11_XLIB_H
|
||||
# include <X11/Xlib.h>
|
||||
#endif
|
||||
#ifdef HAVE_X11_XUTIL_H
|
||||
# include <X11/Xutil.h>
|
||||
#endif])
|
||||
[$xlib_includes])
|
||||
|
||||
dnl *** Check for X cursor
|
||||
if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $X_EXTRA_LIBS])
|
||||
fi
|
||||
AC_CHECK_HEADER([X11/Xcursor/Xcursor.h],
|
||||
[WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $X_EXTRA_LIBS])],,
|
||||
[$xlib_includes])
|
||||
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.])
|
||||
|
||||
dnl *** Check for X input extension
|
||||
if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $X_EXTRA_LIBS])
|
||||
fi
|
||||
AC_CHECK_HEADER([X11/extensions/XInput.h],
|
||||
[WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $X_EXTRA_LIBS])],,
|
||||
[$xlib_includes])
|
||||
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.])
|
||||
|
||||
|
|
@ -1299,18 +1289,14 @@ then
|
|||
[libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.])
|
||||
|
||||
dnl *** Check for X Composite extension
|
||||
if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $X_EXTRA_LIBS])
|
||||
fi
|
||||
AC_CHECK_HEADER([X11/extensions/Xcomposite.h],
|
||||
[WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $X_EXTRA_LIBS])],,
|
||||
[$xlib_includes])
|
||||
WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
|
||||
[libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
|
||||
|
||||
dnl *** Check for XICCallback struct
|
||||
AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,
|
||||
[#ifdef HAVE_X11_XLIB_H
|
||||
#include <X11/Xlib.h>
|
||||
#endif])
|
||||
AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,[$xlib_includes])
|
||||
|
||||
dnl *** End of X11/Xlib.h check
|
||||
|
||||
|
|
@ -1363,7 +1349,7 @@ fi
|
|||
if test "x$with_wayland" != "xno"
|
||||
then
|
||||
WINE_PACKAGE_FLAGS(WAYLAND_CLIENT,[wayland-client],,,,
|
||||
[AC_CHECK_HEADERS([wayland-client.h],
|
||||
[AC_CHECK_HEADER([wayland-client.h],
|
||||
[AC_CHECK_LIB(wayland-client,wl_display_connect,
|
||||
[AC_PATH_PROG(WAYLAND_SCANNER,wayland-scanner,
|
||||
[`test -n "$PKG_CONFIG" && $PKG_CONFIG --variable=wayland_scanner wayland-scanner 2>/dev/null`])],
|
||||
|
|
@ -1585,7 +1571,7 @@ dnl **** Check for PulseAudio ****
|
|||
if test "x$with_pulse" != "xno";
|
||||
then
|
||||
WINE_PACKAGE_FLAGS(PULSE,[libpulse],,,,
|
||||
[AC_CHECK_HEADERS(pulse/pulseaudio.h,
|
||||
[AC_CHECK_HEADER([pulse/pulseaudio.h],
|
||||
[AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],[PULSE_LIBS=""],[$PULSE_LIBS])],
|
||||
[PULSE_LIBS=""])])
|
||||
fi
|
||||
|
|
@ -1739,13 +1725,9 @@ dnl **** Check for fontconfig ****
|
|||
if test "x$with_fontconfig" != "xno"
|
||||
then
|
||||
WINE_PACKAGE_FLAGS(FONTCONFIG,[fontconfig],,[$X_CFLAGS],[$X_LIBS],
|
||||
[AC_CHECK_HEADERS([fontconfig/fontconfig.h])
|
||||
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
|
||||
then
|
||||
WINE_CHECK_SONAME(fontconfig,FcInit,,[FONTCONFIG_CFLAGS=""],[$FONTCONFIG_LIBS])
|
||||
else
|
||||
FONTCONFIG_CFLAGS=""
|
||||
fi])
|
||||
[AC_CHECK_HEADER([fontconfig/fontconfig.h],
|
||||
[WINE_CHECK_SONAME(fontconfig,FcInit,,[FONTCONFIG_CFLAGS=""],[$FONTCONFIG_LIBS])],
|
||||
[FONTCONFIG_CFLAGS=""])])
|
||||
fi
|
||||
WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"],
|
||||
[fontconfig ${notice_platform}development files not found, fontconfig won't be supported.])
|
||||
|
|
|
|||
|
|
@ -51,9 +51,6 @@
|
|||
/* Define to 1 if you have the <float.h> header file. */
|
||||
#undef HAVE_FLOAT_H
|
||||
|
||||
/* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */
|
||||
#undef HAVE_FONTCONFIG_FONTCONFIG_H
|
||||
|
||||
/* Define if FreeType 2 is installed */
|
||||
#undef HAVE_FREETYPE
|
||||
|
||||
|
|
@ -327,9 +324,6 @@
|
|||
/* Define to 1 if you have the <pthread_np.h> header file. */
|
||||
#undef HAVE_PTHREAD_NP_H
|
||||
|
||||
/* Define to 1 if you have the <pulse/pulseaudio.h> header file. */
|
||||
#undef HAVE_PULSE_PULSEAUDIO_H
|
||||
|
||||
/* Define to 1 if you have the <pwd.h> header file. */
|
||||
#undef HAVE_PWD_H
|
||||
|
||||
|
|
@ -648,15 +642,9 @@
|
|||
/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
|
||||
#undef HAVE_VALGRIND_VALGRIND_H
|
||||
|
||||
/* Define to 1 if you have the <wayland-client.h> header file. */
|
||||
#undef HAVE_WAYLAND_CLIENT_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/shape.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_SHAPE_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/Xcomposite.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XCOMPOSITE_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/xf86vmode.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
||||
|
||||
|
|
@ -672,9 +660,6 @@
|
|||
/* Define to 1 if you have the <X11/extensions/XInput2.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XINPUT2_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/XInput.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XINPUT_H
|
||||
|
||||
/* Define to 1 if you have the <X11/extensions/Xrandr.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XRANDR_H
|
||||
|
||||
|
|
@ -684,18 +669,6 @@
|
|||
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
|
||||
#undef HAVE_X11_EXTENSIONS_XSHM_H
|
||||
|
||||
/* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */
|
||||
#undef HAVE_X11_XCURSOR_XCURSOR_H
|
||||
|
||||
/* Define to 1 if you have the <X11/XKBlib.h> header file. */
|
||||
#undef HAVE_X11_XKBLIB_H
|
||||
|
||||
/* Define to 1 if you have the <X11/Xlib.h> header file. */
|
||||
#undef HAVE_X11_XLIB_H
|
||||
|
||||
/* Define to 1 if you have the <X11/Xutil.h> header file. */
|
||||
#undef HAVE_X11_XUTIL_H
|
||||
|
||||
/* Define to 1 if `xcookie' is a member of `XEvent'. */
|
||||
#undef HAVE_XEVENT_XCOOKIE
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue