diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-05-31 18:38:28 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-05-31 18:38:28 +0000 |
| commit | a6e68d0343d420fc6ba90d424e2bdd17ffb3d228 (patch) | |
| tree | 03d5d0bde7d716a696769042f4ae6c2b50551aae /lib/libXxf86dga | |
| parent | 77c23f591a4b1ea62cc1e3a3ddbeebe997429787 (diff) | |
fix merge issues.
Diffstat (limited to 'lib/libXxf86dga')
| -rw-r--r-- | lib/libXxf86dga/configure | 16 | ||||
| -rw-r--r-- | lib/libXxf86dga/configure.ac | 6 |
2 files changed, 0 insertions, 22 deletions
diff --git a/lib/libXxf86dga/configure b/lib/libXxf86dga/configure index b9d124c20..4664fcef5 100644 --- a/lib/libXxf86dga/configure +++ b/lib/libXxf86dga/configure @@ -17608,22 +17608,6 @@ done 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" cat >confcache <<\_ACEOF diff --git a/lib/libXxf86dga/configure.ac b/lib/libXxf86dga/configure.ac index 7e83cb523..3127c6e03 100644 --- a/lib/libXxf86dga/configure.ac +++ b/lib/libXxf86dga/configure.ac @@ -28,12 +28,6 @@ LIBS="$XXF86DGA_LIBS" AC_CHECK_FUNCS([_XEatDataWords]) 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 src/Makefile man/Makefile |