xhost: autoreconf
This commit is contained in:
parent
752435728e
commit
5c19ce1499
|
@ -216,7 +216,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
|
||||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
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/\..*$//'`]
|
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}])
|
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_version=1.1.5
|
||||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e '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
|
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||||
|
@ -620,7 +620,8 @@ dnl
|
||||||
# --------------------
|
# --------------------
|
||||||
# Adds --with/without-release-string and changes the PACKAGE and
|
# Adds --with/without-release-string and changes the PACKAGE and
|
||||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
|
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||||
|
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||||
|
|
||||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||||
AC_ARG_WITH(release-version,
|
AC_ARG_WITH(release-version,
|
||||||
|
@ -633,6 +634,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||||
fi
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||||
|
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||||
|
[Major version of this package])
|
||||||
|
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||||
|
if test "x$PVM" = "x"; then
|
||||||
|
PVM="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||||
|
[$PVM],
|
||||||
|
[Minor version of this package])
|
||||||
|
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||||
|
if test "x$PVP" = "x"; then
|
||||||
|
PVP="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||||
|
[$PVP],
|
||||||
|
[Patch version of this package])
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
|
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
|
||||||
|
@ -695,8 +713,9 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
|
||||||
# -------------------------
|
# -------------------------
|
||||||
# Standard checks for which Xtrans transports to use by the Xorg packages
|
# Standard checks for which Xtrans transports to use by the Xorg packages
|
||||||
# that use Xtrans functions
|
# that use Xtrans functions
|
||||||
AC_DEFUN([XTRANS_CONNECTION_FLAGS],
|
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
|
||||||
[AC_REQUIRE([AC_TYPE_SIGNAL])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
AC_REQUIRE([AC_TYPE_SIGNAL])
|
||||||
AC_ARG_ENABLE(unix-transport,
|
AC_ARG_ENABLE(unix-transport,
|
||||||
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
|
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket transport]),
|
||||||
[UNIXCONN=$enableval], [UNIXCONN=yes])
|
[UNIXCONN=$enableval], [UNIXCONN=yes])
|
||||||
|
@ -714,6 +733,19 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],
|
||||||
AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
|
AC_DEFINE(TCPCONN,1,[Support TCP socket connections])
|
||||||
XTRANS_TCP_FLAGS
|
XTRANS_TCP_FLAGS
|
||||||
fi
|
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_CONNECTION_FLAGS
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||||
# Inc.
|
# Inc.
|
||||||
|
|
||||||
timestamp='2006-07-02'
|
timestamp='2007-03-06'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
|
@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
arm*) machine=arm-unknown ;;
|
arm*) machine=arm-unknown ;;
|
||||||
sh3el) machine=shl-unknown ;;
|
sh3el) machine=shl-unknown ;;
|
||||||
sh3eb) machine=sh-unknown ;;
|
sh3eb) machine=sh-unknown ;;
|
||||||
|
sh5el) machine=sh5le-unknown ;;
|
||||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||||
esac
|
esac
|
||||||
# The Operating System including object format, if it has switched
|
# The Operating System including object format, if it has switched
|
||||||
|
@ -780,7 +781,7 @@ EOF
|
||||||
i*:CYGWIN*:*)
|
i*:CYGWIN*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-cygwin
|
echo ${UNAME_MACHINE}-pc-cygwin
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:MINGW*:*)
|
*:MINGW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
echo ${UNAME_MACHINE}-pc-mingw32
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:windows32*:*)
|
i*:windows32*:*)
|
||||||
|
@ -790,12 +791,15 @@ EOF
|
||||||
i*:PW*:*)
|
i*:PW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-pw32
|
echo ${UNAME_MACHINE}-pc-pw32
|
||||||
exit ;;
|
exit ;;
|
||||||
x86:Interix*:[3456]*)
|
*:Interix*:[3456]*)
|
||||||
echo i586-pc-interix${UNAME_RELEASE}
|
case ${UNAME_MACHINE} in
|
||||||
exit ;;
|
x86)
|
||||||
EM64T:Interix*:[3456]*)
|
echo i586-pc-interix${UNAME_RELEASE}
|
||||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
exit ;;
|
||||||
exit ;;
|
EM64T | authenticamd)
|
||||||
|
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
esac ;;
|
||||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||||
echo i${UNAME_MACHINE}-pc-mks
|
echo i${UNAME_MACHINE}-pc-mks
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -950,6 +954,9 @@ EOF
|
||||||
x86_64:Linux:*:*)
|
x86_64:Linux:*:*)
|
||||||
echo x86_64-unknown-linux-gnu
|
echo x86_64-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
xtensa:Linux:*:*)
|
||||||
|
echo xtensa-unknown-linux-gnu
|
||||||
|
exit ;;
|
||||||
i*86:Linux:*:*)
|
i*86:Linux:*:*)
|
||||||
# The BFD linker knows what the default object file format is, so
|
# The BFD linker knows what the default object file format is, so
|
||||||
# first see if it will tell us. cd to the root directory to prevent
|
# first see if it will tell us. cd to the root directory to prevent
|
||||||
|
@ -1208,6 +1215,15 @@ EOF
|
||||||
SX-6:SUPER-UX:*:*)
|
SX-6:SUPER-UX:*:*)
|
||||||
echo sx6-nec-superux${UNAME_RELEASE}
|
echo sx6-nec-superux${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
SX-7:SUPER-UX:*:*)
|
||||||
|
echo sx7-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
SX-8:SUPER-UX:*:*)
|
||||||
|
echo sx8-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
|
SX-8R:SUPER-UX:*:*)
|
||||||
|
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||||
|
exit ;;
|
||||||
Power*:Rhapsody:*:*)
|
Power*:Rhapsody:*:*)
|
||||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
|
|
@ -12,6 +12,9 @@
|
||||||
/* Support IPv6 for TCP connections */
|
/* Support IPv6 for TCP connections */
|
||||||
#undef IPv6
|
#undef IPv6
|
||||||
|
|
||||||
|
/* Support os-specific local connections */
|
||||||
|
#undef LOCALCONN
|
||||||
|
|
||||||
/* Name of package */
|
/* Name of package */
|
||||||
#undef PACKAGE
|
#undef PACKAGE
|
||||||
|
|
||||||
|
@ -30,6 +33,15 @@
|
||||||
/* Define to the version of this package. */
|
/* Define to the version of this package. */
|
||||||
#undef PACKAGE_VERSION
|
#undef PACKAGE_VERSION
|
||||||
|
|
||||||
|
/* Major version of this package */
|
||||||
|
#undef PACKAGE_VERSION_MAJOR
|
||||||
|
|
||||||
|
/* Minor version of this package */
|
||||||
|
#undef PACKAGE_VERSION_MINOR
|
||||||
|
|
||||||
|
/* Patch version of this package */
|
||||||
|
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||||
|
|
||||||
/* Define as the return type of signal handlers (`int' or `void'). */
|
/* Define as the return type of signal handlers (`int' or `void'). */
|
||||||
#undef RETSIGTYPE
|
#undef RETSIGTYPE
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||||
# Inc.
|
# Inc.
|
||||||
|
|
||||||
timestamp='2006-07-02'
|
timestamp='2007-01-18'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
|
@ -245,12 +245,12 @@ case $basic_machine in
|
||||||
| bfin \
|
| bfin \
|
||||||
| c4x | clipper \
|
| c4x | clipper \
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
| d10v | d30v | dlx | dsp16xx \
|
||||||
| fr30 | frv \
|
| fido | fr30 | frv \
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||||
| i370 | i860 | i960 | ia64 \
|
| i370 | i860 | i960 | ia64 \
|
||||||
| ip2k | iq2000 \
|
| ip2k | iq2000 \
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||||
| maxq | mb | microblaze | mcore \
|
| maxq | mb | microblaze | mcore | mep \
|
||||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||||
| mips16 \
|
| mips16 \
|
||||||
| mips64 | mips64el \
|
| mips64 | mips64el \
|
||||||
|
@ -276,6 +276,7 @@ case $basic_machine in
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
| pdp10 | pdp11 | pj | pjl \
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
|
| score \
|
||||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||||
|
@ -284,7 +285,7 @@ case $basic_machine in
|
||||||
| tahoe | thumb | tic4x | tic80 | tron \
|
| tahoe | thumb | tic4x | tic80 | tron \
|
||||||
| v850 | v850e \
|
| v850 | v850e \
|
||||||
| we32k \
|
| we32k \
|
||||||
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||||
| z8k)
|
| z8k)
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
|
@ -323,7 +324,7 @@ case $basic_machine in
|
||||||
| clipper-* | craynv-* | cydra-* \
|
| clipper-* | craynv-* | cydra-* \
|
||||||
| d10v-* | d30v-* | dlx-* \
|
| d10v-* | d30v-* | dlx-* \
|
||||||
| elxsi-* \
|
| elxsi-* \
|
||||||
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||||
| h8300-* | h8500-* \
|
| h8300-* | h8500-* \
|
||||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||||
| i*86-* | i860-* | i960-* | ia64-* \
|
| i*86-* | i860-* | i960-* | ia64-* \
|
||||||
|
@ -367,7 +368,7 @@ case $basic_machine in
|
||||||
| tron-* \
|
| tron-* \
|
||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||||
| xstormy16-* | xtensa-* \
|
| xstormy16-* | xtensa-* \
|
||||||
| ymp-* \
|
| ymp-* \
|
||||||
| z8k-*)
|
| z8k-*)
|
||||||
|
@ -909,6 +910,10 @@ case $basic_machine in
|
||||||
sb1el)
|
sb1el)
|
||||||
basic_machine=mipsisa64sb1el-unknown
|
basic_machine=mipsisa64sb1el-unknown
|
||||||
;;
|
;;
|
||||||
|
sde)
|
||||||
|
basic_machine=mipsisa32-sde
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
sei)
|
sei)
|
||||||
basic_machine=mips-sei
|
basic_machine=mips-sei
|
||||||
os=-seiux
|
os=-seiux
|
||||||
|
@ -920,6 +925,9 @@ case $basic_machine in
|
||||||
basic_machine=sh-hitachi
|
basic_machine=sh-hitachi
|
||||||
os=-hms
|
os=-hms
|
||||||
;;
|
;;
|
||||||
|
sh5el)
|
||||||
|
basic_machine=sh5le-unknown
|
||||||
|
;;
|
||||||
sh64)
|
sh64)
|
||||||
basic_machine=sh64-unknown
|
basic_machine=sh64-unknown
|
||||||
;;
|
;;
|
||||||
|
@ -1214,7 +1222,7 @@ case $os in
|
||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers*)
|
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
@ -1366,6 +1374,9 @@ else
|
||||||
# system, and we'll never get to this point.
|
# system, and we'll never get to this point.
|
||||||
|
|
||||||
case $basic_machine in
|
case $basic_machine in
|
||||||
|
score-*)
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
spu-*)
|
spu-*)
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
|
@ -1406,6 +1417,9 @@ case $basic_machine in
|
||||||
m68*-cisco)
|
m68*-cisco)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
|
mep-*)
|
||||||
|
os=-elf
|
||||||
|
;;
|
||||||
mips*-cisco)
|
mips*-cisco)
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -1278,6 +1278,8 @@ Optional Features:
|
||||||
--enable-unix-transport Enable UNIX domain socket transport
|
--enable-unix-transport Enable UNIX domain socket transport
|
||||||
--enable-tcp-transport Enable TCP socket transport
|
--enable-tcp-transport Enable TCP socket transport
|
||||||
--enable-IPv6 Enable IPv6 support
|
--enable-IPv6 Enable IPv6 support
|
||||||
|
--enable-local-transport
|
||||||
|
Enable os-specific local transport
|
||||||
--enable-secure-rpc Enable Secure RPC
|
--enable-secure-rpc Enable Secure RPC
|
||||||
|
|
||||||
Optional Packages:
|
Optional Packages:
|
||||||
|
@ -3690,6 +3692,91 @@ fi
|
||||||
|
|
||||||
|
|
||||||
# Transport selection macro from xtrans.m4
|
# Transport selection macro from xtrans.m4
|
||||||
|
# Make sure we can run config.sub.
|
||||||
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
||||||
|
echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking build system type" >&5
|
||||||
|
echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
||||||
|
if test "${ac_cv_build+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_build_alias=$build_alias
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||||||
|
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
||||||
|
echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_build" >&6; }
|
||||||
|
case $ac_cv_build in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
||||||
|
echo "$as_me: error: invalid value of canonical build" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; };;
|
||||||
|
esac
|
||||||
|
build=$ac_cv_build
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_build
|
||||||
|
shift
|
||||||
|
build_cpu=$1
|
||||||
|
build_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
build_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: checking host system type" >&5
|
||||||
|
echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
||||||
|
if test "${ac_cv_host+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
if test "x$host_alias" = x; then
|
||||||
|
ac_cv_host=$ac_cv_build
|
||||||
|
else
|
||||||
|
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||||||
|
{ { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
||||||
|
echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_host" >&6; }
|
||||||
|
case $ac_cv_host in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
||||||
|
echo "$as_me: error: invalid value of canonical host" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; };;
|
||||||
|
esac
|
||||||
|
host=$ac_cv_host
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_host
|
||||||
|
shift
|
||||||
|
host_cpu=$1
|
||||||
|
host_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
host_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-unix-transport was given.
|
# Check whether --enable-unix-transport was given.
|
||||||
if test "${enable_unix_transport+set}" = set; then
|
if test "${enable_unix_transport+set}" = set; then
|
||||||
|
@ -4115,6 +4202,29 @@ fi
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
case $host_os in
|
||||||
|
solaris*|sco*|sysv4*) localdef="yes" ;;
|
||||||
|
*) localdef="no" ;;
|
||||||
|
esac
|
||||||
|
# Check whether --enable-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
|
# Secure RPC detection macro from xtrans.m4
|
||||||
|
@ -4331,89 +4441,6 @@ _ACEOF
|
||||||
echo "${ECHO_T}$SECURE_RPC" >&6; }
|
echo "${ECHO_T}$SECURE_RPC" >&6; }
|
||||||
|
|
||||||
|
|
||||||
# Make sure we can run config.sub.
|
|
||||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
||||||
echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking build system type" >&5
|
|
||||||
echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_build+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
ac_build_alias=$build_alias
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
||||||
echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
||||||
echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_build" >&6; }
|
|
||||||
case $ac_cv_build in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
||||||
echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; };;
|
|
||||||
esac
|
|
||||||
build=$ac_cv_build
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_build
|
|
||||||
shift
|
|
||||||
build_cpu=$1
|
|
||||||
build_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
build_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking host system type" >&5
|
|
||||||
echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_host+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
if test "x$host_alias" = x; then
|
|
||||||
ac_cv_host=$ac_cv_build
|
|
||||||
else
|
|
||||||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
||||||
{ { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
||||||
echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_host" >&6; }
|
|
||||||
case $ac_cv_host in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
||||||
echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; };;
|
|
||||||
esac
|
|
||||||
host=$ac_cv_host
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_host
|
|
||||||
shift
|
|
||||||
host_cpu=$1
|
|
||||||
host_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
host_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4501,6 +4528,29 @@ fi
|
||||||
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||||
|
if test "x$PVM" = "x"; then
|
||||||
|
PVM="0"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_MINOR $PVM
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||||
|
if test "x$PVP" = "x"; then
|
||||||
|
PVP="0"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat >>confdefs.h <<_ACEOF
|
||||||
|
#define PACKAGE_VERSION_PATCHLEVEL $PVP
|
||||||
|
_ACEOF
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile"
|
ac_config_files="$ac_config_files Makefile"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue