Fix merge error
This commit is contained in:
parent
cffb2c770c
commit
749e0e42fc
17
lib/libXfixes/configure
vendored
17
lib/libXfixes/configure
vendored
@ -17547,23 +17547,6 @@ done
|
||||
LIBS="$SAVE_LIBS"
|
||||
|
||||
|
||||
# Check for _XEatDataWords function that may be patched into older Xlib releases
|
||||
SAVE_LIBS="$LIBS"
|
||||
LIBS="$FIXESEXT_LIBS"
|
||||
for ac_func in _XEatDataWords
|
||||
do :
|
||||
ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
|
||||
if test "x$ac_cv_func__XEatDataWords" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE__XEATDATAWORDS 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
LIBS="$SAVE_LIBS"
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xfixes.pc"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
@ -64,13 +64,6 @@ AC_CHECK_FUNCS([_XEatDataWords])
|
||||
LIBS="$SAVE_LIBS"
|
||||
|
||||
|
||||
# Check for _XEatDataWords function that may be patched into older Xlib releases
|
||||
SAVE_LIBS="$LIBS"
|
||||
LIBS="$FIXESEXT_LIBS"
|
||||
AC_CHECK_FUNCS([_XEatDataWords])
|
||||
LIBS="$SAVE_LIBS"
|
||||
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
src/Makefile
|
||||
man/Makefile
|
||||
|
Loading…
Reference in New Issue
Block a user