diff options
Diffstat (limited to 'xorg-server/configure')
-rw-r--r-- | xorg-server/configure | 175 |
1 files changed, 104 insertions, 71 deletions
diff --git a/xorg-server/configure b/xorg-server/configure index 175a3d075..7577c15a6 100644 --- a/xorg-server/configure +++ b/xorg-server/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xorg-server 1.7.0. +# Generated by GNU Autoconf 2.63 for xorg-server 1.7.0.901. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.7.0' -PACKAGE_STRING='xorg-server 1.7.0' +PACKAGE_VERSION='1.7.0.901' +PACKAGE_STRING='xorg-server 1.7.0.901' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -798,7 +798,6 @@ CXX AM_MAKEFLAGS MAKEFLAGS shavedir -distcleancheck_listfiles CHANGELOG_CMD ADMIN_MAN_DIR DRIVER_MAN_DIR @@ -988,6 +987,8 @@ XSERVERLIBS_CFLAGS XSERVERCFLAGS_LIBS XSERVERCFLAGS_CFLAGS MAIN_LIB +OS_LIB +DIX_LIB UNITTESTS_FALSE UNITTESTS_TRUE GLIB_LIBS @@ -1145,6 +1146,8 @@ NEED_VSNPRINTF_TRUE NEED_STRLCAT_FALSE NEED_STRLCAT_TRUE ALLOCA +SPECIAL_DTRACE_OBJECTS_FALSE +SPECIAL_DTRACE_OBJECTS_TRUE XSERVER_DTRACE_FALSE XSERVER_DTRACE_TRUE DTRACE @@ -1999,7 +2002,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.7.0 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.7.0.901 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2069,7 +2072,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.7.0:";; + short | recursive ) echo "Configuration of xorg-server 1.7.0.901:";; esac cat <<\_ACEOF @@ -2401,7 +2404,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.7.0 +xorg-server configure 1.7.0.901 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2415,7 +2418,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.7.0, which was +It was created by xorg-server $as_me 1.7.0.901, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2783,7 +2786,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2009-10-2" +RELEASE_DATE="2009-10-12" am__api_version='1.11' @@ -3266,7 +3269,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.7.0' + VERSION='1.7.0.901' cat >>confdefs.h <<_ACEOF @@ -5758,13 +5761,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5761: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5764: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5764: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5767: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5767: output\"" >&5) + (eval echo "\"\$as_me:5770: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6956,7 +6959,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6959 "configure"' > conftest.$ac_ext + echo '#line 6962 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8781,11 +8784,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:8784: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8787: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8788: \$? = $ac_status" >&5 + echo "$as_me:8791: \$? = $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. @@ -9120,11 +9123,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:9123: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9126: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9127: \$? = $ac_status" >&5 + echo "$as_me:9130: \$? = $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. @@ -9225,11 +9228,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:9228: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9231: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9232: \$? = $ac_status" >&5 + echo "$as_me:9235: \$? = $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 @@ -9280,11 +9283,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:9283: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9286: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9287: \$? = $ac_status" >&5 + echo "$as_me:9290: \$? = $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 @@ -12083,7 +12086,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12086 "configure" +#line 12089 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12179,7 +12182,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12182 "configure" +#line 12185 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13718,6 +13721,17 @@ cat >>confdefs.h <<\_ACEOF #define XSERVER_DTRACE 1 _ACEOF + +# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into +# object files, and require linking with those as relocatable objects, not .a +# archives. MacOS X handles all this in the normal compiler toolchain, and on +# some releases (like Tiger), will error out on dtrace -G. For now, other +# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux +# ports appear to, based on my web searches, but have not yet been tested). + case $host_os in + darwin*) SPECIAL_DTRACE_OBJECTS=no ;; + *) SPECIAL_DTRACE_OBJECTS=yes ;; + esac fi if test "x$WDTRACE" != "xno"; then XSERVER_DTRACE_TRUE= @@ -13727,6 +13741,14 @@ else XSERVER_DTRACE_FALSE= fi + if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"; then + SPECIAL_DTRACE_OBJECTS_TRUE= + SPECIAL_DTRACE_OBJECTS_FALSE='#' +else + SPECIAL_DTRACE_OBJECTS_TRUE='#' + SPECIAL_DTRACE_OBJECTS_FALSE= +fi + @@ -21437,6 +21459,7 @@ $as_echo "$xorg_cv_Carbon_framework" >&6; } XF86VIDMODE=no fi ;; + *) XQUARTZ=no ;; esac XEXT_INC='-I$(top_srcdir)/Xext' @@ -21464,11 +21487,13 @@ REQUIRED_MODULES="randrproto >= 1.2.99.3 renderproto >= 0.11 fixesproto >= 4.1 d REQUIRED_LIBS="xfont xau pixman-1 >= 0.15.20" LIBAPPLEWM="applewm >= 1.4" +LIBDMX="dmx >= 1.0.99.1" LIBDRI="dri >= 7.1.0" LIBDRM="libdrm >= 2.3.0" LIBGL="gl >= 7.1.0" LIBXEXT="xext >= 1.0.99.4" LIBXI="xi >= 1.2.99.1" +LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" @@ -24671,7 +24696,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -if test "x$WDTRACE" != "xno" && test "x$XQUARTZ" = "xno"; then +if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then DIX_LIB='$(top_builddir)/dix/dix.O' OS_LIB='$(top_builddir)/os/os.O' else @@ -24679,6 +24704,8 @@ else OS_LIB='$(top_builddir)/os/libos.la' fi + + MAIN_LIB='$(top_builddir)/dix/libmain.la' @@ -28765,12 +28792,12 @@ if test -n "$DMXEXAMPLES_DEP_CFLAGS"; then pkg_cv_DMXEXAMPLES_DEP_CFLAGS="$DMXEXAMPLES_DEP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "dmx $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -28781,12 +28808,12 @@ if test -n "$DMXEXAMPLES_DEP_LIBS"; then pkg_cv_DMXEXAMPLES_DEP_LIBS="$DMXEXAMPLES_DEP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "dmx $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -28804,14 +28831,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dmx $LIBXEXT x11" 2>&1` + DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` else - DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "dmx $LIBXEXT x11" 2>&1` + DMXEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXEXT x11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DMXEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (dmx $LIBXEXT x11) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met: $DMXEXAMPLES_DEP_PKG_ERRORS @@ -28822,7 +28849,7 @@ 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 -$as_echo "$as_me: error: Package requirements (dmx $LIBXEXT x11) were not met: +$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXEXT x11) were not met: $DMXEXAMPLES_DEP_PKG_ERRORS @@ -28875,12 +28902,12 @@ if test -n "$DMXXMUEXAMPLES_DEP_CFLAGS"; then pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS="$DMXXMUEXAMPLES_DEP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx xmu $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "dmx xmu $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXXMUEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -28891,12 +28918,12 @@ if test -n "$DMXXMUEXAMPLES_DEP_LIBS"; then pkg_cv_DMXXMUEXAMPLES_DEP_LIBS="$DMXXMUEXAMPLES_DEP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx xmu \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx xmu $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX xmu \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX xmu $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXXMUEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "dmx xmu $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXXMUEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX xmu $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -28914,14 +28941,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dmx xmu $LIBXEXT x11" 2>&1` + DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` else - DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "dmx xmu $LIBXEXT x11" 2>&1` + DMXXMUEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX xmu $LIBXEXT x11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DMXXMUEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (dmx xmu $LIBXEXT x11) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: $DMXXMUEXAMPLES_DEP_PKG_ERRORS @@ -28932,7 +28959,7 @@ 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 -$as_echo "$as_me: error: Package requirements (dmx xmu $LIBXEXT x11) were not met: +$as_echo "$as_me: error: Package requirements ($LIBDMX xmu $LIBXEXT x11) were not met: $DMXXMUEXAMPLES_DEP_PKG_ERRORS @@ -28985,12 +29012,12 @@ if test -n "$DMXXIEXAMPLES_DEP_CFLAGS"; then pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS="$DMXXIEXAMPLES_DEP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx $LIBXI $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "dmx $LIBXI $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXXIEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -29001,12 +29028,12 @@ if test -n "$DMXXIEXAMPLES_DEP_LIBS"; then pkg_cv_DMXXIEXAMPLES_DEP_LIBS="$DMXXIEXAMPLES_DEP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dmx \$LIBXI \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "dmx $LIBXI $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBDMX \$LIBXI \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBDMX $LIBXI $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DMXXIEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "dmx $LIBXI $LIBXEXT x11" 2>/dev/null` + pkg_cv_DMXXIEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBDMX $LIBXI $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -29024,14 +29051,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dmx $LIBXI $LIBXEXT x11" 2>&1` + DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` else - DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "dmx $LIBXI $LIBXEXT x11" 2>&1` + DMXXIEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBDMX $LIBXI $LIBXEXT x11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DMXXIEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (dmx $LIBXI $LIBXEXT x11) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: $DMXXIEXAMPLES_DEP_PKG_ERRORS @@ -29042,7 +29069,7 @@ 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 -$as_echo "$as_me: error: Package requirements (dmx $LIBXI $LIBXEXT x11) were not met: +$as_echo "$as_me: error: Package requirements ($LIBDMX $LIBXI $LIBXEXT x11) were not met: $DMXXIEXAMPLES_DEP_PKG_ERRORS @@ -29095,12 +29122,12 @@ if test -n "$XTSTEXAMPLES_DEP_CFLAGS"; then pkg_cv_XTSTEXAMPLES_DEP_CFLAGS="$XTSTEXAMPLES_DEP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xtst $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XTSTEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "xtst $LIBXEXT x11" 2>/dev/null` + pkg_cv_XTSTEXAMPLES_DEP_CFLAGS=`$PKG_CONFIG --cflags "$LIBXTST $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -29111,12 +29138,12 @@ if test -n "$XTSTEXAMPLES_DEP_LIBS"; then pkg_cv_XTSTEXAMPLES_DEP_LIBS="$XTSTEXAMPLES_DEP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst \$LIBXEXT x11\"") >&5 - ($PKG_CONFIG --exists --print-errors "xtst $LIBXEXT x11") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$LIBXTST \$LIBXEXT x11\"") >&5 + ($PKG_CONFIG --exists --print-errors "$LIBXTST $LIBXEXT x11") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_XTSTEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "xtst $LIBXEXT x11" 2>/dev/null` + pkg_cv_XTSTEXAMPLES_DEP_LIBS=`$PKG_CONFIG --libs "$LIBXTST $LIBXEXT x11" 2>/dev/null` else pkg_failed=yes fi @@ -29134,14 +29161,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst $LIBXEXT x11" 2>&1` + XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` else - XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst $LIBXEXT x11" 2>&1` + XTSTEXAMPLES_DEP_PKG_ERRORS=`$PKG_CONFIG --print-errors "$LIBXTST $LIBXEXT x11" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XTSTEXAMPLES_DEP_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (xtst $LIBXEXT x11) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met: $XTSTEXAMPLES_DEP_PKG_ERRORS @@ -29152,7 +29179,7 @@ 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 -$as_echo "$as_me: error: Package requirements (xtst $LIBXEXT x11) were not met: +$as_echo "$as_me: error: Package requirements ($LIBXTST $LIBXEXT x11) were not met: $XTSTEXAMPLES_DEP_PKG_ERRORS @@ -30609,12 +30636,11 @@ fi -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \ -mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \ +CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ +|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ echo 'git directory not found: installing possibly empty changelog.' >&2)" -distcleancheck_listfiles='find . -type f ! -name ChangeLog -print' - @@ -30845,6 +30871,13 @@ $as_echo "$as_me: error: conditional \"XSERVER_DTRACE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${SPECIAL_DTRACE_OBJECTS_TRUE}" && test -z "${SPECIAL_DTRACE_OBJECTS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"SPECIAL_DTRACE_OBJECTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${NEED_STRLCAT_TRUE}" && test -z "${NEED_STRLCAT_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"NEED_STRLCAT\" was never defined. @@ -31833,7 +31866,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.7.0, which was +This file was extended by xorg-server $as_me 1.7.0.901, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31896,7 +31929,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xorg-server config.status 1.7.0 +xorg-server config.status 1.7.0.901 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" |