We don't use DGA version 1 so remove the configure check for it.
This commit is contained in:
parent
83f7b39dab
commit
14de4815b3
|
@ -8107,82 +8107,6 @@ _ACEOF
|
|||
|
||||
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
|
||||
|
||||
else
|
||||
echo "$as_me:$LINENO: checking for XF86DGAQueryExtension in -lXxf86dga" >&5
|
||||
echo $ECHO_N "checking for XF86DGAQueryExtension in -lXxf86dga... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_Xxf86dga_XF86DGAQueryExtension+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $X_EXTRA_LIBS
|
||||
$LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char XF86DGAQueryExtension ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XF86DGAQueryExtension ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_Xxf86dga_XF86DGAQueryExtension" >&6
|
||||
if test $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension = yes; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_LIBXXF86DGA 1
|
||||
_ACEOF
|
||||
|
||||
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
15
configure.ac
15
configure.ac
|
@ -316,21 +316,10 @@ then
|
|||
if test "$ac_cv_header_X11_extensions_xf86dga_h" = "yes"
|
||||
then
|
||||
AC_CHECK_LIB(Xxf86dga, XDGAQueryExtension,
|
||||
[ dnl *** If found...
|
||||
AC_DEFINE(HAVE_LIBXXF86DGA2, 1,
|
||||
[ AC_DEFINE(HAVE_LIBXXF86DGA2, 1,
|
||||
[Define if you have the Xxf86dga library version 2])
|
||||
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
|
||||
],
|
||||
[ dnl *** If not found, look for XF86DGAQueryExtension()
|
||||
dnl *** instead (DGA 2.0 not found)...
|
||||
AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,
|
||||
[ AC_DEFINE(HAVE_LIBXXF86DGA, 1,
|
||||
[Define if you have the Xxf86dga library version 1])
|
||||
X_PRE_LIBS="$X_PRE_LIBS -lXxf86dga"
|
||||
],,
|
||||
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS
|
||||
)
|
||||
],
|
||||
],,
|
||||
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||
fi
|
||||
|
||||
|
|
|
@ -302,9 +302,6 @@
|
|||
/* Define if you have the X Shape extension */
|
||||
#undef HAVE_LIBXSHAPE
|
||||
|
||||
/* Define if you have the Xxf86dga library version 1 */
|
||||
#undef HAVE_LIBXXF86DGA
|
||||
|
||||
/* Define if you have the Xxf86dga library version 2 */
|
||||
#undef HAVE_LIBXXF86DGA2
|
||||
|
||||
|
|
Loading…
Reference in New Issue