configure.in: Test $srcdir, not $subdir (probable typo).
1998-09-09 Craig Burley <burley@gnu.org> * configure.in: Test $srcdir, not $subdir (probable typo). Clarify commentary, fix a bit of spacing. From-SVN: r22349
This commit is contained in:
Craig Burley
Dave Love
parent
76bb14e35a
commit
4ed35cdcdf
|
|
@ -1,3 +1,8 @@
|
|||
1998-09-09 Craig Burley <burley@gnu.org>
|
||||
|
||||
* configure.in: Test $srcdir, not $subdir (probable typo).
|
||||
Clarify commentary, fix a bit of spacing.
|
||||
|
||||
1998-09-07 Dave Love <d.love@dl.ac.uk>
|
||||
|
||||
* ChangeLog.egcs: Deleted. Entries merged here.
|
||||
|
|
|
|||
|
|
@ -520,14 +520,12 @@ fi
|
|||
|
||||
|
||||
|
||||
# From configure.in 1.12
|
||||
|
||||
# For g77 we'll set CC to point at the built gcc, but this will get it into
|
||||
# the makefiles
|
||||
# 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:531: checking for $ac_word" >&5
|
||||
echo "configure:529: 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
|
||||
|
|
@ -556,7 +554,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:560: checking for $ac_word" >&5
|
||||
echo "configure:558: 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
|
||||
|
|
@ -604,7 +602,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:608: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:606: 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.
|
||||
|
|
@ -614,11 +612,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 618 "configure"
|
||||
#line 616 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:620: \"$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
|
||||
|
|
@ -638,12 +636,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:642: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:640: 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:647: checking whether we are using GNU C" >&5
|
||||
echo "configure:645: 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
|
||||
|
|
@ -652,7 +650,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:656: \"$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:654: \"$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
|
||||
|
|
@ -667,7 +665,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:671: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:669: 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
|
||||
|
|
@ -703,7 +701,7 @@ else
|
|||
# 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:707: checking for $ac_word" >&5
|
||||
echo "configure:705: 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
|
||||
|
|
@ -761,7 +759,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:765: checking for a BSD compatible install" >&5
|
||||
echo "configure:763: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -812,7 +810,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
|||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
|
||||
echo "configure:816: checking whether ${MAKE-make} sets \${MAKE}" >&5
|
||||
echo "configure:814: 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
|
||||
|
|
@ -841,7 +839,7 @@ fi
|
|||
|
||||
# Sanity check for the cross-compilation case:
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:845: checking how to run the C preprocessor" >&5
|
||||
echo "configure:843: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -856,13 +854,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 860 "configure"
|
||||
#line 858 "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:866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -873,13 +871,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 877 "configure"
|
||||
#line 875 "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:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -903,17 +901,17 @@ echo "$ac_t""$CPP" 1>&6
|
|||
|
||||
ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for stdio.h""... $ac_c" 1>&6
|
||||
echo "configure:907: checking for stdio.h" >&5
|
||||
echo "configure:905: checking for stdio.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 912 "configure"
|
||||
#line 910 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -941,21 +939,21 @@ fi
|
|||
|
||||
|
||||
# We have to firkle with the info in hconfig.h to figure out suitable types
|
||||
# (via com.h). proj.h and com.h are in $srcdir/.., config.h which they need
|
||||
# is in ../.. and the config files are in $srcdir/../../config.
|
||||
# (via com.h). proj.h and com.h are in gcc/f/, config.h which they need
|
||||
# is in gcc/ and the config files are in gcc/config/.
|
||||
echo $ac_n "checking f2c integer type""... $ac_c" 1>&6
|
||||
echo "configure:948: checking f2c integer type" >&5
|
||||
echo "configure:946: checking f2c integer type" >&5
|
||||
late_ac_cpp=$ac_cpp
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$subdir" != . ; then
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$srcdir" != . ; then
|
||||
ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config"
|
||||
fi
|
||||
if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
echo "configure:957: using $ac_cpp" >&5
|
||||
echo "configure:955: using $ac_cpp" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 959 "configure"
|
||||
#line 957 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "proj.h"
|
||||
#define FFECOM_DETERMINE_TYPES 1
|
||||
|
|
@ -977,9 +975,9 @@ fi
|
|||
rm -f conftest*
|
||||
|
||||
if test "$g77_cv_sys_f2cinteger" = ""; then
|
||||
echo "configure:981: using $ac_cpp" >&5
|
||||
echo "configure:979: using $ac_cpp" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 983 "configure"
|
||||
#line 981 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "proj.h"
|
||||
#define FFECOM_DETERMINE_TYPES 1
|
||||
|
|
@ -1014,18 +1012,18 @@ ac_cpp=$late_ac_cpp
|
|||
|
||||
|
||||
echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
|
||||
echo "configure:1018: checking f2c long int type" >&5
|
||||
echo "configure:1016: checking f2c long int type" >&5
|
||||
late_ac_cpp=$ac_cpp
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$subdir" != . ; then
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$srcdir" != . ; then
|
||||
ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config"
|
||||
fi
|
||||
if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
echo "configure:1027: using $ac_cpp" >&5
|
||||
echo "configure:1025: using $ac_cpp" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1029 "configure"
|
||||
#line 1027 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "proj.h"
|
||||
#define FFECOM_DETERMINE_TYPES 1
|
||||
|
|
@ -1047,9 +1045,9 @@ fi
|
|||
rm -f conftest*
|
||||
|
||||
if test "$g77_cv_sys_f2clongint" = ""; then
|
||||
echo "configure:1051: using $ac_cpp" >&5
|
||||
echo "configure:1049: using $ac_cpp" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1053 "configure"
|
||||
#line 1051 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "proj.h"
|
||||
#define FFECOM_DETERMINE_TYPES 1
|
||||
|
|
@ -1128,7 +1126,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:1132: checking host system type" >&5
|
||||
echo "configure:1130: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -1149,7 +1147,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:1153: checking target system type" >&5
|
||||
echo "configure:1151: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -1167,7 +1165,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:1171: checking build system type" >&5
|
||||
echo "configure:1169: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@
|
|||
|
||||
AC_INIT(libF77/Version.c)
|
||||
|
||||
AC_REVISION(1.12)
|
||||
|
||||
dnl Checks for programs.
|
||||
# For g77 we'll set CC to point at the built gcc, but this will get it into
|
||||
# the makefiles
|
||||
|
|
@ -50,12 +48,12 @@ the G77 runtime system. If necessary, install gcc now with \`LANGUAGES=c',
|
|||
then the target library, then build with \`LANGUAGES=f77'.])])
|
||||
|
||||
# We have to firkle with the info in hconfig.h to figure out suitable types
|
||||
# (via com.h). proj.h and com.h are in $srcdir/.., config.h which they need
|
||||
# is in ../.. and the config files are in $srcdir/../../config.
|
||||
# (via com.h). proj.h and com.h are in gcc/f/, config.h which they need
|
||||
# is in gcc/ and the config files are in gcc/config/.
|
||||
AC_MSG_CHECKING(f2c integer type)
|
||||
late_ac_cpp=$ac_cpp
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$subdir" != . ; then
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$srcdir" != . ; then
|
||||
ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config"
|
||||
fi
|
||||
AC_CACHE_VAL(g77_cv_sys_f2cinteger,
|
||||
|
|
@ -101,8 +99,8 @@ AC_SUBST(F2C_INTEGER)
|
|||
|
||||
AC_MSG_CHECKING(f2c long int type)
|
||||
late_ac_cpp=$ac_cpp
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$subdir" != . ; then
|
||||
ac_cpp="$late_ac_cpp -I../../gcc/f -I../../gcc -I../../gcc/config"
|
||||
if test "$srcdir" != . ; then
|
||||
ac_cpp="$ac_cpp -I$srcdir/../gcc/f -I$srcdir/../gcc -I$srcdir/../gcc/config"
|
||||
fi
|
||||
AC_CACHE_VAL(g77_cv_sys_f2clongint,
|
||||
|
|
|
|||
Loading…
Reference in New Issue