qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge issues.

Browse Source
This commit is contained in:
matthieu 2013-05-31 18:38:23 +00:00
parent 749e0e42fc
commit 531725f77c
14 changed files with 1 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libXRes/configure vendored
View File

@ -17640,22 +17640,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XRES_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 xres.pc" ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xres.pc"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

8
lib/libXRes/configure.ac
View File

@ -1,5 +1,5 @@
dnl dnl
dnl $Id: configure.ac,v 1.6 2013/05/31 15:23:23 matthieu Exp $ dnl $Id: configure.ac,v 1.7 2013/05/31 18:38:27 matthieu Exp $
# #
# Copyright © 2003 Keith Packard, Noah Levitt # Copyright © 2003 Keith Packard, Noah Levitt
# #
@ -63,12 +63,6 @@ LIBS="$XRES_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XRES_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
man/Makefile man/Makefile

16
lib/libXi/configure vendored
View File

@ -18412,22 +18412,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$XI_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"
# Check for xmlto and asciidoc for man page conversion # Check for xmlto and asciidoc for man page conversion
# (only needed by people building tarballs) # (only needed by people building tarballs)
if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then

6
lib/libXi/configure.ac
View File

@ -36,12 +36,6 @@ LIBS="$XI_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$XI_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
# Check for xmlto and asciidoc for man page conversion # Check for xmlto and asciidoc for man page conversion
# (only needed by people building tarballs) # (only needed by people building tarballs)
if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then

16
lib/libXinerama/configure vendored
View File

@ -17619,22 +17619,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$XINERAMA_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"
# Allow checking code with lint, sparse, etc. # Allow checking code with lint, sparse, etc.

6
lib/libXinerama/configure.ac
View File

@ -48,12 +48,6 @@ LIBS="$XINERAMA_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$XINERAMA_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
# Allow checking code with lint, sparse, etc. # Allow checking code with lint, sparse, etc.
XORG_WITH_LINT XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}" LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"

16
lib/libXtst/configure vendored
View File

@ -18142,22 +18142,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XTST_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"
# Determine if the source for man pages is available # Determine if the source for man pages is available
# It may already be present (tarball) or can be generated using xmlto # It may already be present (tarball) or can be generated using xmlto
if test -f "$srcdir/man/XTestQueryExtension.man" || test "x$have_xmlto" = xyes; then if test -f "$srcdir/man/XTestQueryExtension.man" || test "x$have_xmlto" = xyes; then

6
lib/libXtst/configure.ac
View File

@ -53,12 +53,6 @@ LIBS="$XTST_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XTST_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
# Determine if the source for man pages is available # Determine if the source for man pages is available
# It may already be present (tarball) or can be generated using xmlto # It may already be present (tarball) or can be generated using xmlto
AM_CONDITIONAL([INSTALL_MANPAGES], AM_CONDITIONAL([INSTALL_MANPAGES],

16
lib/libXxf86dga/configure vendored
View File

@ -17608,22 +17608,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XXF86DGA_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 xxf86dga.pc" ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xxf86dga.pc"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

6
lib/libXxf86dga/configure.ac
View File

@ -28,12 +28,6 @@ LIBS="$XXF86DGA_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XXF86DGA_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
man/Makefile man/Makefile

16
lib/libXxf86vm/configure vendored
View File

@ -17608,22 +17608,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XXF86VM_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 xxf86vm.pc" ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xxf86vm.pc"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

6
lib/libXxf86vm/configure.ac
View File

@ -28,12 +28,6 @@ LIBS="$XXF86VM_LIBS"
AC_CHECK_FUNCS([_XEatDataWords]) AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib release
SAVE_LIBS="$LIBS"
LIBS="$XXF86VM_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
man/Makefile man/Makefile

17
lib/libdmx/configure vendored
View File

@ -17637,23 +17637,6 @@ done
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$DMX_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 dmx.pc" ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile dmx.pc"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

7
lib/libdmx/configure.ac
View File

@ -50,13 +50,6 @@ AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS" LIBS="$SAVE_LIBS"
# Check for _XEatDataWords function that may be patched into older Xlib releases
SAVE_LIBS="$LIBS"
LIBS="$DMX_LIBS"
AC_CHECK_FUNCS([_XEatDataWords])
LIBS="$SAVE_LIBS"
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
src/Makefile src/Makefile
man/Makefile man/Makefile