mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-26 13:10:22 +02:00
Rebuilt using automake 1.1n.
This commit is contained in:
Jim Blandy
parent
58bc1a290d
commit
1dc9c5b075
8 changed files with 773 additions and 238 deletions
140
qt/configure
vendored
140
qt/configure
vendored
|
|
@ -612,16 +612,32 @@ PACKAGE=$PACKAGE
|
|||
|
||||
VERSION=$VERSION
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define PACKAGE "$PACKAGE"
|
||||
EOF
|
||||
|
||||
cat >> confdefs.h <<EOF
|
||||
#define VERSION "$VERSION"
|
||||
EOF
|
||||
|
||||
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
|
||||
echo "configure:621: checking whether build environment is sane" >&5
|
||||
echo "configure:625: checking whether build environment is sane" >&5
|
||||
# Just in case
|
||||
sleep 1
|
||||
echo timestamp > conftestfile
|
||||
# Do this in a subshell so we don't clobber the current shell's
|
||||
# arguments. FIXME: maybe try `-L' hack like GETLOADAVG test?
|
||||
if (set X `ls -t $srcdir/configure conftestfile`; test "$2" = conftestfile)
|
||||
# Do `set' in a subshell so we don't clobber the current shell's
|
||||
# arguments. Must try -L first in case configure is actually a
|
||||
# symlink; some systems play weird games with the mod time of symlinks
|
||||
# (eg FreeBSD returns the mod time of the symlink's containing
|
||||
# directory).
|
||||
if (
|
||||
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
||||
if test "" = "X"; then
|
||||
# -L didn't work.
|
||||
set X `ls -t $srcdir/configure conftestfile`
|
||||
fi
|
||||
test "$2" = conftestfile
|
||||
)
|
||||
then
|
||||
# Ok.
|
||||
:
|
||||
|
|
@ -650,8 +666,69 @@ test "$program_suffix" != NONE &&
|
|||
# sed with no file args requires a program.
|
||||
test "$program_transform_name" = "" && program_transform_name="s,x,x,"
|
||||
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
|
||||
echo "configure:672: checking for working aclocal" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
if (aclocal --version) > /dev/null 2>&1; then
|
||||
ACLOCAL=aclocal
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
ACLOCAL="$missing_dir/missing aclocal"
|
||||
echo "$ac_t""missing" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
||||
echo "configure:684: checking for working autoconf" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
if (autoconf --version) > /dev/null 2>&1; then
|
||||
AUTOCONF=autoconf
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
AUTOCONF="$missing_dir/missing autoconf"
|
||||
echo "$ac_t""missing" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
||||
echo "configure:696: checking for working automake" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
if (automake --version) > /dev/null 2>&1; then
|
||||
AUTOMAKE=automake
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
AUTOMAKE="$missing_dir/missing automake"
|
||||
echo "$ac_t""missing" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
||||
echo "configure:708: checking for working autoheader" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
if (autoheader --version) > /dev/null 2>&1; then
|
||||
AUTOHEADER=autoheader
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
AUTOHEADER="$missing_dir/missing autoheader"
|
||||
echo "$ac_t""missing" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
||||
echo "configure:720: checking for working makeinfo" >&5
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
if (makeinfo --version) > /dev/null 2>&1; then
|
||||
MAKEINFO=makeinfo
|
||||
echo "$ac_t""found" 1>&6
|
||||
else
|
||||
MAKEINFO="$missing_dir/missing makeinfo"
|
||||
echo "$ac_t""missing" 1>&6
|
||||
fi
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:655: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:732: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -699,7 +776,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
|
|||
module=qt
|
||||
|
||||
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
|
||||
echo "configure:703: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
echo "configure:780: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
|
||||
if test "${enable_maintainer_mode+set}" = set; then
|
||||
enableval="$enable_maintainer_mode"
|
||||
|
|
@ -720,7 +797,7 @@ fi
|
|||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:724: checking for $ac_word" >&5
|
||||
echo "configure:801: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -749,7 +826,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:753: checking for $ac_word" >&5
|
||||
echo "configure:830: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -797,7 +874,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:801: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -807,11 +884,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
|
|||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 811 "configure"
|
||||
#line 888 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -831,12 +908,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:912: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:840: checking whether we are using GNU C" >&5
|
||||
echo "configure:917: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -845,7 +922,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -860,7 +937,7 @@ if test $ac_cv_prog_gcc = yes; then
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:864: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:941: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -888,7 +965,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:892: checking how to run the C preprocessor" >&5
|
||||
echo "configure:969: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -903,13 +980,13 @@ else
|
|||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 907 "configure"
|
||||
#line 984 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -920,13 +997,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 924 "configure"
|
||||
#line 1001 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -951,7 +1028,7 @@ echo "$ac_t""$CPP" 1>&6
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:955: checking for $ac_word" >&5
|
||||
echo "configure:1032: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -980,7 +1057,7 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking "threads package type"""... $ac_c" 1>&6
|
||||
echo "configure:984: checking "threads package type"" >&5
|
||||
echo "configure:1061: checking "threads package type"" >&5
|
||||
if eval "test \"`echo '$''{'cy_cv_threads_package'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1039,7 +1116,7 @@ if test "$use_threads" != no; then
|
|||
LDFLAGS="-L$use_threads/lib"
|
||||
LIBS="-lgthreads -lmalloc"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1043 "configure"
|
||||
#line 1120 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
|
|
@ -1048,7 +1125,7 @@ pthread_equal(NULL,NULL);
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
threads_package=FSU
|
||||
else
|
||||
|
|
@ -1060,7 +1137,7 @@ rm -f conftest*
|
|||
if test "$threads_package" = unknown; then
|
||||
LIBS="-lpthread"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1064 "configure"
|
||||
#line 1141 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
|
|
@ -1069,7 +1146,7 @@ pthread_equal(NULL,NULL);
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
threads_package=MIT
|
||||
else
|
||||
|
|
@ -1081,7 +1158,7 @@ rm -f conftest*
|
|||
if test "$threads_package" = unknown; then
|
||||
LIBS="-lpthreads"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1085 "configure"
|
||||
#line 1162 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <pthread.h>
|
||||
int main() {
|
||||
|
|
@ -1090,7 +1167,7 @@ pthread_equal(NULL,NULL);
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
threads_package=PCthreads
|
||||
else
|
||||
|
|
@ -1134,7 +1211,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
|||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:1138: checking host system type" >&5
|
||||
echo "configure:1215: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -1360,6 +1437,11 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g
|
|||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||||
s%@PACKAGE@%$PACKAGE%g
|
||||
s%@VERSION@%$VERSION%g
|
||||
s%@ACLOCAL@%$ACLOCAL%g
|
||||
s%@AUTOCONF@%$AUTOCONF%g
|
||||
s%@AUTOMAKE@%$AUTOMAKE%g
|
||||
s%@AUTOHEADER@%$AUTOHEADER%g
|
||||
s%@MAKEINFO@%$MAKEINFO%g
|
||||
s%@SET_MAKE@%$SET_MAKE%g
|
||||
s%@module@%$module%g
|
||||
s%@MAINT@%$MAINT%g
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue