diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-26 19:10:00 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-26 19:10:00 +0000 |
| commit | adeb4703c5670f65fb406d2b74d78e1c2fb3da0e (patch) | |
| tree | 08d6644770c46b84115c5ce6983ab1e24c5f740a /xserver | |
| parent | df3fb8b25d6c390ddf9ffbf2be3078399c924dd1 (diff) | |
regen with OpenBSD autotools
Diffstat (limited to 'xserver')
170 files changed, 1073 insertions, 2047 deletions
diff --git a/xserver/GL/Makefile.in b/xserver/GL/Makefile.in index 493984b63..697819a74 100644 --- a/xserver/GL/Makefile.in +++ b/xserver/GL/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/glx/Makefile.in b/xserver/GL/glx/Makefile.in index 87781af67..f8818b330 100644 --- a/xserver/GL/glx/Makefile.in +++ b/xserver/GL/glx/Makefile.in @@ -313,7 +313,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/Makefile.in b/xserver/GL/mesa/Makefile.in index 43d5680dc..d71da2036 100644 --- a/xserver/GL/mesa/Makefile.in +++ b/xserver/GL/mesa/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/X/Makefile.in b/xserver/GL/mesa/X/Makefile.in index cd3e2a92e..9bd2829a8 100644 --- a/xserver/GL/mesa/X/Makefile.in +++ b/xserver/GL/mesa/X/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/array_cache/Makefile.in b/xserver/GL/mesa/array_cache/Makefile.in index 465ba6422..3630e1ffd 100644 --- a/xserver/GL/mesa/array_cache/Makefile.in +++ b/xserver/GL/mesa/array_cache/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/glapi/Makefile.in b/xserver/GL/mesa/glapi/Makefile.in index 9e2acbbc3..f6a28cf90 100644 --- a/xserver/GL/mesa/glapi/Makefile.in +++ b/xserver/GL/mesa/glapi/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/main/Makefile.in b/xserver/GL/mesa/main/Makefile.in index c6767554b..afb37c3bf 100644 --- a/xserver/GL/mesa/main/Makefile.in +++ b/xserver/GL/mesa/main/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/math/Makefile.in b/xserver/GL/mesa/math/Makefile.in index 0ea07dab9..3ee4c8738 100644 --- a/xserver/GL/mesa/math/Makefile.in +++ b/xserver/GL/mesa/math/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/shader/Makefile.in b/xserver/GL/mesa/shader/Makefile.in index c2e5eb2d2..6c05a014b 100644 --- a/xserver/GL/mesa/shader/Makefile.in +++ b/xserver/GL/mesa/shader/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/shader/grammar/Makefile.in b/xserver/GL/mesa/shader/grammar/Makefile.in index 78c55a6dd..0e1692e45 100644 --- a/xserver/GL/mesa/shader/grammar/Makefile.in +++ b/xserver/GL/mesa/shader/grammar/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/shader/slang/Makefile.in b/xserver/GL/mesa/shader/slang/Makefile.in index f9e3efe47..cab334bb9 100644 --- a/xserver/GL/mesa/shader/slang/Makefile.in +++ b/xserver/GL/mesa/shader/slang/Makefile.in @@ -308,7 +308,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/swrast/Makefile.in b/xserver/GL/mesa/swrast/Makefile.in index c03fabb9e..680823168 100644 --- a/xserver/GL/mesa/swrast/Makefile.in +++ b/xserver/GL/mesa/swrast/Makefile.in @@ -305,7 +305,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/swrast_setup/Makefile.in b/xserver/GL/mesa/swrast_setup/Makefile.in index 28c3f6fd3..658a88681 100644 --- a/xserver/GL/mesa/swrast_setup/Makefile.in +++ b/xserver/GL/mesa/swrast_setup/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/GL/mesa/tnl/Makefile.in b/xserver/GL/mesa/tnl/Makefile.in index 03fd0ac7b..bc3fe7635 100644 --- a/xserver/GL/mesa/tnl/Makefile.in +++ b/xserver/GL/mesa/tnl/Makefile.in @@ -306,7 +306,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/Makefile.in b/xserver/Makefile.in index f2f7d8d6a..e5516ae21 100644 --- a/xserver/Makefile.in +++ b/xserver/Makefile.in @@ -316,7 +316,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/XTrap/Makefile.in b/xserver/XTrap/Makefile.in index 8ee2672a8..2803d0bf1 100644 --- a/xserver/XTrap/Makefile.in +++ b/xserver/XTrap/Makefile.in @@ -300,7 +300,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/Xext/Makefile.in b/xserver/Xext/Makefile.in index 984fe10c8..eaabf6a43 100644 --- a/xserver/Xext/Makefile.in +++ b/xserver/Xext/Makefile.in @@ -405,7 +405,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in index e1457647e..82401eb5f 100644 --- a/xserver/Xi/Makefile.in +++ b/xserver/Xi/Makefile.in @@ -306,7 +306,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index f8b1a02af..bc8eb1e75 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -1578,27 +1578,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4305,9 +4288,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1) -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -4441,11 +4421,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1) # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) # Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4437,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,7 +4517,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1) # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6373,7 +6353,6 @@ do done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6406,7 +6385,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do done ]) SED=$lt_cv_path_SED -AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) @@ -6443,7 +6421,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) + _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then AC_MSG_RESULT([yes]) @@ -6479,30 +6457,14 @@ fi]) # --------------------------------------------- m4_define([_PKG_CONFIG], [if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else PKG_CHECK_EXISTS([$3], [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes]) - fi else pkg_failed=untried fi[]dnl ])# _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], # [ACTION-IF-NOT-FOUND]) # @@ -6524,39 +6486,29 @@ AC_MSG_CHECKING([for $1]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - +[Package requirements ($2) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details.])], + [$4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -_PKG_TEXT +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], [$4]) @@ -6568,522 +6520,6 @@ else fi[]dnl ])# PKG_CHECK_MODULES -dnl -dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the -dnl "Software"), to deal in the Software without restriction, including -dnl without limitation the rights to use, copy, modify, merge, publish, -dnl distribute, and/or sell copies of the Software, and to permit persons -dnl to whom the Software is furnished to do so, provided that the above -dnl copyright notice(s) and this permission notice appear in all copies of -dnl the Software and that both the above copyright notice(s) and this -dnl permission notice appear in supporting documentation. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Except as contained in this notice, the name of a copyright holder -dnl shall not be used in advertising or otherwise to promote the sale, use -dnl or other dealings in this Software without prior written authorization -dnl of the copyright holder. - -# XORG_MACROS_VERSION(required-version) -# ------------------------------------- -# Minimum version: 1.1.0 -# -# If you're using a macro added in Version 1.1 or newer, include this in -# your configure.ac with the minimum required version, such as: -# XORG_MACROS_VERSION(1.1) -# -# To force at least a version with this macro defined, also add: -# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -# -# -# See the "minimum version" comment for each macro you use to see what -# version you require. -AC_DEFUN([XORG_MACROS_VERSION],[ - [XORG_MACROS_needed_version=$1 - XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` - XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) - [XORG_MACROS_version=1.1.1 - XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` - XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] - if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then - AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) - fi - if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then - AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) - fi - AC_MSG_RESULT([yes, $XORG_MACROS_version]) -]) # XORG_MACROS_VERSION - -# XORG_PROG_RAWCPP() -# ------------------ -# Minimum version: 1.0.0 -# -# Find cpp program and necessary flags for use in pre-processing text files -# such as man pages and config files -AC_DEFUN([XORG_PROG_RAWCPP],[ -AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], - [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) - -# Check for flag to avoid builtin definitions - assumes unix is predefined, -# which is not the best choice for supporting other OS'es, but covers most -# of the ones we need for now. -AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - RAWCPPFLAGS=-undef - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext - -AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - AC_MSG_RESULT([no]) -else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - AC_MSG_RESULT([yes]) - else - AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) - fi -fi -rm -f conftest.$ac_ext -AC_SUBST(RAWCPPFLAGS) -]) # XORG_PROG_RAWCPP - -# XORG_MANPAGE_SECTIONS() -# ----------------------- -# Minimum version: 1.0.0 -# -# Determine which sections man pages go in for the different man page types -# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. -# Not sure if there's any better way than just hardcoding by OS name. -# Override default settings by setting environment variables - -AC_DEFUN([XORG_MANPAGE_SECTIONS],[ -AC_REQUIRE([AC_CANONICAL_HOST]) - -if test x$APP_MAN_SUFFIX = x ; then - APP_MAN_SUFFIX=1 -fi -if test x$APP_MAN_DIR = x ; then - APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' -fi - -if test x$LIB_MAN_SUFFIX = x ; then - LIB_MAN_SUFFIX=3 -fi -if test x$LIB_MAN_DIR = x ; then - LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' -fi - -if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; - esac -fi -if test x$FILE_MAN_DIR = x ; then - FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' -fi - -if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; - esac -fi -if test x$MISC_MAN_DIR = x ; then - MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' -fi - -if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; - esac -fi -if test x$DRIVER_MAN_DIR = x ; then - DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' -fi - -if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; - esac -fi -if test x$ADMIN_MAN_DIR = x ; then - ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' -fi - - -AC_SUBST([APP_MAN_SUFFIX]) -AC_SUBST([LIB_MAN_SUFFIX]) -AC_SUBST([FILE_MAN_SUFFIX]) -AC_SUBST([MISC_MAN_SUFFIX]) -AC_SUBST([DRIVER_MAN_SUFFIX]) -AC_SUBST([ADMIN_MAN_SUFFIX]) -AC_SUBST([APP_MAN_DIR]) -AC_SUBST([LIB_MAN_DIR]) -AC_SUBST([FILE_MAN_DIR]) -AC_SUBST([MISC_MAN_DIR]) -AC_SUBST([DRIVER_MAN_DIR]) -AC_SUBST([ADMIN_MAN_DIR]) -]) # XORG_MANPAGE_SECTIONS - -# XORG_CHECK_LINUXDOC -# ------------------- -# Minimum version: 1.0.0 -# -# Defines the variable MAKE_TEXT if the necessary tools and -# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. -# Whether or not the necessary tools and files are found can be checked -# with the AM_CONDITIONAL "BUILD_LINUXDOC" -AC_DEFUN([XORG_CHECK_LINUXDOC],[ -AC_CHECK_FILE( - [$prefix/share/X11/sgml/defs.ent], - [DEFS_ENT_PATH=$prefix/share/X11/sgml], - [DEFS_ENT_PATH=] -) - -AC_PATH_PROG(LINUXDOC, linuxdoc) -AC_PATH_PROG(PS2PDF, ps2pdf) - -AC_MSG_CHECKING([Whether to build documentation]) - -if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then - BUILDDOC=yes -else - BUILDDOC=no -fi - -AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) - -AC_MSG_RESULT([$BUILDDOC]) - -AC_MSG_CHECKING([Whether to build pdf documentation]) - -if test x$PS2PDF != x ; then - BUILDPDFDOC=yes -else - BUILDPDFDOC=no -fi - -AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) - -AC_MSG_RESULT([$BUILDPDFDOC]) - -MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps" -MAKE_PDF="$PS2PDF" -MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0" - -AC_SUBST(MAKE_TEXT) -AC_SUBST(MAKE_PS) -AC_SUBST(MAKE_PDF) -AC_SUBST(MAKE_HTML) -]) # XORG_CHECK_LINUXDOC - -# XORG_CHECK_MALLOC_ZERO -# ---------------------- -# Minimum version: 1.0.0 -# -# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if -# malloc(0) returns NULL. Packages should add one of these cflags to -# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. -AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ -AC_ARG_ENABLE(malloc0returnsnull, - AC_HELP_STRING([--enable-malloc0returnsnull], - [malloc(0) returns NULL (default: auto)]), - [MALLOC_ZERO_RETURNS_NULL=$enableval], - [MALLOC_ZERO_RETURNS_NULL=auto]) - -AC_MSG_CHECKING([whether malloc(0) returns NULL]) -if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then - AC_RUN_IFELSE([ -char *malloc(); -char *realloc(); -char *calloc(); -main() { - char *m0, *r0, *c0, *p; - m0 = malloc(0); - p = malloc(10); - r0 = realloc(p,0); - c0 = calloc(0); - exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); -}], - [MALLOC_ZERO_RETURNS_NULL=yes], - [MALLOC_ZERO_RETURNS_NULL=no]) -fi -AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) - -if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then - MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" - XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS - XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" -else - MALLOC_ZERO_CFLAGS="" - XMALLOC_ZERO_CFLAGS="" - XTMALLOC_ZERO_CFLAGS="" -fi - -AC_SUBST([MALLOC_ZERO_CFLAGS]) -AC_SUBST([XMALLOC_ZERO_CFLAGS]) -AC_SUBST([XTMALLOC_ZERO_CFLAGS]) -]) # XORG_CHECK_MALLOC_ZERO - -# XORG_WITH_LINT() -# ---------------- -# Minimum version: 1.1.0 -# -# Sets up flags for source checkers such as lint and sparse if --with-lint -# is specified. (Use --with-lint=sparse for sparse.) -# Sets $LINT to name of source checker passed with --with-lint (default: lint) -# Sets $LINT_FLAGS to flags to pass to source checker -# Sets LINT automake conditional if enabled (default: disabled) -# -AC_DEFUN([XORG_WITH_LINT],[ - -# Allow checking code with lint, sparse, etc. -AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], - [Use a lint-style source code checker (default: disabled)])], - [use_lint=$withval], [use_lint=no]) -if test "x$use_lint" = "xyes" ; then - LINT="lint" -else - LINT="$use_lint" -fi -if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then - case $LINT in - lint|*/lint) - case $host_os in - solaris*) - LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" - ;; - esac - ;; - esac -fi - -AC_SUBST(LINT) -AC_SUBST(LINT_FLAGS) -AM_CONDITIONAL(LINT, [test x$LINT != xno]) - -]) # XORG_WITH_LINT - -# XORG_LINT_LIBRARY(LIBNAME) -# -------------------------- -# Minimum version: 1.1.0 -# -# Sets up flags for building lint libraries for checking programs that call -# functions in the library. -# Disabled by default, enable with --enable-lint-library -# Sets: -# @LINTLIB@ - name of lint library file to make -# MAKE_LINT_LIB - automake conditional -# - -AC_DEFUN([XORG_LINT_LIBRARY],[ -AC_REQUIRE([XORG_WITH_LINT]) -# Build lint "library" for more indepth checks of programs calling this library -AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], - [Create lint library (default: disabled)])], - [make_lint_lib=$enableval], [make_lint_lib=no]) -if test "x$make_lint_lib" != "xno" ; then - if test "x$LINT" = "xno" ; then - AC_MSG_ERROR([Cannot make lint library without --with-lint]) - fi - if test "x$make_lint_lib" = "xyes" ; then - LINTLIB=llib-l$1.ln - else - LINTLIB=$make_lint_lib - fi -fi -AC_SUBST(LINTLIB) -AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) - -]) # XORG_LINT_LIBRARY - -dnl Copyright 2005 Red Hat, Inc -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -dnl - -# XORG_RELEASE_VERSION -# -------------------- -# Adds --with/without-release-string and changes the PACKAGE and -# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. - -AC_DEFUN([XORG_RELEASE_VERSION],[ - AC_ARG_WITH(release-version, - AC_HELP_STRING([--with-release-version=STRING], - [Use release version string in package name]), - [RELEASE_VERSION="$withval"], - [RELEASE_VERSION=""]) - if test "x$RELEASE_VERSION" != "x"; then - PACKAGE="$PACKAGE-$RELEASE_VERSION" - PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" - AC_MSG_NOTICE([Building with package name set to $PACKAGE]) - fi -]) - -dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ -dnl -dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation. -dnl -dnl The above copyright notice and this permission notice shall be included -dnl in all copies or substantial portions of the Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -dnl OTHER DEALINGS IN THE SOFTWARE. -dnl -dnl Except as contained in this notice, the name of the copyright holders shall -dnl not be used in advertising or otherwise to promote the sale, use or -dnl other dealings in this Software without prior written authorization -dnl from the copyright holders. -dnl - -# XTRANS_TCP_FLAGS() -# ------------------ -# Find needed libraries for TCP sockets, and check for IPv6 support -AC_DEFUN([XTRANS_TCP_FLAGS],[ - # SVR4 hides these in libraries other than libc - AC_SEARCH_LIBS(socket, [socket]) - AC_SEARCH_LIBS(gethostbyname, [nsl]) - - # Needs to come after above checks for libsocket & libnsl for SVR4 systems - AC_ARG_ENABLE(ipv6, - AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]), - [IPV6CONN=$enableval], - [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) - AC_MSG_CHECKING([if IPv6 support should be built]) - if test "$IPV6CONN" = "yes"; then - AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) - fi - AC_MSG_RESULT($IPV6CONN) - - # 4.3BSD-Reno added a new member to struct sockaddr_in - AC_CHECK_MEMBER([struct sockaddr_in.sin_len], - AC_DEFINE([BSD44SOCKETS],1, - [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> - ]) -]) # XTRANS_TCP_FLAGS - -# XTRANS_CONNECTION_FLAGS() -# ------------------------- -# Standard checks for which Xtrans transports to use by the Xorg packages -# that use Xtrans functions -AC_DEFUN([XTRANS_CONNECTION_FLAGS], -[AC_REQUIRE([AC_TYPE_SIGNAL]) - AC_ARG_ENABLE(unix-transport, - AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), - [UNIXCONN=$enableval], [UNIXCONN=yes]) - AC_ARG_ENABLE(tcp-transport, - AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), - [TCPCONN=$enableval], [TCPCONN=yes]) - AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) - if test "$UNIXCONN" = "yes"; then - AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) - fi - AC_MSG_RESULT($UNIXCONN) - AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) - AC_MSG_RESULT($TCPCONN) - if test "$TCPCONN" = "yes"; then - AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) - XTRANS_TCP_FLAGS - fi -]) # XTRANS_CONNECTION_FLAGS - - -# XTRANS_SECURE_RPC_FLAGS() -# ------------------------- -# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS -# so that any necessary networking libraries are already found -AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], -[AC_REQUIRE([XTRANS_TCP_FLAGS]) - AC_ARG_ENABLE(secure-rpc, - AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), - [SECURE_RPC=$enableval], [SECURE_RPC="try"]) - - if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then - FOUND_SECURE_RPC="no" - AC_CHECK_FUNCS([authdes_seccreate authdes_create], - [FOUND_SECURE_RPC="yes"]) - if test "x$FOUND_SECURE_RPC" = "xno" ; then - if test "x$SECURE_RPC" = "xyes" ; then - AC_MSG_ERROR([Secure RPC requested, but required functions not found]) - fi - SECURE_RPC="no" - else - dnl FreeBSD keeps getsecretkey in librpcsvc - AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) - SECURE_RPC="yes" - fi - fi - AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) - if test "x$SECURE_RPC" = "xyes" ; then - AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) - fi - AC_MSG_RESULT($SECURE_RPC) -]) # XTRANS_SECURE_RPC_FLAGS - - # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -7971,4 +7407,599 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +dnl +dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. +dnl +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the +dnl "Software"), to deal in the Software without restriction, including +dnl without limitation the rights to use, copy, modify, merge, publish, +dnl distribute, and/or sell copies of the Software, and to permit persons +dnl to whom the Software is furnished to do so, provided that the above +dnl copyright notice(s) and this permission notice appear in all copies of +dnl the Software and that both the above copyright notice(s) and this +dnl permission notice appear in supporting documentation. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +dnl +dnl Except as contained in this notice, the name of a copyright holder +dnl shall not be used in advertising or otherwise to promote the sale, use +dnl or other dealings in this Software without prior written authorization +dnl of the copyright holder. + +# XORG_MACROS_VERSION(required-version) +# ------------------------------------- +# Minimum version: 1.1.0 +# +# If you're using a macro added in Version 1.1 or newer, include this in +# your configure.ac with the minimum required version, such as: +# XORG_MACROS_VERSION(1.1) +# +# To force at least a version with this macro defined, also add: +# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) +# +# +# See the "minimum version" comment for each macro you use to see what +# version you require. +AC_DEFUN([XORG_MACROS_VERSION],[ + [XORG_MACROS_needed_version=$1 + XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'` + XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] + AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}]) + [XORG_MACROS_version=1.1.2 + XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'` + XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`] + if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then + AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x]) + fi + if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then + AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer]) + fi + AC_MSG_RESULT([yes, $XORG_MACROS_version]) +]) # XORG_MACROS_VERSION + +# XORG_PROG_RAWCPP() +# ------------------ +# Minimum version: 1.0.0 +# +# Find cpp program and necessary flags for use in pre-processing text files +# such as man pages and config files +AC_DEFUN([XORG_PROG_RAWCPP],[ +AC_REQUIRE([AC_PROG_CPP]) +AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], + [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) + +# Check for flag to avoid builtin definitions - assumes unix is predefined, +# which is not the best choice for supporting other OS'es, but covers most +# of the ones we need for now. +AC_MSG_CHECKING([if $RAWCPP requires -undef]) +AC_LANG_CONFTEST([Does cpp redefine unix ?]) +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + AC_MSG_RESULT([no]) +else + if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS=-undef + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) + fi +fi +rm -f conftest.$ac_ext + +AC_MSG_CHECKING([if $RAWCPP requires -traditional]) +AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + AC_MSG_RESULT([no]) +else + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) + fi +fi +rm -f conftest.$ac_ext +AC_SUBST(RAWCPPFLAGS) +]) # XORG_PROG_RAWCPP + +# XORG_MANPAGE_SECTIONS() +# ----------------------- +# Minimum version: 1.0.0 +# +# Determine which sections man pages go in for the different man page types +# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files. +# Not sure if there's any better way than just hardcoding by OS name. +# Override default settings by setting environment variables + +AC_DEFUN([XORG_MANPAGE_SECTIONS],[ +AC_REQUIRE([AC_CANONICAL_HOST]) + +if test x$APP_MAN_SUFFIX = x ; then + APP_MAN_SUFFIX=1 +fi +if test x$APP_MAN_DIR = x ; then + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' +fi + +if test x$LIB_MAN_SUFFIX = x ; then + LIB_MAN_SUFFIX=3 +fi +if test x$LIB_MAN_DIR = x ; then + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' +fi + +if test x$FILE_MAN_SUFFIX = x ; then + case $host_os in + solaris*) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; + esac +fi +if test x$FILE_MAN_DIR = x ; then + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' +fi + +if test x$MISC_MAN_SUFFIX = x ; then + case $host_os in + solaris*) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; + esac +fi +if test x$MISC_MAN_DIR = x ; then + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' +fi + +if test x$DRIVER_MAN_SUFFIX = x ; then + case $host_os in + solaris*) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; + esac +fi +if test x$DRIVER_MAN_DIR = x ; then + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' +fi + +if test x$ADMIN_MAN_SUFFIX = x ; then + case $host_os in + solaris*) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; + esac +fi +if test x$ADMIN_MAN_DIR = x ; then + ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)' +fi + + +AC_SUBST([APP_MAN_SUFFIX]) +AC_SUBST([LIB_MAN_SUFFIX]) +AC_SUBST([FILE_MAN_SUFFIX]) +AC_SUBST([MISC_MAN_SUFFIX]) +AC_SUBST([DRIVER_MAN_SUFFIX]) +AC_SUBST([ADMIN_MAN_SUFFIX]) +AC_SUBST([APP_MAN_DIR]) +AC_SUBST([LIB_MAN_DIR]) +AC_SUBST([FILE_MAN_DIR]) +AC_SUBST([MISC_MAN_DIR]) +AC_SUBST([DRIVER_MAN_DIR]) +AC_SUBST([ADMIN_MAN_DIR]) +]) # XORG_MANPAGE_SECTIONS + +# XORG_CHECK_LINUXDOC +# ------------------- +# Minimum version: 1.0.0 +# +# Defines the variable MAKE_TEXT if the necessary tools and +# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt. +# Whether or not the necessary tools and files are found can be checked +# with the AM_CONDITIONAL "BUILD_LINUXDOC" +AC_DEFUN([XORG_CHECK_LINUXDOC],[ +XORG_SGML_PATH=$prefix/share/sgml +HAVE_DEFS_ENT= + +AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) + +AC_PATH_PROG(LINUXDOC, linuxdoc) +AC_PATH_PROG(PS2PDF, ps2pdf) + +AC_MSG_CHECKING([Whether to build documentation]) + +if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then + BUILDDOC=yes +else + BUILDDOC=no +fi + +AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes]) + +AC_MSG_RESULT([$BUILDDOC]) + +AC_MSG_CHECKING([Whether to build pdf documentation]) + +if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then + BUILDPDFDOC=yes +else + BUILDPDFDOC=no +fi + +AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) + +AC_MSG_RESULT([$BUILDPDFDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +MAKE_PDF="$PS2PDF" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" + +AC_SUBST(MAKE_TEXT) +AC_SUBST(MAKE_PS) +AC_SUBST(MAKE_PDF) +AC_SUBST(MAKE_HTML) +]) # XORG_CHECK_LINUXDOC + +# XORG_CHECK_DOCBOOK +# ------------------- +# Minimum version: 1.0.0 +# +# Checks for the ability to build output formats from SGML DocBook source. +# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC" +# indicates whether the necessary tools and files are found and, if set, +# $(MAKE_XXX) blah.sgml will produce blah.xxx. +AC_DEFUN([XORG_CHECK_DOCBOOK],[ +XORG_SGML_PATH=$prefix/share/sgml +HAVE_DEFS_ENT= +BUILDTXTDOC=no +BUILDPDFDOC=no +BUILDPSDOC=no +BUILDHTMLDOC=no + +AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) + +AC_PATH_PROG(DOCBOOKPS, docbook2ps) +AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) +AC_PATH_PROG(DOCBOOKHTML, docbook2html) +AC_PATH_PROG(DOCBOOKTXT, docbook2txt) + +AC_MSG_CHECKING([Whether to build text documentation]) +if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && + test x$BUILD_TXTDOC != xno; then + BUILDTXTDOC=yes +fi +AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) +AC_MSG_RESULT([$BUILDTXTDOC]) + +AC_MSG_CHECKING([Whether to build PDF documentation]) +if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && + test x$BUILD_PDFDOC != xno; then + BUILDPDFDOC=yes +fi +AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) +AC_MSG_RESULT([$BUILDPDFDOC]) + +AC_MSG_CHECKING([Whether to build PostScript documentation]) +if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && + test x$BUILD_PSDOC != xno; then + BUILDPSDOC=yes +fi +AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) +AC_MSG_RESULT([$BUILDPSDOC]) + +AC_MSG_CHECKING([Whether to build HTML documentation]) +if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && + test x$BUILD_HTMLDOC != xno; then + BUILDHTMLDOC=yes +fi +AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes]) +AC_MSG_RESULT([$BUILDHTMLDOC]) + +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS" +MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML" + +AC_SUBST(MAKE_TEXT) +AC_SUBST(MAKE_PS) +AC_SUBST(MAKE_PDF) +AC_SUBST(MAKE_HTML) +]) # XORG_CHECK_DOCBOOK + +# XORG_CHECK_MALLOC_ZERO +# ---------------------- +# Minimum version: 1.0.0 +# +# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if +# malloc(0) returns NULL. Packages should add one of these cflags to +# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. +AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ +AC_ARG_ENABLE(malloc0returnsnull, + AC_HELP_STRING([--enable-malloc0returnsnull], + [malloc(0) returns NULL (default: auto)]), + [MALLOC_ZERO_RETURNS_NULL=$enableval], + [MALLOC_ZERO_RETURNS_NULL=auto]) + +AC_MSG_CHECKING([whether malloc(0) returns NULL]) +if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then + AC_RUN_IFELSE([ +char *malloc(); +char *realloc(); +char *calloc(); +main() { + char *m0, *r0, *c0, *p; + m0 = malloc(0); + p = malloc(10); + r0 = realloc(p,0); + c0 = calloc(0); + exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); +}], + [MALLOC_ZERO_RETURNS_NULL=yes], + [MALLOC_ZERO_RETURNS_NULL=no]) +fi +AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) + +if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then + MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" + XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS + XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC" +else + MALLOC_ZERO_CFLAGS="" + XMALLOC_ZERO_CFLAGS="" + XTMALLOC_ZERO_CFLAGS="" +fi + +AC_SUBST([MALLOC_ZERO_CFLAGS]) +AC_SUBST([XMALLOC_ZERO_CFLAGS]) +AC_SUBST([XTMALLOC_ZERO_CFLAGS]) +]) # XORG_CHECK_MALLOC_ZERO + +# XORG_WITH_LINT() +# ---------------- +# Minimum version: 1.1.0 +# +# Sets up flags for source checkers such as lint and sparse if --with-lint +# is specified. (Use --with-lint=sparse for sparse.) +# Sets $LINT to name of source checker passed with --with-lint (default: lint) +# Sets $LINT_FLAGS to flags to pass to source checker +# Sets LINT automake conditional if enabled (default: disabled) +# +AC_DEFUN([XORG_WITH_LINT],[ + +# Allow checking code with lint, sparse, etc. +AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], + [Use a lint-style source code checker (default: disabled)])], + [use_lint=$withval], [use_lint=no]) +if test "x$use_lint" = "xyes" ; then + LINT="lint" +else + LINT="$use_lint" +fi +if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then + case $LINT in + lint|*/lint) + case $host_os in + solaris*) + LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2" + ;; + esac + ;; + esac +fi + +AC_SUBST(LINT) +AC_SUBST(LINT_FLAGS) +AM_CONDITIONAL(LINT, [test x$LINT != xno]) + +]) # XORG_WITH_LINT + +# XORG_LINT_LIBRARY(LIBNAME) +# -------------------------- +# Minimum version: 1.1.0 +# +# Sets up flags for building lint libraries for checking programs that call +# functions in the library. +# Disabled by default, enable with --enable-lint-library +# Sets: +# @LINTLIB@ - name of lint library file to make +# MAKE_LINT_LIB - automake conditional +# + +AC_DEFUN([XORG_LINT_LIBRARY],[ +AC_REQUIRE([XORG_WITH_LINT]) +# Build lint "library" for more indepth checks of programs calling this library +AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], + [Create lint library (default: disabled)])], + [make_lint_lib=$enableval], [make_lint_lib=no]) +if test "x$make_lint_lib" != "xno" ; then + if test "x$LINT" = "xno" ; then + AC_MSG_ERROR([Cannot make lint library without --with-lint]) + fi + if test "x$make_lint_lib" = "xyes" ; then + LINTLIB=llib-l$1.ln + else + LINTLIB=$make_lint_lib + fi +fi +AC_SUBST(LINTLIB) +AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) + +]) # XORG_LINT_LIBRARY + +dnl Copyright 2005 Red Hat, Inc +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XORG_RELEASE_VERSION +# -------------------- +# Adds --with/without-release-string and changes the PACKAGE and +# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. + +AC_DEFUN([XORG_RELEASE_VERSION],[ + AC_ARG_WITH(release-version, + AC_HELP_STRING([--with-release-version=STRING], + [Use release version string in package name]), + [RELEASE_VERSION="$withval"], + [RELEASE_VERSION=""]) + if test "x$RELEASE_VERSION" != "x"; then + PACKAGE="$PACKAGE-$RELEASE_VERSION" + PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" + AC_MSG_NOTICE([Building with package name set to $PACKAGE]) + fi +]) + +dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $ +dnl +dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved. +dnl +dnl Permission to use, copy, modify, distribute, and sell this software and its +dnl documentation for any purpose is hereby granted without fee, provided that +dnl the above copyright notice appear in all copies and that both that +dnl copyright notice and this permission notice appear in supporting +dnl documentation. +dnl +dnl The above copyright notice and this permission notice shall be included +dnl in all copies or substantial portions of the Software. +dnl +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +dnl OTHER DEALINGS IN THE SOFTWARE. +dnl +dnl Except as contained in this notice, the name of the copyright holders shall +dnl not be used in advertising or otherwise to promote the sale, use or +dnl other dealings in this Software without prior written authorization +dnl from the copyright holders. +dnl + +# XTRANS_TCP_FLAGS() +# ------------------ +# Find needed libraries for TCP sockets, and check for IPv6 support +AC_DEFUN([XTRANS_TCP_FLAGS],[ + # SVR4 hides these in libraries other than libc + AC_SEARCH_LIBS(socket, [socket]) + AC_SEARCH_LIBS(gethostbyname, [nsl]) + + # Needs to come after above checks for libsocket & libnsl for SVR4 systems + AC_ARG_ENABLE(ipv6, + AC_HELP_STRING([--enable-IPv6],[Enable IPv6 support]), + [IPV6CONN=$enableval], + [AC_CHECK_FUNC(getaddrinfo,[IPV6CONN=yes],[IPV6CONN=no])]) + AC_MSG_CHECKING([if IPv6 support should be built]) + if test "$IPV6CONN" = "yes"; then + AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) + fi + AC_MSG_RESULT($IPV6CONN) + + # 4.3BSD-Reno added a new member to struct sockaddr_in + AC_CHECK_MEMBER([struct sockaddr_in.sin_len], + AC_DEFINE([BSD44SOCKETS],1, + [Define to 1 if `struct sockaddr_in' has a `sin_len' member]), [], [ +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> + ]) +]) # XTRANS_TCP_FLAGS + +# XTRANS_CONNECTION_FLAGS() +# ------------------------- +# Standard checks for which Xtrans transports to use by the Xorg packages +# that use Xtrans functions +AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_TYPE_SIGNAL]) + AC_ARG_ENABLE(unix-transport, + AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]), + [UNIXCONN=$enableval], [UNIXCONN=yes]) + AC_ARG_ENABLE(tcp-transport, + AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]), + [TCPCONN=$enableval], [TCPCONN=yes]) + AC_MSG_CHECKING([if Xtrans should support UNIX socket connections]) + if test "$UNIXCONN" = "yes"; then + AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) + fi + AC_MSG_RESULT($UNIXCONN) + AC_MSG_CHECKING([if Xtrans should support TCP socket connections]) + AC_MSG_RESULT($TCPCONN) + if test "$TCPCONN" = "yes"; then + AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) + XTRANS_TCP_FLAGS + fi + [case $host_os in + solaris*|sco*|sysv4*) localdef="yes" ;; + *) localdef="no" ;; + esac] + AC_ARG_ENABLE(local-transport, + AC_HELP_STRING([--enable-local-transport],[Enable os-specific local transport]), + [LOCALCONN=$enableval], [LOCALCONN=$localdef]) + AC_MSG_CHECKING([if Xtrans should support os-specific local connections]) + AC_MSG_RESULT($LOCALCONN) + if test "$LOCALCONN" = "yes"; then + AC_DEFINE(LOCALCONN,1,[Support os-specific local connections]) + fi + +]) # XTRANS_CONNECTION_FLAGS + + +# XTRANS_SECURE_RPC_FLAGS() +# ------------------------- +# Check for Secure RPC functions - must come after XTRANS_TCP_FLAGS +# so that any necessary networking libraries are already found +AC_DEFUN([XTRANS_SECURE_RPC_FLAGS], +[AC_REQUIRE([XTRANS_TCP_FLAGS]) + AC_ARG_ENABLE(secure-rpc, + AC_HELP_STRING([--enable-secure-rpc],[Enable Secure RPC]), + [SECURE_RPC=$enableval], [SECURE_RPC="try"]) + + if test "x$SECURE_RPC" = "xyes" -o "x$SECURE_RPC" = "xtry" ; then + FOUND_SECURE_RPC="no" + AC_CHECK_FUNCS([authdes_seccreate authdes_create], + [FOUND_SECURE_RPC="yes"]) + if test "x$FOUND_SECURE_RPC" = "xno" ; then + if test "x$SECURE_RPC" = "xyes" ; then + AC_MSG_ERROR([Secure RPC requested, but required functions not found]) + fi + SECURE_RPC="no" + else + dnl FreeBSD keeps getsecretkey in librpcsvc + AC_SEARCH_LIBS(getsecretkey, [rpcsvc]) + SECURE_RPC="yes" + fi + fi + AC_MSG_CHECKING([if Secure RPC authentication ("SUN-DES-1") should be supported]) + if test "x$SECURE_RPC" = "xyes" ; then + AC_DEFINE(SECURE_RPC, 1, [Support Secure RPC ("SUN-DES-1") authentication for X11 clients]) + fi + AC_MSG_RESULT($SECURE_RPC) +]) # XTRANS_SECURE_RPC_FLAGS + + m4_include([acinclude.m4]) diff --git a/xserver/afb/Makefile.in b/xserver/afb/Makefile.in index 2eb5509ae..ab307eb41 100644 --- a/xserver/afb/Makefile.in +++ b/xserver/afb/Makefile.in @@ -319,7 +319,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/cfb/Makefile.in b/xserver/cfb/Makefile.in index 27b94a962..a7b5c51fb 100644 --- a/xserver/cfb/Makefile.in +++ b/xserver/cfb/Makefile.in @@ -324,7 +324,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/cfb32/Makefile.in b/xserver/cfb32/Makefile.in index 1158811d5..200d9d425 100644 --- a/xserver/cfb32/Makefile.in +++ b/xserver/cfb32/Makefile.in @@ -313,7 +313,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in index 375b7e72e..778a48854 100644 --- a/xserver/composite/Makefile.in +++ b/xserver/composite/Makefile.in @@ -300,7 +300,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/configure b/xserver/configure index d623e22d4..86f8bd66e 100644 --- a/xserver/configure +++ b/xserver/configure @@ -465,7 +465,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3763,7 +3763,6 @@ do done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3798,7 +3797,6 @@ done fi SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6 @@ -4228,7 +4226,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4231 "configure"' > conftest.$ac_ext + echo '#line 4229 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6069,7 +6067,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6072:" \ +echo "$as_me:6070:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -7132,11 +7130,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7135: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7133: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7139: \$? = $ac_status" >&5 + echo "$as_me:7137: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7400,11 +7398,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7403: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7401: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7407: \$? = $ac_status" >&5 + echo "$as_me:7405: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7504,11 +7502,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7507: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7511: \$? = $ac_status" >&5 + echo "$as_me:7509: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8969,31 +8967,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 8976 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9870,7 +9847,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9873 "configure" +#line 9850 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9970,7 +9947,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9973 "configure" +#line 9950 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10301,9 +10278,6 @@ CC=$lt_compiler # Is the compiler the GNU C compiler? with_gcc=$GCC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -10437,11 +10411,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects # Dependencies to place before the objects being linked to create a # shared library. @@ -10453,7 +10427,7 @@ postdeps=$lt_postdeps # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -10533,7 +10507,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -12313,11 +12287,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12316: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12290: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12320: \$? = $ac_status" >&5 + echo "$as_me:12294: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12417,11 +12391,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12420: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12394: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12424: \$? = $ac_status" >&5 + echo "$as_me:12398: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12949,31 +12923,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 12956 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -13357,9 +13310,6 @@ CC=$lt_compiler_CXX # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -13493,11 +13443,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_CXX # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_CXX # Dependencies to place before the objects being linked to create a # shared library. @@ -13509,7 +13459,7 @@ postdeps=$lt_postdeps_CXX # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -13589,7 +13539,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_CXX # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -14011,11 +13961,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14014: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13964: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14018: \$? = $ac_status" >&5 + echo "$as_me:13968: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14115,11 +14065,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14118: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14068: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14122: \$? = $ac_status" >&5 + echo "$as_me:14072: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15560,31 +15510,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 15567 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15968,9 +15897,6 @@ CC=$lt_compiler_F77 # Is the compiler the GNU C compiler? with_gcc=$GCC_F77 -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -16104,11 +16030,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_F77 # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_F77 # Dependencies to place before the objects being linked to create a # shared library. @@ -16120,7 +16046,7 @@ postdeps=$lt_postdeps_F77 # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_F77 # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -16200,7 +16126,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_F77 # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -16342,11 +16268,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16271: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16349: \$? = $ac_status" >&5 + echo "$as_me:16275: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16610,11 +16536,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16613: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16539: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16617: \$? = $ac_status" >&5 + echo "$as_me:16543: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16714,11 +16640,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16717: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16643: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16721: \$? = $ac_status" >&5 + echo "$as_me:16647: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18179,31 +18105,10 @@ linux*) # before this can be enabled. hardcode_into_libs=yes - # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 18186 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18587,9 +18492,6 @@ CC=$lt_compiler_GCJ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -18723,11 +18625,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_GCJ # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_GCJ # Dependencies to place before the objects being linked to create a # shared library. @@ -18739,7 +18641,7 @@ postdeps=$lt_postdeps_GCJ # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18819,7 +18721,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_GCJ # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -19071,9 +18973,6 @@ CC=$lt_compiler_RC # Is the compiler the GNU C compiler? with_gcc=$GCC_RC -gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\` -gcc_ver=\`gcc -dumpversion\` - # An ERE matcher. EGREP=$lt_EGREP @@ -19207,11 +19106,11 @@ striplib=$lt_striplib # Dependencies to place before the objects being linked to create a # shared library. -predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +predep_objects=$lt_predep_objects_RC # Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +postdep_objects=$lt_postdep_objects_RC # Dependencies to place before the objects being linked to create a # shared library. @@ -19223,7 +19122,7 @@ postdeps=$lt_postdeps_RC # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -19303,7 +19202,7 @@ variables_saved_for_relink="$variables_saved_for_relink" link_all_deplibs=$link_all_deplibs_RC # Compile-time system search path for libraries -sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec # Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -25123,6 +25022,8 @@ fi # Transport selection macro from xtrans.m4 + + # Check whether --enable-unix-transport or --disable-unix-transport was given. if test "${enable_unix_transport+set}" = set; then enableval="$enable_unix_transport" @@ -25650,6 +25551,29 @@ fi fi + case $host_os in + solaris*|sco*|sysv4*) localdef="yes" ;; + *) localdef="no" ;; + esac + # Check whether --enable-local-transport or --disable-local-transport was given. +if test "${enable_local_transport+set}" = set; then + enableval="$enable_local_transport" + LOCALCONN=$enableval +else + LOCALCONN=$localdef +fi; + echo "$as_me:$LINENO: checking if Xtrans should support os-specific local connections" >&5 +echo $ECHO_N "checking if Xtrans should support os-specific local connections... $ECHO_C" >&6 + echo "$as_me:$LINENO: result: $LOCALCONN" >&5 +echo "${ECHO_T}$LOCALCONN" >&6 + if test "$LOCALCONN" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define LOCALCONN 1 +_ACEOF + + fi + # Secure RPC detection macro from xtrans.m4 @@ -26113,9 +26037,12 @@ fi -as_ac_File=`echo "ac_cv_file_$prefix/share/X11/sgml/defs.ent" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $prefix/share/X11/sgml/defs.ent" >&5 -echo $ECHO_N "checking for $prefix/share/X11/sgml/defs.ent... $ECHO_C" >&6 +XORG_SGML_PATH=$prefix/share/sgml +HAVE_DEFS_ENT= + +as_ac_File=`echo "ac_cv_file_$XORG_SGML_PATH/X11/defs.ent" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $XORG_SGML_PATH/X11/defs.ent" >&5 +echo $ECHO_N "checking for $XORG_SGML_PATH/X11/defs.ent... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26123,7 +26050,7 @@ else { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } -if test -r "$prefix/share/X11/sgml/defs.ent"; then +if test -r "$XORG_SGML_PATH/X11/defs.ent"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" @@ -26132,10 +26059,7 @@ fi echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then - DEFS_ENT_PATH=$prefix/share/X11/sgml -else - DEFS_ENT_PATH= - + HAVE_DEFS_ENT=yes fi @@ -26221,7 +26145,7 @@ fi echo "$as_me:$LINENO: checking Whether to build documentation" >&5 echo $ECHO_N "checking Whether to build documentation... $ECHO_C" >&6 -if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then +if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then BUILDDOC=yes else BUILDDOC=no @@ -26244,7 +26168,7 @@ echo "${ECHO_T}$BUILDDOC" >&6 echo "$as_me:$LINENO: checking Whether to build pdf documentation" >&5 echo $ECHO_N "checking Whether to build pdf documentation... $ECHO_C" >&6 -if test x$PS2PDF != x ; then +if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes else BUILDPDFDOC=no @@ -26264,10 +26188,10 @@ fi echo "$as_me:$LINENO: result: $BUILDPDFDOC" >&5 echo "${ECHO_T}$BUILDPDFDOC" >&6 -MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" -MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps" +MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt" +MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps" MAKE_PDF="$PS2PDF" -MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0" +MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0" @@ -26483,9 +26407,6 @@ echo "$as_me:$LINENO: checking for XLIB" >&5 echo $ECHO_N "checking for XLIB... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XLIB_CFLAGS"; then - pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5 @@ -26496,14 +26417,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XLIB_LIBS"; then - pkg_cv_XLIB_LIBS="$XLIB_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5 ($PKG_CONFIG --exists --print-errors "x11") 2>&5 @@ -26514,59 +26431,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` - else - XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` - fi + XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` # Put the nasty error message in config.log where it belongs - echo "$XLIB_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (x11) were not met: - -$XLIB_PKG_ERRORS + echo "$XLIB_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (x11) were not met: - -$XLIB_PKG_ERRORS - +Alternatively you may set the XLIB_CFLAGS and XLIB_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XLIB_CFLAGS and XLIB_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XLIB_CFLAGS and XLIB_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -26574,9 +26470,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XLIB_CFLAGS -and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XLIB_CFLAGS and XLIB_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -26594,9 +26490,6 @@ echo "$as_me:$LINENO: checking for GL" >&5 echo $ECHO_N "checking for GL... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$GL_CFLAGS"; then - pkg_cv_GL_CFLAGS="$GL_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 @@ -26607,14 +26500,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GL_LIBS"; then - pkg_cv_GL_LIBS="$GL_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 @@ -26625,59 +26514,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.7"` - else - GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.7"` - fi + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.7"` # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.7) were not met: - -$GL_PKG_ERRORS + echo "$GL_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.7) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (glproto >= 1.4.7) were not met: - -$GL_PKG_ERRORS - +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (glproto >= 1.4.7) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -26685,9 +26553,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -26781,9 +26649,6 @@ echo "$as_me:$LINENO: checking for DRIPROTO" >&5 echo $ECHO_N "checking for DRIPROTO... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$DRIPROTO_CFLAGS"; then - pkg_cv_DRIPROTO_CFLAGS="$DRIPROTO_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto\"") >&5 ($PKG_CONFIG --exists --print-errors "xf86driproto") 2>&5 @@ -26794,14 +26659,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$DRIPROTO_LIBS"; then - pkg_cv_DRIPROTO_LIBS="$DRIPROTO_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xf86driproto\"") >&5 ($PKG_CONFIG --exists --print-errors "xf86driproto") 2>&5 @@ -26812,59 +26673,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xf86driproto"` - else - DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xf86driproto"` - fi + DRIPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xf86driproto"` # Put the nasty error message in config.log where it belongs - echo "$DRIPROTO_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xf86driproto) were not met: - -$DRIPROTO_PKG_ERRORS + echo "$DRIPROTO_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xf86driproto) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xf86driproto) were not met: - -$DRIPROTO_PKG_ERRORS - +Alternatively you may set the DRIPROTO_CFLAGS and DRIPROTO_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xf86driproto) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the DRIPROTO_CFLAGS and DRIPROTO_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DRIPROTO_CFLAGS and DRIPROTO_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -26872,9 +26712,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DRIPROTO_CFLAGS -and DRIPROTO_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DRIPROTO_CFLAGS and DRIPROTO_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -26892,9 +26732,6 @@ echo "$as_me:$LINENO: checking for LIBDRM" >&5 echo $ECHO_N "checking for LIBDRM... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$LIBDRM_CFLAGS"; then - pkg_cv_LIBDRM_CFLAGS="$LIBDRM_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm\"") >&5 ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 @@ -26905,14 +26742,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$LIBDRM_LIBS"; then - pkg_cv_LIBDRM_LIBS="$LIBDRM_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm\"") >&5 ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5 @@ -26923,59 +26756,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBDRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm"` - else - LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm"` - fi + LIBDRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm"` # Put the nasty error message in config.log where it belongs - echo "$LIBDRM_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (libdrm) were not met: - -$LIBDRM_PKG_ERRORS + echo "$LIBDRM_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (libdrm) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (libdrm) were not met: - -$LIBDRM_PKG_ERRORS - +Alternatively you may set the LIBDRM_CFLAGS and LIBDRM_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (libdrm) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the LIBDRM_CFLAGS and LIBDRM_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the LIBDRM_CFLAGS and LIBDRM_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -26983,9 +26795,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables LIBDRM_CFLAGS -and LIBDRM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the LIBDRM_CFLAGS and LIBDRM_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -27003,9 +26815,6 @@ echo "$as_me:$LINENO: checking for GL" >&5 echo $ECHO_N "checking for GL... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$GL_CFLAGS"; then - pkg_cv_GL_CFLAGS="$GL_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1") 2>&5 @@ -27016,14 +26825,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GL_LIBS"; then - pkg_cv_GL_LIBS="$GL_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.1\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.1") 2>&5 @@ -27034,59 +26839,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.1"` - else - GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.1"` - fi + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.1"` # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.1) were not met: - -$GL_PKG_ERRORS + echo "$GL_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.1) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (glproto >= 1.4.1) were not met: - -$GL_PKG_ERRORS - +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (glproto >= 1.4.1) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -27094,9 +26878,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -27374,9 +27158,6 @@ echo "$as_me:$LINENO: checking for XPRINTPROTO" >&5 echo $ECHO_N "checking for XPRINTPROTO... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XPRINTPROTO_CFLAGS"; then - pkg_cv_XPRINTPROTO_CFLAGS="$XPRINTPROTO_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"printproto\"") >&5 ($PKG_CONFIG --exists --print-errors "printproto") 2>&5 @@ -27387,14 +27168,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XPRINTPROTO_LIBS"; then - pkg_cv_XPRINTPROTO_LIBS="$XPRINTPROTO_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"printproto\"") >&5 ($PKG_CONFIG --exists --print-errors "printproto") 2>&5 @@ -27405,31 +27182,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XPRINTPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "printproto"` - else - XPRINTPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "printproto"` - fi + XPRINTPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "printproto"` # Put the nasty error message in config.log where it belongs - echo "$XPRINTPROTO_PKG_ERRORS" >&5 + echo "$XPRINTPROTO_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - XPRINT=no + XPRINT=no elif test $pkg_failed = untried; then XPRINT=no else @@ -27680,9 +27442,6 @@ echo "$as_me:$LINENO: checking for XDMCP" >&5 echo $ECHO_N "checking for XDMCP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XDMCP_CFLAGS"; then - pkg_cv_XDMCP_CFLAGS="$XDMCP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 @@ -27693,14 +27452,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XDMCP_LIBS"; then - pkg_cv_XDMCP_LIBS="$XDMCP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xdmcp\"") >&5 ($PKG_CONFIG --exists --print-errors "xdmcp") 2>&5 @@ -27711,31 +27466,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XDMCP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xdmcp"` - else - XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` - fi + XDMCP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xdmcp"` # Put the nasty error message in config.log where it belongs - echo "$XDMCP_PKG_ERRORS" >&5 + echo "$XDMCP_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - have_libxdmcp="no" + have_libxdmcp="no" elif test $pkg_failed = untried; then have_libxdmcp="no" else @@ -28115,9 +27855,6 @@ echo "$as_me:$LINENO: checking for XSERVERCFLAGS" >&5 echo $ECHO_N "checking for XSERVERCFLAGS... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XSERVERCFLAGS_CFLAGS"; then - pkg_cv_XSERVERCFLAGS_CFLAGS="$XSERVERCFLAGS_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 @@ -28128,14 +27865,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XSERVERCFLAGS_LIBS"; then - pkg_cv_XSERVERCFLAGS_LIBS="$XSERVERCFLAGS_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_MODULES \$REQUIRED_LIBS\"") >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS") 2>&5 @@ -28146,59 +27879,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` - else - XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` - fi + XSERVERCFLAGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_MODULES $REQUIRED_LIBS"` # Put the nasty error message in config.log where it belongs - echo "$XSERVERCFLAGS_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: - -$XSERVERCFLAGS_PKG_ERRORS + echo "$XSERVERCFLAGS_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met: - -$XSERVERCFLAGS_PKG_ERRORS - +Alternatively you may set the XSERVERCFLAGS_CFLAGS and XSERVERCFLAGS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements ($REQUIRED_MODULES $REQUIRED_LIBS) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XSERVERCFLAGS_CFLAGS and XSERVERCFLAGS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XSERVERCFLAGS_CFLAGS and XSERVERCFLAGS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -28206,9 +27918,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XSERVERCFLAGS_CFLAGS -and XSERVERCFLAGS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XSERVERCFLAGS_CFLAGS and XSERVERCFLAGS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -28226,9 +27938,6 @@ echo "$as_me:$LINENO: checking for XSERVERLIBS" >&5 echo $ECHO_N "checking for XSERVERLIBS... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XSERVERLIBS_CFLAGS"; then - pkg_cv_XSERVERLIBS_CFLAGS="$XSERVERLIBS_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 @@ -28239,14 +27948,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XSERVERLIBS_LIBS"; then - pkg_cv_XSERVERLIBS_LIBS="$XSERVERLIBS_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$REQUIRED_LIBS\"") >&5 ($PKG_CONFIG --exists --print-errors "$REQUIRED_LIBS") 2>&5 @@ -28257,59 +27962,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$REQUIRED_LIBS"` - else - XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` - fi + XSERVERLIBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$REQUIRED_LIBS"` # Put the nasty error message in config.log where it belongs - echo "$XSERVERLIBS_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_LIBS) were not met: - -$XSERVERLIBS_PKG_ERRORS + echo "$XSERVERLIBS_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements ($REQUIRED_LIBS) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements ($REQUIRED_LIBS) were not met: - -$XSERVERLIBS_PKG_ERRORS - +Alternatively you may set the XSERVERLIBS_CFLAGS and XSERVERLIBS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements ($REQUIRED_LIBS) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XSERVERLIBS_CFLAGS and XSERVERLIBS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XSERVERLIBS_CFLAGS and XSERVERLIBS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -28317,9 +28001,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XSERVERLIBS_CFLAGS -and XSERVERLIBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XSERVERLIBS_CFLAGS and XSERVERLIBS_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -28626,9 +28310,6 @@ echo "$as_me:$LINENO: checking for DMXMODULES" >&5 echo $ECHO_N "checking for DMXMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$DMXMODULES_CFLAGS"; then - pkg_cv_DMXMODULES_CFLAGS="$DMXMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 @@ -28639,14 +28320,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$DMXMODULES_LIBS"; then - pkg_cv_DMXMODULES_LIBS="$DMXMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xmuu xext x11 xrender xfont xi dmxproto xau \$XDMCP_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES") 2>&5 @@ -28657,31 +28334,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES"` - else - DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES"` - fi + DMXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xmuu xext x11 xrender xfont xi dmxproto xau $XDMCP_MODULES"` # Put the nasty error message in config.log where it belongs - echo "$DMXMODULES_PKG_ERRORS" >&5 + echo "$DMXMODULES_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - have_dmx=no + have_dmx=no elif test $pkg_failed = untried; then have_dmx=no else @@ -29014,9 +28676,6 @@ echo "$as_me:$LINENO: checking for GL" >&5 echo $ECHO_N "checking for GL... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$GL_CFLAGS"; then - pkg_cv_GL_CFLAGS="$GL_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto") 2>&5 @@ -29027,14 +28686,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GL_LIBS"; then - pkg_cv_GL_LIBS="$GL_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto\"") >&5 ($PKG_CONFIG --exists --print-errors "glproto") 2>&5 @@ -29045,59 +28700,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto"` - else - GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto"` - fi + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto"` # Put the nasty error message in config.log where it belongs - echo "$GL_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (glproto) were not met: - -$GL_PKG_ERRORS + echo "$GL_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (glproto) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (glproto) were not met: - -$GL_PKG_ERRORS - +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (glproto) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29105,9 +28739,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables GL_CFLAGS -and GL_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the GL_CFLAGS and GL_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29126,9 +28760,6 @@ echo "$as_me:$LINENO: checking for XDMXCONFIG_DEP" >&5 echo $ECHO_N "checking for XDMXCONFIG_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XDMXCONFIG_DEP_CFLAGS"; then - pkg_cv_XDMXCONFIG_DEP_CFLAGS="$XDMXCONFIG_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 @@ -29139,14 +28770,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XDMXCONFIG_DEP_LIBS"; then - pkg_cv_XDMXCONFIG_DEP_LIBS="$XDMXCONFIG_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xaw7 xmu xt xpm x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xaw7 xmu xt xpm x11") 2>&5 @@ -29157,59 +28784,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` - else - XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` - fi + XDMXCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xaw7 xmu xt xpm x11"` # Put the nasty error message in config.log where it belongs - echo "$XDMXCONFIG_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xaw7 xmu xt xpm x11) were not met: - -$XDMXCONFIG_DEP_PKG_ERRORS + echo "$XDMXCONFIG_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xaw7 xmu xt xpm x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xaw7 xmu xt xpm x11) were not met: - -$XDMXCONFIG_DEP_PKG_ERRORS - +Alternatively you may set the XDMXCONFIG_DEP_CFLAGS and XDMXCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xaw7 xmu xt xpm x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XDMXCONFIG_DEP_CFLAGS and XDMXCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XDMXCONFIG_DEP_CFLAGS and XDMXCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29217,9 +28823,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XDMXCONFIG_DEP_CFLAGS -and XDMXCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XDMXCONFIG_DEP_CFLAGS and XDMXCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29239,9 +28845,6 @@ echo "$as_me:$LINENO: checking for DMXEXAMPLES_DEP" >&5 echo $ECHO_N "checking for DMXEXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xext x11") 2>&5 @@ -29252,14 +28855,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$DMXEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xext x11") 2>&5 @@ -29270,59 +28869,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dmx xext x11"` - else - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xext x11"` - fi + DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xext x11"` # Put the nasty error message in config.log where it belongs - echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (dmx xext x11) were not met: - -$DMXEXAMPLES_DEP_PKG_ERRORS + echo "$DMXEXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (dmx xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (dmx xext x11) were not met: - -$DMXEXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the DMXEXAMPLES_DEP_CFLAGS and DMXEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (dmx xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the DMXEXAMPLES_DEP_CFLAGS and DMXEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXEXAMPLES_DEP_CFLAGS and DMXEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29330,9 +28908,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXEXAMPLES_DEP_CFLAGS -and DMXEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXEXAMPLES_DEP_CFLAGS and DMXEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29351,9 +28929,6 @@ echo "$as_me:$LINENO: checking for DMXXMUEXAMPLES_DEP" >&5 echo $ECHO_N "checking for DMXXMUEXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xmu xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xmu xext x11") 2>&5 @@ -29364,14 +28939,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xmu xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xmu xext x11") 2>&5 @@ -29382,59 +28953,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dmx xmu xext x11"` - else - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xmu xext x11"` - fi + DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xmu xext x11"` # Put the nasty error message in config.log where it belongs - echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (dmx xmu xext x11) were not met: - -$DMXXMUEXAMPLES_DEP_PKG_ERRORS + echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (dmx xmu xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (dmx xmu xext x11) were not met: - -$DMXXMUEXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the DMXXMUEXAMPLES_DEP_CFLAGS and DMXXMUEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (dmx xmu xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the DMXXMUEXAMPLES_DEP_CFLAGS and DMXXMUEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXXMUEXAMPLES_DEP_CFLAGS and DMXXMUEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29442,9 +28992,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXXMUEXAMPLES_DEP_CFLAGS -and DMXXMUEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXXMUEXAMPLES_DEP_CFLAGS and DMXXMUEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29463,9 +29013,6 @@ echo "$as_me:$LINENO: checking for DMXXIEXAMPLES_DEP" >&5 echo $ECHO_N "checking for DMXXIEXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then - pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xi xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xi xext x11") 2>&5 @@ -29476,14 +29023,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then - pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xi xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "dmx xi xext x11") 2>&5 @@ -29494,59 +29037,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dmx xi xext x11"` - else - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xi xext x11"` - fi + DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dmx xi xext x11"` # Put the nasty error message in config.log where it belongs - echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (dmx xi xext x11) were not met: - -$DMXXIEXAMPLES_DEP_PKG_ERRORS + echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (dmx xi xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (dmx xi xext x11) were not met: - -$DMXXIEXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the DMXXIEXAMPLES_DEP_CFLAGS and DMXXIEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (dmx xi xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the DMXXIEXAMPLES_DEP_CFLAGS and DMXXIEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXXIEXAMPLES_DEP_CFLAGS and DMXXIEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29554,9 +29076,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables DMXXIEXAMPLES_DEP_CFLAGS -and DMXXIEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the DMXXIEXAMPLES_DEP_CFLAGS and DMXXIEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29575,9 +29097,6 @@ echo "$as_me:$LINENO: checking for XTSTEXAMPLES_DEP" >&5 echo $ECHO_N "checking for XTSTEXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then - pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xtst xext x11") 2>&5 @@ -29588,14 +29107,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XTSTEXAMPLES_DEP_LIBS"; then - pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xtst xext x11") 2>&5 @@ -29606,59 +29121,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst xext x11"` - else - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst xext x11"` - fi + XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst xext x11"` # Put the nasty error message in config.log where it belongs - echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xtst xext x11) were not met: - -$XTSTEXAMPLES_DEP_PKG_ERRORS + echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xtst xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xtst xext x11) were not met: - -$XTSTEXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the XTSTEXAMPLES_DEP_CFLAGS and XTSTEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xtst xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XTSTEXAMPLES_DEP_CFLAGS and XTSTEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XTSTEXAMPLES_DEP_CFLAGS and XTSTEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29666,9 +29160,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XTSTEXAMPLES_DEP_CFLAGS -and XTSTEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XTSTEXAMPLES_DEP_CFLAGS and XTSTEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29687,9 +29181,6 @@ echo "$as_me:$LINENO: checking for XRESEXAMPLES_DEP" >&5 echo $ECHO_N "checking for XRESEXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XRESEXAMPLES_DEP_CFLAGS"; then - pkg_cv_XRESEXAMPLES_DEP_CFLAGS="$XRESEXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xres xext x11") 2>&5 @@ -29700,14 +29191,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XRESEXAMPLES_DEP_LIBS"; then - pkg_cv_XRESEXAMPLES_DEP_LIBS="$XRESEXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xres xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xres xext x11") 2>&5 @@ -29718,59 +29205,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xres xext x11"` - else - XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres xext x11"` - fi + XRESEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xres xext x11"` # Put the nasty error message in config.log where it belongs - echo "$XRESEXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xres xext x11) were not met: - -$XRESEXAMPLES_DEP_PKG_ERRORS + echo "$XRESEXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xres xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xres xext x11) were not met: - -$XRESEXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the XRESEXAMPLES_DEP_CFLAGS and XRESEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xres xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XRESEXAMPLES_DEP_CFLAGS and XRESEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XRESEXAMPLES_DEP_CFLAGS and XRESEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29778,9 +29244,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XRESEXAMPLES_DEP_CFLAGS -and XRESEXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XRESEXAMPLES_DEP_CFLAGS and XRESEXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29799,9 +29265,6 @@ echo "$as_me:$LINENO: checking for X11EXAMPLES_DEP" >&5 echo $ECHO_N "checking for X11EXAMPLES_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$X11EXAMPLES_DEP_CFLAGS"; then - pkg_cv_X11EXAMPLES_DEP_CFLAGS="$X11EXAMPLES_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xext x11") 2>&5 @@ -29812,14 +29275,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$X11EXAMPLES_DEP_LIBS"; then - pkg_cv_X11EXAMPLES_DEP_LIBS="$X11EXAMPLES_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xext x11") 2>&5 @@ -29830,59 +29289,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext x11"` - else - X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext x11"` - fi + X11EXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext x11"` # Put the nasty error message in config.log where it belongs - echo "$X11EXAMPLES_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xext x11) were not met: - -$X11EXAMPLES_DEP_PKG_ERRORS + echo "$X11EXAMPLES_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xext x11) were not met: - -$X11EXAMPLES_DEP_PKG_ERRORS - +Alternatively you may set the X11EXAMPLES_DEP_CFLAGS and X11EXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the X11EXAMPLES_DEP_CFLAGS and X11EXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the X11EXAMPLES_DEP_CFLAGS and X11EXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -29890,9 +29328,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables X11EXAMPLES_DEP_CFLAGS -and X11EXAMPLES_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the X11EXAMPLES_DEP_CFLAGS and X11EXAMPLES_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -29959,9 +29397,6 @@ echo "$as_me:$LINENO: checking for XNESTMODULES" >&5 echo $ECHO_N "checking for XNESTMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XNESTMODULES_CFLAGS"; then - pkg_cv_XNESTMODULES_CFLAGS="$XNESTMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont xext x11 xau \$XDMCP_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "xfont xext x11 xau $XDMCP_MODULES") 2>&5 @@ -29972,14 +29407,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XNESTMODULES_LIBS"; then - pkg_cv_XNESTMODULES_LIBS="$XNESTMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xfont xext x11 xau \$XDMCP_MODULES\"") >&5 ($PKG_CONFIG --exists --print-errors "xfont xext x11 xau $XDMCP_MODULES") 2>&5 @@ -29990,31 +29421,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfont xext x11 xau $XDMCP_MODULES"` - else - XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont xext x11 xau $XDMCP_MODULES"` - fi + XNESTMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfont xext x11 xau $XDMCP_MODULES"` # Put the nasty error message in config.log where it belongs - echo "$XNESTMODULES_PKG_ERRORS" >&5 + echo "$XNESTMODULES_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - have_xnest=no + have_xnest=no elif test $pkg_failed = untried; then have_xnest=no else @@ -30069,9 +29485,6 @@ echo "$as_me:$LINENO: checking for XGLMODULES" >&5 echo $ECHO_N "checking for XGLMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XGLMODULES_CFLAGS"; then - pkg_cv_XGLMODULES_CFLAGS="$XGLMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3") 2>&5 @@ -30082,14 +29495,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XGLMODULES_LIBS"; then - pkg_cv_XGLMODULES_LIBS="$XGLMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3") 2>&5 @@ -30100,31 +29509,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` - else - XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` - fi + XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` # Put the nasty error message in config.log where it belongs - echo "$XGLMODULES_PKG_ERRORS" >&5 + echo "$XGLMODULES_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - XGL=no + XGL=no elif test $pkg_failed = untried; then XGL=no else @@ -30190,9 +29584,6 @@ echo "$as_me:$LINENO: checking for XGLMODULES" >&5 echo $ECHO_N "checking for XGLMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XGLMODULES_CFLAGS"; then - pkg_cv_XGLMODULES_CFLAGS="$XGLMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3") 2>&5 @@ -30203,14 +29594,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XGLMODULES_LIBS"; then - pkg_cv_XGLMODULES_LIBS="$XGLMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3") 2>&5 @@ -30221,31 +29608,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` - else - XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` - fi + XGLMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3"` # Put the nasty error message in config.log where it belongs - echo "$XGLMODULES_PKG_ERRORS" >&5 + echo "$XGLMODULES_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - XEGL=no + XEGL=no elif test $pkg_failed = untried; then XEGL=no else @@ -30286,9 +29658,6 @@ echo "$as_me:$LINENO: checking for XGLXMODULES" >&5 echo $ECHO_N "checking for XGLXMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XGLXMODULES_CFLAGS"; then - pkg_cv_XGLXMODULES_CFLAGS="$XGLXMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3 xrender\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3 xrender") 2>&5 @@ -30299,14 +29668,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XGLXMODULES_LIBS"; then - pkg_cv_XGLXMODULES_LIBS="$XGLXMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glitz-glx >= 0.4.3 xrender\"") >&5 ($PKG_CONFIG --exists --print-errors "glitz-glx >= 0.4.3 xrender") 2>&5 @@ -30317,31 +29682,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XGLXMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glitz-glx >= 0.4.3 xrender"` - else - XGLXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3 xrender"` - fi + XGLXMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glitz-glx >= 0.4.3 xrender"` # Put the nasty error message in config.log where it belongs - echo "$XGLXMODULES_PKG_ERRORS" >&5 + echo "$XGLXMODULES_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - XGLX=no + XGLX=no elif test $pkg_failed = untried; then XGLX=no else @@ -31315,9 +30665,6 @@ echo "$as_me:$LINENO: checking for XPRINT" >&5 echo $ECHO_N "checking for XPRINT... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XPRINT_CFLAGS"; then - pkg_cv_XPRINT_CFLAGS="$XPRINT_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"printproto x11 xfont \$XDMCP_MODULES xau\"") >&5 ($PKG_CONFIG --exists --print-errors "printproto x11 xfont $XDMCP_MODULES xau") 2>&5 @@ -31328,14 +30675,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XPRINT_LIBS"; then - pkg_cv_XPRINT_LIBS="$XPRINT_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"printproto x11 xfont \$XDMCP_MODULES xau\"") >&5 ($PKG_CONFIG --exists --print-errors "printproto x11 xfont $XDMCP_MODULES xau") 2>&5 @@ -31346,59 +30689,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "printproto x11 xfont $XDMCP_MODULES xau"` - else - XPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "printproto x11 xfont $XDMCP_MODULES xau"` - fi + XPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "printproto x11 xfont $XDMCP_MODULES xau"` # Put the nasty error message in config.log where it belongs - echo "$XPRINT_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (printproto x11 xfont $XDMCP_MODULES xau) were not met: - -$XPRINT_PKG_ERRORS + echo "$XPRINT_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (printproto x11 xfont $XDMCP_MODULES xau) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XPRINT_CFLAGS -and XPRINT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (printproto x11 xfont $XDMCP_MODULES xau) were not met: - -$XPRINT_PKG_ERRORS - +Alternatively you may set the XPRINT_CFLAGS and XPRINT_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (printproto x11 xfont $XDMCP_MODULES xau) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XPRINT_CFLAGS -and XPRINT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XPRINT_CFLAGS and XPRINT_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XPRINT_CFLAGS -and XPRINT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XPRINT_CFLAGS and XPRINT_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -31406,9 +30728,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XPRINT_CFLAGS -and XPRINT_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XPRINT_CFLAGS and XPRINT_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -31522,9 +30844,6 @@ echo "$as_me:$LINENO: checking for FREETYPE" >&5 echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$FREETYPE_CFLAGS"; then - pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 @@ -31535,14 +30854,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$FREETYPE_LIBS"; then - pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5 ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 @@ -31553,31 +30868,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "freetype2"` - else - FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"` - fi + FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"` # Put the nasty error message in config.log where it belongs - echo "$FREETYPE_PKG_ERRORS" >&5 + echo "$FREETYPE_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - freetype_config=yes + freetype_config=yes elif test $pkg_failed = untried; then freetype_config=yes else @@ -31691,9 +30991,6 @@ echo "$as_me:$LINENO: checking for XWINMODULES" >&5 echo $ECHO_N "checking for XWINMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XWINMODULES_CFLAGS"; then - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 @@ -31704,14 +31001,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XWINMODULES_LIBS"; then - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 @@ -31722,59 +31015,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` - else - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` - fi + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_PKG_ERRORS + echo "$XWINMODULES_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_PKG_ERRORS - +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -31782,9 +31054,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -31815,9 +31087,6 @@ echo "$as_me:$LINENO: checking for XWINMODULES" >&5 echo $ECHO_N "checking for XWINMODULES... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XWINMODULES_CFLAGS"; then - pkg_cv_XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 @@ -31828,14 +31097,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XWINMODULES_LIBS"; then - pkg_cv_XWINMODULES_LIBS="$XWINMODULES_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xdmcp xau xfont\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xdmcp xau xfont") 2>&5 @@ -31846,59 +31111,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` - else - XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` - fi + XWINMODULES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xdmcp xau xfont"` # Put the nasty error message in config.log where it belongs - echo "$XWINMODULES_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_PKG_ERRORS + echo "$XWINMODULES_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (x11 xdmcp xau xfont) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met: - -$XWINMODULES_PKG_ERRORS - +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (x11 xdmcp xau xfont) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -31906,9 +31150,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XWINMODULES_CFLAGS -and XWINMODULES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XWINMODULES_CFLAGS and XWINMODULES_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -32442,9 +31686,6 @@ echo "$as_me:$LINENO: checking for TSLIB" >&5 echo $ECHO_N "checking for TSLIB... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$TSLIB_CFLAGS"; then - pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 @@ -32455,14 +31696,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$TSLIB_LIBS"; then - pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 @@ -32473,31 +31710,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-0.0"` - else - TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"` - fi + TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-0.0"` # Put the nasty error message in config.log where it belongs - echo "$TSLIB_PKG_ERRORS" >&5 + echo "$TSLIB_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - HAVE_TSLIB="no" + HAVE_TSLIB="no" elif test $pkg_failed = untried; then HAVE_TSLIB="no" else @@ -32543,9 +31765,6 @@ echo "$as_me:$LINENO: checking for XEPHYR" >&5 echo $ECHO_N "checking for XEPHYR... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XEPHYR_CFLAGS"; then - pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext xfont xau xdmcp\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp") 2>&5 @@ -32556,14 +31775,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XEPHYR_LIBS"; then - pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext xfont xau xdmcp\"") >&5 ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp") 2>&5 @@ -32574,31 +31789,16 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xext xfont xau xdmcp"` - else - XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xext xfont xau xdmcp"` - fi + XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xext xfont xau xdmcp"` # Put the nasty error message in config.log where it belongs - echo "$XEPHYR_PKG_ERRORS" >&5 + echo "$XEPHYR_PKG_ERRORS" 1>&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - xephyr="no" + xephyr="no" elif test $pkg_failed = untried; then xephyr="no" else @@ -33145,9 +32345,6 @@ echo "$as_me:$LINENO: checking for XORGCONFIG_DEP" >&5 echo $ECHO_N "checking for XORGCONFIG_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XORGCONFIG_DEP_CFLAGS"; then - pkg_cv_XORGCONFIG_DEP_CFLAGS="$XORGCONFIG_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xkbfile x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xkbfile x11") 2>&5 @@ -33158,14 +32355,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XORGCONFIG_DEP_LIBS"; then - pkg_cv_XORGCONFIG_DEP_LIBS="$XORGCONFIG_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xkbfile x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xkbfile x11") 2>&5 @@ -33176,59 +32369,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XORGCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xkbfile x11"` - else - XORGCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xkbfile x11"` - fi + XORGCONFIG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xkbfile x11"` # Put the nasty error message in config.log where it belongs - echo "$XORGCONFIG_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xkbfile x11) were not met: - -$XORGCONFIG_DEP_PKG_ERRORS + echo "$XORGCONFIG_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xkbfile x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XORGCONFIG_DEP_CFLAGS -and XORGCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xkbfile x11) were not met: - -$XORGCONFIG_DEP_PKG_ERRORS - +Alternatively you may set the XORGCONFIG_DEP_CFLAGS and XORGCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xkbfile x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XORGCONFIG_DEP_CFLAGS -and XORGCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XORGCONFIG_DEP_CFLAGS and XORGCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XORGCONFIG_DEP_CFLAGS -and XORGCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XORGCONFIG_DEP_CFLAGS and XORGCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -33236,9 +32408,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XORGCONFIG_DEP_CFLAGS -and XORGCONFIG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XORGCONFIG_DEP_CFLAGS and XORGCONFIG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -33267,9 +32439,6 @@ echo "$as_me:$LINENO: checking for XORGCFG_DEP" >&5 echo $ECHO_N "checking for XORGCFG_DEP... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XORGCFG_DEP_CFLAGS"; then - pkg_cv_XORGCFG_DEP_CFLAGS="$XORGCFG_DEP_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11") 2>&5 @@ -33280,14 +32449,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XORGCFG_DEP_LIBS"; then - pkg_cv_XORGCFG_DEP_LIBS="$XORGCFG_DEP_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11") 2>&5 @@ -33298,59 +32463,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XORGCFG_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11"` - else - XORGCFG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11"` - fi + XORGCFG_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11"` # Put the nasty error message in config.log where it belongs - echo "$XORGCFG_DEP_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11) were not met: - -$XORGCFG_DEP_PKG_ERRORS + echo "$XORGCFG_DEP_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XORGCFG_DEP_CFLAGS -and XORGCFG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11) were not met: - -$XORGCFG_DEP_PKG_ERRORS - +Alternatively you may set the XORGCFG_DEP_CFLAGS and XORGCFG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xkbui >= 1.0.2 xkbfile xxf86misc xxf86vm xaw7 xmu xt xpm xext x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XORGCFG_DEP_CFLAGS -and XORGCFG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XORGCFG_DEP_CFLAGS and XORGCFG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XORGCFG_DEP_CFLAGS -and XORGCFG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XORGCFG_DEP_CFLAGS and XORGCFG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -33358,9 +32502,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XORGCFG_DEP_CFLAGS -and XORGCFG_DEP_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XORGCFG_DEP_CFLAGS and XORGCFG_DEP_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -35273,7 +34417,6 @@ s,@host@,$host,;t t s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t -s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@ECHO@,$ECHO,;t t s,@AR@,$AR,;t t diff --git a/xserver/damageext/Makefile.in b/xserver/damageext/Makefile.in index ac30b5ccd..26aa1a63f 100644 --- a/xserver/damageext/Makefile.in +++ b/xserver/damageext/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/dbe/Makefile.in b/xserver/dbe/Makefile.in index 10042adbf..d0ca86ce9 100644 --- a/xserver/dbe/Makefile.in +++ b/xserver/dbe/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in index e3f3a7bd7..a1dcb0a0b 100644 --- a/xserver/dix/Makefile.in +++ b/xserver/dix/Makefile.in @@ -306,7 +306,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in index 6ff181766..7e97d66dc 100644 --- a/xserver/doc/Makefile.in +++ b/xserver/doc/Makefile.in @@ -296,7 +296,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -531,6 +530,7 @@ appman_PROCESSED = $(appman_PRE:man.pre=man) appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@) BUILT_SOURCES = $(appman_PROCESSED) CLEANFILES = $(appman_PROCESSED) $(appman_DATA) +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/exa/Makefile.in b/xserver/exa/Makefile.in index 1e11b4ae9..c32fbdcd5 100644 --- a/xserver/exa/Makefile.in +++ b/xserver/exa/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/xserver/fb/Makefile.in b/xserver/fb/Makefile.in index 5fa54c923..66159cb85 100644 --- a/xserver/fb/Makefile.in +++ b/xserver/fb/Makefile.in @@ -321,7 +321,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/Makefile.in b/xserver/hw/Makefile.in index 77a6b1788..3d0297314 100644 --- a/xserver/hw/Makefile.in +++ b/xserver/hw/Makefile.in @@ -289,7 +289,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/darwin/Makefile.in b/xserver/hw/darwin/Makefile.in index 9d2196d7a..584a4b5e3 100644 --- a/xserver/hw/darwin/Makefile.in +++ b/xserver/hw/darwin/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/Makefile.in b/xserver/hw/dmx/Makefile.in index 9e1678563..d0b536de7 100644 --- a/xserver/hw/dmx/Makefile.in +++ b/xserver/hw/dmx/Makefile.in @@ -348,7 +348,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/config/Makefile.in b/xserver/hw/dmx/config/Makefile.in index a43e2ff4d..63d0f99d5 100644 --- a/xserver/hw/dmx/config/Makefile.in +++ b/xserver/hw/dmx/config/Makefile.in @@ -332,7 +332,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/doc/Makefile.in b/xserver/hw/dmx/doc/Makefile.in index 663f5837e..53a0e7e18 100644 --- a/xserver/hw/dmx/doc/Makefile.in +++ b/xserver/hw/dmx/doc/Makefile.in @@ -304,7 +304,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/examples/Makefile.in b/xserver/hw/dmx/examples/Makefile.in index adaa34acf..169544714 100644 --- a/xserver/hw/dmx/examples/Makefile.in +++ b/xserver/hw/dmx/examples/Makefile.in @@ -359,7 +359,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/glxProxy/Makefile.in b/xserver/hw/dmx/glxProxy/Makefile.in index 0bb8c5f97..f5d15f288 100644 --- a/xserver/hw/dmx/glxProxy/Makefile.in +++ b/xserver/hw/dmx/glxProxy/Makefile.in @@ -307,7 +307,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/dmx/input/Makefile.in b/xserver/hw/dmx/input/Makefile.in index e953cd02e..2d7adf6e9 100644 --- a/xserver/hw/dmx/input/Makefile.in +++ b/xserver/hw/dmx/input/Makefile.in @@ -321,7 +321,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/Makefile.in b/xserver/hw/kdrive/Makefile.in index e72559052..9bc8fa0dd 100644 --- a/xserver/hw/kdrive/Makefile.in +++ b/xserver/hw/kdrive/Makefile.in @@ -289,7 +289,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/ati/Makefile.in b/xserver/hw/kdrive/ati/Makefile.in index c4081b051..148627a4e 100644 --- a/xserver/hw/kdrive/ati/Makefile.in +++ b/xserver/hw/kdrive/ati/Makefile.in @@ -331,7 +331,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/chips/Makefile.in b/xserver/hw/kdrive/chips/Makefile.in index e8bb1d34a..eb357445d 100644 --- a/xserver/hw/kdrive/chips/Makefile.in +++ b/xserver/hw/kdrive/chips/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/ephyr/Makefile.in b/xserver/hw/kdrive/ephyr/Makefile.in index 0988a4a9e..aca823977 100644 --- a/xserver/hw/kdrive/ephyr/Makefile.in +++ b/xserver/hw/kdrive/ephyr/Makefile.in @@ -315,7 +315,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/epson/Makefile.in b/xserver/hw/kdrive/epson/Makefile.in index f500d930b..f3f0e52f6 100644 --- a/xserver/hw/kdrive/epson/Makefile.in +++ b/xserver/hw/kdrive/epson/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/fake/Makefile.in b/xserver/hw/kdrive/fake/Makefile.in index 7a2159f8a..173038457 100644 --- a/xserver/hw/kdrive/fake/Makefile.in +++ b/xserver/hw/kdrive/fake/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/fbdev/Makefile.in b/xserver/hw/kdrive/fbdev/Makefile.in index 2b2deddbf..f1604c8d6 100644 --- a/xserver/hw/kdrive/fbdev/Makefile.in +++ b/xserver/hw/kdrive/fbdev/Makefile.in @@ -308,7 +308,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/i810/Makefile.in b/xserver/hw/kdrive/i810/Makefile.in index abea2c0d8..34b18bfa9 100644 --- a/xserver/hw/kdrive/i810/Makefile.in +++ b/xserver/hw/kdrive/i810/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/linux/Makefile.in b/xserver/hw/kdrive/linux/Makefile.in index 75dea337a..6fb40500f 100644 --- a/xserver/hw/kdrive/linux/Makefile.in +++ b/xserver/hw/kdrive/linux/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/mach64/Makefile.in b/xserver/hw/kdrive/mach64/Makefile.in index a5e6455c7..049613b3b 100644 --- a/xserver/hw/kdrive/mach64/Makefile.in +++ b/xserver/hw/kdrive/mach64/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/mga/Makefile.in b/xserver/hw/kdrive/mga/Makefile.in index 1d6fc47de..8600ea0e8 100644 --- a/xserver/hw/kdrive/mga/Makefile.in +++ b/xserver/hw/kdrive/mga/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/neomagic/Makefile.in b/xserver/hw/kdrive/neomagic/Makefile.in index 72cdcba13..4ecf5459e 100644 --- a/xserver/hw/kdrive/neomagic/Makefile.in +++ b/xserver/hw/kdrive/neomagic/Makefile.in @@ -316,7 +316,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/nvidia/Makefile.in b/xserver/hw/kdrive/nvidia/Makefile.in index 2c288e19a..04268f178 100644 --- a/xserver/hw/kdrive/nvidia/Makefile.in +++ b/xserver/hw/kdrive/nvidia/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/pm2/Makefile.in b/xserver/hw/kdrive/pm2/Makefile.in index 27425d2a2..006d23297 100644 --- a/xserver/hw/kdrive/pm2/Makefile.in +++ b/xserver/hw/kdrive/pm2/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/r128/Makefile.in b/xserver/hw/kdrive/r128/Makefile.in index 5a73330f2..3373d20c2 100644 --- a/xserver/hw/kdrive/r128/Makefile.in +++ b/xserver/hw/kdrive/r128/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/sdl/Makefile.in b/xserver/hw/kdrive/sdl/Makefile.in index 50c36c013..57f22c504 100644 --- a/xserver/hw/kdrive/sdl/Makefile.in +++ b/xserver/hw/kdrive/sdl/Makefile.in @@ -303,7 +303,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/sis300/Makefile.in b/xserver/hw/kdrive/sis300/Makefile.in index 3a25a293f..2dda80412 100644 --- a/xserver/hw/kdrive/sis300/Makefile.in +++ b/xserver/hw/kdrive/sis300/Makefile.in @@ -315,7 +315,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/smi/Makefile.in b/xserver/hw/kdrive/smi/Makefile.in index 5dcbd5de8..c310a7e95 100644 --- a/xserver/hw/kdrive/smi/Makefile.in +++ b/xserver/hw/kdrive/smi/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/src/Makefile.in b/xserver/hw/kdrive/src/Makefile.in index 132834be1..6bd056cec 100644 --- a/xserver/hw/kdrive/src/Makefile.in +++ b/xserver/hw/kdrive/src/Makefile.in @@ -316,7 +316,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/vesa/Makefile.in b/xserver/hw/kdrive/vesa/Makefile.in index b66a27723..28c16a24b 100644 --- a/xserver/hw/kdrive/vesa/Makefile.in +++ b/xserver/hw/kdrive/vesa/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/kdrive/via/Makefile.in b/xserver/hw/kdrive/via/Makefile.in index d48781518..e7bf8dd46 100644 --- a/xserver/hw/kdrive/via/Makefile.in +++ b/xserver/hw/kdrive/via/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/vfb/Makefile.in b/xserver/hw/vfb/Makefile.in index 47464a841..7e5ae36bd 100644 --- a/xserver/hw/vfb/Makefile.in +++ b/xserver/hw/vfb/Makefile.in @@ -321,7 +321,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -570,6 +569,7 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ \ $(XVFBMODULES_CFLAGS) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/Makefile.in b/xserver/hw/xfree86/Makefile.in index 37cf2f6cb..969b9dfaa 100644 --- a/xserver/hw/xfree86/Makefile.in +++ b/xserver/hw/xfree86/Makefile.in @@ -334,7 +334,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -570,6 +569,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ xglmoduledir = @xglmoduledir@ xpconfigdir = @xpconfigdir@ +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/common/Makefile.in b/xserver/hw/xfree86/common/Makefile.in index ef58431ae..f133f4b61 100644 --- a/xserver/hw/xfree86/common/Makefile.in +++ b/xserver/hw/xfree86/common/Makefile.in @@ -351,7 +351,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/ddc/Makefile.in b/xserver/hw/xfree86/ddc/Makefile.in index e63b0ab73..058c65041 100644 --- a/xserver/hw/xfree86/ddc/Makefile.in +++ b/xserver/hw/xfree86/ddc/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/dixmods/Makefile.in b/xserver/hw/xfree86/dixmods/Makefile.in index 2724f6f50..904ab7487 100644 --- a/xserver/hw/xfree86/dixmods/Makefile.in +++ b/xserver/hw/xfree86/dixmods/Makefile.in @@ -380,7 +380,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/dixmods/extmod/Makefile.in b/xserver/hw/xfree86/dixmods/extmod/Makefile.in index 0ee2ef756..feb37bc51 100644 --- a/xserver/hw/xfree86/dixmods/extmod/Makefile.in +++ b/xserver/hw/xfree86/dixmods/extmod/Makefile.in @@ -317,7 +317,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/Makefile.in b/xserver/hw/xfree86/doc/Makefile.in index ed5620e6d..347d422e8 100644 --- a/xserver/hw/xfree86/doc/Makefile.in +++ b/xserver/hw/xfree86/doc/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/devel/Makefile.in b/xserver/hw/xfree86/doc/devel/Makefile.in index ea842a6c8..829a96312 100644 --- a/xserver/hw/xfree86/doc/devel/Makefile.in +++ b/xserver/hw/xfree86/doc/devel/Makefile.in @@ -284,7 +284,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/doc/man/Makefile.in b/xserver/hw/xfree86/doc/man/Makefile.in index 447061e6b..63f855dae 100644 --- a/xserver/hw/xfree86/doc/man/Makefile.in +++ b/xserver/hw/xfree86/doc/man/Makefile.in @@ -297,7 +297,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -531,6 +530,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = Xorg.$(APP_MAN_SUFFIX) filemandir = $(FILE_MAN_DIR) fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX) +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/doc/sgml/Makefile.in b/xserver/hw/xfree86/doc/sgml/Makefile.in index d21680f87..fffcc60a0 100644 --- a/xserver/hw/xfree86/doc/sgml/Makefile.in +++ b/xserver/hw/xfree86/doc/sgml/Makefile.in @@ -304,7 +304,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/dri/Makefile.in b/xserver/hw/xfree86/dri/Makefile.in index fce0b4db0..a2a5a8f87 100644 --- a/xserver/hw/xfree86/dri/Makefile.in +++ b/xserver/hw/xfree86/dri/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/dummylib/Makefile.in b/xserver/hw/xfree86/dummylib/Makefile.in index bdd65c6d5..ebfa5bea3 100644 --- a/xserver/hw/xfree86/dummylib/Makefile.in +++ b/xserver/hw/xfree86/dummylib/Makefile.in @@ -324,7 +324,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in index 689a9d9cb..81e02509d 100644 --- a/xserver/hw/xfree86/exa/Makefile.in +++ b/xserver/hw/xfree86/exa/Makefile.in @@ -315,7 +315,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -556,6 +555,7 @@ libexa_la_SOURCES = \ libexa_la_LIBADD = \ ../../../exa/libexa.la +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/fbdevhw/Makefile.in b/xserver/hw/xfree86/fbdevhw/Makefile.in index 33f44d80f..a65530014 100644 --- a/xserver/hw/xfree86/fbdevhw/Makefile.in +++ b/xserver/hw/xfree86/fbdevhw/Makefile.in @@ -321,7 +321,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -556,6 +555,7 @@ libfbdevhw_la_LDFLAGS = -avoid-version INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = fbdevhw.h +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/i2c/Makefile.in b/xserver/hw/xfree86/i2c/Makefile.in index 030d366e0..128d40dab 100644 --- a/xserver/hw/xfree86/i2c/Makefile.in +++ b/xserver/hw/xfree86/i2c/Makefile.in @@ -340,7 +340,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/int10/Makefile.in b/xserver/hw/xfree86/int10/Makefile.in index 7a2ec0751..c03f3ee38 100644 --- a/xserver/hw/xfree86/int10/Makefile.in +++ b/xserver/hw/xfree86/int10/Makefile.in @@ -325,7 +325,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/loader/Makefile.in b/xserver/hw/xfree86/loader/Makefile.in index db2f9b171..76b54ad51 100644 --- a/xserver/hw/xfree86/loader/Makefile.in +++ b/xserver/hw/xfree86/loader/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in index dfd6ffa19..2102f0607 100644 --- a/xserver/hw/xfree86/os-support/Makefile.in +++ b/xserver/hw/xfree86/os-support/Makefile.in @@ -317,7 +317,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in index eefe47bfa..0baf0ef14 100644 --- a/xserver/hw/xfree86/os-support/bsd/Makefile.in +++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in @@ -329,7 +329,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in index 658b537d2..6b344c033 100644 --- a/xserver/hw/xfree86/os-support/bus/Makefile.in +++ b/xserver/hw/xfree86/os-support/bus/Makefile.in @@ -337,7 +337,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/drm/Makefile.in b/xserver/hw/xfree86/os-support/drm/Makefile.in index 91a0abe34..7a8c399e7 100644 --- a/xserver/hw/xfree86/os-support/drm/Makefile.in +++ b/xserver/hw/xfree86/os-support/drm/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in index e0aa6dc75..1165210ec 100644 --- a/xserver/hw/xfree86/os-support/hurd/Makefile.in +++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in @@ -302,7 +302,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in index 94d991574..0b339c009 100644 --- a/xserver/hw/xfree86/os-support/linux/Makefile.in +++ b/xserver/hw/xfree86/os-support/linux/Makefile.in @@ -320,7 +320,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/lynxos/Makefile.in b/xserver/hw/xfree86/os-support/lynxos/Makefile.in index 7eb34d148..cada46269 100644 --- a/xserver/hw/xfree86/os-support/lynxos/Makefile.in +++ b/xserver/hw/xfree86/os-support/lynxos/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in index fbf2b55f4..dee87e9ae 100644 --- a/xserver/hw/xfree86/os-support/misc/Makefile.in +++ b/xserver/hw/xfree86/os-support/misc/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in index 2e7f48a5b..4375b4e85 100644 --- a/xserver/hw/xfree86/os-support/sco/Makefile.in +++ b/xserver/hw/xfree86/os-support/sco/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in index c2e8d265f..3268f567b 100644 --- a/xserver/hw/xfree86/os-support/solaris/Makefile.in +++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in @@ -337,7 +337,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in index 7b31c5487..8e4bc614c 100644 --- a/xserver/hw/xfree86/os-support/sysv/Makefile.in +++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/os-support/usl/Makefile.in b/xserver/hw/xfree86/os-support/usl/Makefile.in index bbcee18ab..df0625fb3 100644 --- a/xserver/hw/xfree86/os-support/usl/Makefile.in +++ b/xserver/hw/xfree86/os-support/usl/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/parser/Makefile.in b/xserver/hw/xfree86/parser/Makefile.in index 6d1c3b3d3..c46dc4cee 100644 --- a/xserver/hw/xfree86/parser/Makefile.in +++ b/xserver/hw/xfree86/parser/Makefile.in @@ -319,7 +319,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/rac/Makefile.in b/xserver/hw/xfree86/rac/Makefile.in index a1f5182a9..66b37aa73 100644 --- a/xserver/hw/xfree86/rac/Makefile.in +++ b/xserver/hw/xfree86/rac/Makefile.in @@ -312,7 +312,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/ramdac/Makefile.in b/xserver/hw/xfree86/ramdac/Makefile.in index 74bd2a2ea..6d6cd0694 100644 --- a/xserver/hw/xfree86/ramdac/Makefile.in +++ b/xserver/hw/xfree86/ramdac/Makefile.in @@ -313,7 +313,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/scanpci/Makefile.in b/xserver/hw/xfree86/scanpci/Makefile.in index 193a476da..41b2a3da8 100644 --- a/xserver/hw/xfree86/scanpci/Makefile.in +++ b/xserver/hw/xfree86/scanpci/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/shadowfb/Makefile.in b/xserver/hw/xfree86/shadowfb/Makefile.in index 2f07c7a67..18a588aaf 100644 --- a/xserver/hw/xfree86/shadowfb/Makefile.in +++ b/xserver/hw/xfree86/shadowfb/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/Makefile.in b/xserver/hw/xfree86/utils/Makefile.in index 63ada29c6..a999d1340 100644 --- a/xserver/hw/xfree86/utils/Makefile.in +++ b/xserver/hw/xfree86/utils/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/cvt/Makefile.in b/xserver/hw/xfree86/utils/cvt/Makefile.in index fdb6df5c6..37d4e7d7b 100644 --- a/xserver/hw/xfree86/utils/cvt/Makefile.in +++ b/xserver/hw/xfree86/utils/cvt/Makefile.in @@ -339,7 +339,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -575,6 +574,7 @@ cvt_CFLAGS = $(XORG_CFLAGS) cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a man1_MANS = cvt.man CLEANFILES = $(man1_MANS) +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/gtf/Makefile.in b/xserver/hw/xfree86/utils/gtf/Makefile.in index b359709e3..fadfe22af 100644 --- a/xserver/hw/xfree86/utils/gtf/Makefile.in +++ b/xserver/hw/xfree86/utils/gtf/Makefile.in @@ -344,7 +344,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -577,6 +576,7 @@ gtf_LDADD = -lm appmandir = $(APP_MAN_DIR) appman_PRE = gtf.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/ioport/Makefile.in b/xserver/hw/xfree86/utils/ioport/Makefile.in index 60166b36c..9dd8258da 100644 --- a/xserver/hw/xfree86/utils/ioport/Makefile.in +++ b/xserver/hw/xfree86/utils/ioport/Makefile.in @@ -332,7 +332,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in index 56c703845..a3f1aea0b 100644 --- a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in +++ b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.1 2006/11/26 18:18:31 matthieu Exp $ +# $Id: Makefile.in,v 1.2 2006/11/26 19:09:58 matthieu Exp $ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # @@ -348,7 +348,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -586,6 +585,7 @@ xpconfigdir = @xpconfigdir@ @BUILD_KBD_MODE_TRUE@appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) @BUILD_KBD_MODE_TRUE@BUILT_SOURCES = $(appman_PRE) @BUILD_KBD_MODE_TRUE@CLEANFILES = $(appman_PRE) $(appman_DATA) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/pcitweak/Makefile.in b/xserver/hw/xfree86/utils/pcitweak/Makefile.in index 6bd21e815..87e0828f0 100644 --- a/xserver/hw/xfree86/utils/pcitweak/Makefile.in +++ b/xserver/hw/xfree86/utils/pcitweak/Makefile.in @@ -346,7 +346,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -588,6 +587,7 @@ pcitweak_SOURCES = \ appmandir = $(APP_MAN_DIR) appman_PRE = pcitweak.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/scanpci/Makefile.in b/xserver/hw/xfree86/utils/scanpci/Makefile.in index 7b0448ba2..5a71cdab8 100644 --- a/xserver/hw/xfree86/utils/scanpci/Makefile.in +++ b/xserver/hw/xfree86/utils/scanpci/Makefile.in @@ -347,7 +347,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -591,6 +590,7 @@ scanpci_SOURCES = \ appmandir = $(APP_MAN_DIR) appman_PRE = scanpci.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in index 8c316d61f..e76dd465d 100644 --- a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in +++ b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in @@ -382,7 +382,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -690,6 +689,7 @@ PIXMAPS = \ monitor.xpm \ mouse.xpm +SED = sed SUFFIXES = .pre .man .man.pre $(am__append_1) # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in index 3a5afb1df..740e11c4b 100644 --- a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in +++ b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in @@ -347,7 +347,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -588,6 +587,7 @@ xorgconfig_SOURCES = \ cards.h \ xorgconfig.c +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xfree86/vbe/Makefile.in b/xserver/hw/xfree86/vbe/Makefile.in index a675dc74c..5f6d45dd6 100644 --- a/xserver/hw/xfree86/vbe/Makefile.in +++ b/xserver/hw/xfree86/vbe/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/vgahw/Makefile.in b/xserver/hw/xfree86/vgahw/Makefile.in index 83444cca0..a6dbd593c 100644 --- a/xserver/hw/xfree86/vgahw/Makefile.in +++ b/xserver/hw/xfree86/vgahw/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/x86emu/Makefile.in b/xserver/hw/xfree86/x86emu/Makefile.in index b0eb21182..dddd62307 100644 --- a/xserver/hw/xfree86/x86emu/Makefile.in +++ b/xserver/hw/xfree86/x86emu/Makefile.in @@ -303,7 +303,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/xaa/Makefile.in b/xserver/hw/xfree86/xaa/Makefile.in index 43a5441ff..984799b2b 100644 --- a/xserver/hw/xfree86/xaa/Makefile.in +++ b/xserver/hw/xfree86/xaa/Makefile.in @@ -330,7 +330,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/xf1bpp/Makefile.in b/xserver/hw/xfree86/xf1bpp/Makefile.in index 1de60e1eb..af0b4506b 100644 --- a/xserver/hw/xfree86/xf1bpp/Makefile.in +++ b/xserver/hw/xfree86/xf1bpp/Makefile.in @@ -322,7 +322,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/xf4bpp/Makefile.in b/xserver/hw/xfree86/xf4bpp/Makefile.in index dbb4cdf92..fc1c0c86c 100644 --- a/xserver/hw/xfree86/xf4bpp/Makefile.in +++ b/xserver/hw/xfree86/xf4bpp/Makefile.in @@ -319,7 +319,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/xf8_16bpp/Makefile.in b/xserver/hw/xfree86/xf8_16bpp/Makefile.in index e1349a7dd..e97f7f86a 100644 --- a/xserver/hw/xfree86/xf8_16bpp/Makefile.in +++ b/xserver/hw/xfree86/xf8_16bpp/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xfree86/xf8_32bpp/Makefile.in b/xserver/hw/xfree86/xf8_32bpp/Makefile.in index 23bbfe135..d15014cc8 100644 --- a/xserver/hw/xfree86/xf8_32bpp/Makefile.in +++ b/xserver/hw/xfree86/xf8_32bpp/Makefile.in @@ -314,7 +314,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/Makefile.in b/xserver/hw/xgl/Makefile.in index 701fe9a9a..ebd4ff22d 100644 --- a/xserver/hw/xgl/Makefile.in +++ b/xserver/hw/xgl/Makefile.in @@ -327,7 +327,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/egl/Makefile.in b/xserver/hw/xgl/egl/Makefile.in index b1e9aa11e..cb0d4d6e0 100644 --- a/xserver/hw/xgl/egl/Makefile.in +++ b/xserver/hw/xgl/egl/Makefile.in @@ -315,7 +315,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/egl/module/Makefile.in b/xserver/hw/xgl/egl/module/Makefile.in index 60559b8c9..4303a1c30 100644 --- a/xserver/hw/xgl/egl/module/Makefile.in +++ b/xserver/hw/xgl/egl/module/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/glx/Makefile.in b/xserver/hw/xgl/glx/Makefile.in index b969819c8..343e6f91a 100644 --- a/xserver/hw/xgl/glx/Makefile.in +++ b/xserver/hw/xgl/glx/Makefile.in @@ -305,7 +305,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/glx/module/Makefile.in b/xserver/hw/xgl/glx/module/Makefile.in index 76977aebf..6a180955a 100644 --- a/xserver/hw/xgl/glx/module/Makefile.in +++ b/xserver/hw/xgl/glx/module/Makefile.in @@ -309,7 +309,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/glxext/Makefile.in b/xserver/hw/xgl/glxext/Makefile.in index 1d100a105..109ff73bb 100644 --- a/xserver/hw/xgl/glxext/Makefile.in +++ b/xserver/hw/xgl/glxext/Makefile.in @@ -306,7 +306,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xgl/glxext/module/Makefile.in b/xserver/hw/xgl/glxext/module/Makefile.in index 774d4519e..5218932cc 100644 --- a/xserver/hw/xgl/glxext/module/Makefile.in +++ b/xserver/hw/xgl/glxext/module/Makefile.in @@ -310,7 +310,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in index e9c8fe9c1..6e0f7c0d6 100644 --- a/xserver/hw/xnest/Makefile.in +++ b/xserver/hw/xnest/Makefile.in @@ -325,7 +325,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -608,6 +607,7 @@ EXTRA_DIST = os2Stub.c \ screensaver \ Xnest.man.pre +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xprint/Makefile.in b/xserver/hw/xprint/Makefile.in index 225eb7b87..34ef13d4c 100644 --- a/xserver/hw/xprint/Makefile.in +++ b/xserver/hw/xprint/Makefile.in @@ -316,7 +316,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/Makefile.in b/xserver/hw/xprint/config/C/Makefile.in index 0e45e29bd..4efdb6ffe 100644 --- a/xserver/hw/xprint/config/C/Makefile.in +++ b/xserver/hw/xprint/config/C/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/Makefile.in b/xserver/hw/xprint/config/C/print/Makefile.in index fb667d485..923ac8c26 100644 --- a/xserver/hw/xprint/config/C/print/Makefile.in +++ b/xserver/hw/xprint/config/C/print/Makefile.in @@ -302,7 +302,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/attributes/Makefile.in b/xserver/hw/xprint/config/C/print/attributes/Makefile.in index 465fb082c..171d87b4d 100644 --- a/xserver/hw/xprint/config/C/print/attributes/Makefile.in +++ b/xserver/hw/xprint/config/C/print/attributes/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in index ce3e2ede7..ed06a6829 100644 --- a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in +++ b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in index 035b64b51..f3437671f 100644 --- a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in +++ b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in index 783a33c37..216c901da 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in index cc03ebba5..55a7d6c5f 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in index 40a9b0e7c..795943cb1 100644 --- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in index bae0931ac..b5d95ef5a 100644 --- a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in index 513cbfe0f..440de4f72 100644 --- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in index 811441f0a..f64c39a7a 100644 --- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in index c881ff0b6..f5dde68e7 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in index ee8845b8f..d1d61b4e8 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in index 4e145e9c4..a0557f9e9 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in index 41fe96f29..fa5aabd26 100644 --- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/Makefile.in b/xserver/hw/xprint/config/C/print/models/Makefile.in index 858004f88..b1898d470 100644 --- a/xserver/hw/xprint/config/C/print/models/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in index 6ffd46753..472b7ba96 100644 --- a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in @@ -295,7 +295,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in index 3ae83560e..da7818e22 100644 --- a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in index b7cd213cd..e9f0bad41 100644 --- a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in index a5302b601..1525cdb5c 100644 --- a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in @@ -295,7 +295,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in index 4d6e7cd96..f46c84304 100644 --- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in @@ -301,7 +301,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in index 6db582e2c..d8d006998 100644 --- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in +++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/Makefile.in b/xserver/hw/xprint/config/Makefile.in index c6c0f5f54..4ef39cbef 100644 --- a/xserver/hw/xprint/config/Makefile.in +++ b/xserver/hw/xprint/config/Makefile.in @@ -303,7 +303,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/Makefile.in b/xserver/hw/xprint/config/en_US/Makefile.in index fa66d8955..700627094 100644 --- a/xserver/hw/xprint/config/en_US/Makefile.in +++ b/xserver/hw/xprint/config/en_US/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/print/Makefile.in b/xserver/hw/xprint/config/en_US/print/Makefile.in index aa03e2ff0..c7f9cb0ba 100644 --- a/xserver/hw/xprint/config/en_US/print/Makefile.in +++ b/xserver/hw/xprint/config/en_US/print/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in index 490a9d419..fbd5b43c8 100644 --- a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in +++ b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/doc/Makefile.in b/xserver/hw/xprint/doc/Makefile.in index eb14dae86..e8ab2450b 100644 --- a/xserver/hw/xprint/doc/Makefile.in +++ b/xserver/hw/xprint/doc/Makefile.in @@ -296,7 +296,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -527,6 +526,7 @@ MAN_SRCS = Xprt.man.pre appmandir = $(APP_MAN_DIR) appman_PRE = Xprt.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) +SED = sed SUFFIXES = .pre .man .man.pre .$(APP_MAN_SUFFIX) .man # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xprint/etc/Makefile.in b/xserver/hw/xprint/etc/Makefile.in index daec69940..7e8c22657 100644 --- a/xserver/hw/xprint/etc/Makefile.in +++ b/xserver/hw/xprint/etc/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/etc/Xsession.d/Makefile.in b/xserver/hw/xprint/etc/Xsession.d/Makefile.in index 47449924b..1a65216ea 100644 --- a/xserver/hw/xprint/etc/Xsession.d/Makefile.in +++ b/xserver/hw/xprint/etc/Xsession.d/Makefile.in @@ -292,7 +292,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/etc/init.d/Makefile.in b/xserver/hw/xprint/etc/init.d/Makefile.in index 7167d8ca9..f81352f11 100644 --- a/xserver/hw/xprint/etc/init.d/Makefile.in +++ b/xserver/hw/xprint/etc/init.d/Makefile.in @@ -286,7 +286,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ @@ -513,6 +512,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ xglmoduledir = @xglmoduledir@ xpconfigdir = @xpconfigdir@ +SED = sed SUFFIXES = .pre .man .man.pre # Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM diff --git a/xserver/hw/xprint/etc/profile.d/Makefile.in b/xserver/hw/xprint/etc/profile.d/Makefile.in index dbcbc2ef3..776475ed1 100644 --- a/xserver/hw/xprint/etc/profile.d/Makefile.in +++ b/xserver/hw/xprint/etc/profile.d/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/pcl-mono/Makefile.in b/xserver/hw/xprint/pcl-mono/Makefile.in index d63e0fa87..8f9018015 100644 --- a/xserver/hw/xprint/pcl-mono/Makefile.in +++ b/xserver/hw/xprint/pcl-mono/Makefile.in @@ -303,7 +303,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/pcl/Makefile.in b/xserver/hw/xprint/pcl/Makefile.in index 69dd03c8d..989af700c 100644 --- a/xserver/hw/xprint/pcl/Makefile.in +++ b/xserver/hw/xprint/pcl/Makefile.in @@ -303,7 +303,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/ps/Makefile.in b/xserver/hw/xprint/ps/Makefile.in index fea4f0515..63d53a80a 100644 --- a/xserver/hw/xprint/ps/Makefile.in +++ b/xserver/hw/xprint/ps/Makefile.in @@ -314,7 +314,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xprint/raster/Makefile.in b/xserver/hw/xprint/raster/Makefile.in index 9f4e66e41..c645a72f9 100644 --- a/xserver/hw/xprint/raster/Makefile.in +++ b/xserver/hw/xprint/raster/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in index 65ef9ae8a..b0e42fffd 100644 --- a/xserver/hw/xwin/Makefile.in +++ b/xserver/hw/xwin/Makefile.in @@ -390,7 +390,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in index 38db71048..7a26d1b1e 100644 --- a/xserver/include/Makefile.in +++ b/xserver/include/Makefile.in @@ -302,7 +302,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in index b22edab9e..d172f6790 100644 --- a/xserver/include/do-not-use-config.h.in +++ b/xserver/include/do-not-use-config.h.in @@ -312,6 +312,9 @@ /* Name of the period field in struct kbd_repeat */ #undef LNX_KBD_PERIOD_NAME +/* Support os-specific local connections */ +#undef LOCALCONN + /* Support MIT Misc extension */ #undef MITMISC diff --git a/xserver/mfb/Makefile.in b/xserver/mfb/Makefile.in index a9749877d..1a3ad0abc 100644 --- a/xserver/mfb/Makefile.in +++ b/xserver/mfb/Makefile.in @@ -321,7 +321,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/mi/Makefile.in b/xserver/mi/Makefile.in index 1779a625e..0726d0190 100644 --- a/xserver/mi/Makefile.in +++ b/xserver/mi/Makefile.in @@ -332,7 +332,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/miext/Makefile.in b/xserver/miext/Makefile.in index 0c3196478..4d0de1977 100644 --- a/xserver/miext/Makefile.in +++ b/xserver/miext/Makefile.in @@ -290,7 +290,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/miext/cw/Makefile.in b/xserver/miext/cw/Makefile.in index aa66d8489..8ebfe343c 100644 --- a/xserver/miext/cw/Makefile.in +++ b/xserver/miext/cw/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/miext/damage/Makefile.in b/xserver/miext/damage/Makefile.in index 138f24ee3..33bc3cd20 100644 --- a/xserver/miext/damage/Makefile.in +++ b/xserver/miext/damage/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/miext/rootless/Makefile.in b/xserver/miext/rootless/Makefile.in index c29140686..b44ba5204 100644 --- a/xserver/miext/rootless/Makefile.in +++ b/xserver/miext/rootless/Makefile.in @@ -281,7 +281,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in index ab5336163..a3d272a25 100644 --- a/xserver/miext/shadow/Makefile.in +++ b/xserver/miext/shadow/Makefile.in @@ -316,7 +316,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/os/Makefile.in b/xserver/os/Makefile.in index bdfbb988d..4901850f9 100644 --- a/xserver/os/Makefile.in +++ b/xserver/os/Makefile.in @@ -319,7 +319,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/randr/Makefile.in b/xserver/randr/Makefile.in index 5ab43723a..752793867 100644 --- a/xserver/randr/Makefile.in +++ b/xserver/randr/Makefile.in @@ -311,7 +311,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/record/Makefile.in b/xserver/record/Makefile.in index 6475aab81..21fe65a2b 100644 --- a/xserver/record/Makefile.in +++ b/xserver/record/Makefile.in @@ -299,7 +299,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in index 2d8544117..30058f14c 100644 --- a/xserver/render/Makefile.in +++ b/xserver/render/Makefile.in @@ -314,7 +314,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/xfixes/Makefile.in b/xserver/xfixes/Makefile.in index 018e36e33..9c1fadf4c 100644 --- a/xserver/xfixes/Makefile.in +++ b/xserver/xfixes/Makefile.in @@ -300,7 +300,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in index 0079fbf99..0eda71fa3 100644 --- a/xserver/xkb/Makefile.in +++ b/xserver/xkb/Makefile.in @@ -323,7 +323,6 @@ RES_TRUE = @RES_TRUE@ RGB_DB = @RGB_DB@ SCREENSAVER_FALSE = @SCREENSAVER_FALSE@ SCREENSAVER_TRUE = @SCREENSAVER_TRUE@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@ |