mirror of git://gcc.gnu.org/git/gcc.git
configure.in (extra_includes): Don't attempt to calculate the location of the gcc src or obj directories.
* configure.in (extra_includes): Don't attempt to calculate the location of the gcc src or obj directories. Instead rely on precomputed variables, $topsrcdir and $r, to obtain these values. Set -I flags appropriately. From-SVN: r26084
This commit is contained in:
parent
863ebdad19
commit
8d0823e282
|
@ -1,3 +1,10 @@
|
||||||
|
Wed Mar 31 13:50:24 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
|
||||||
|
|
||||||
|
* configure.in (extra_includes): Don't attempt to calculate the
|
||||||
|
location of the gcc src or obj directories. Instead rely on
|
||||||
|
precomputed variables, $topsrcdir and $r, to obtain these values.
|
||||||
|
Set -I flags appropriately.
|
||||||
|
|
||||||
1999-03-28 Dave Love <fx@gnu.org>
|
1999-03-28 Dave Love <fx@gnu.org>
|
||||||
|
|
||||||
* configure: Rebuilt.
|
* configure: Rebuilt.
|
||||||
|
|
|
@ -632,7 +632,7 @@ else
|
||||||
if { (eval echo configure:633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
if { (eval echo configure:633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||||
for file in conftest.*; do
|
for file in conftest.*; do
|
||||||
case $file in
|
case $file in
|
||||||
*.c | *.o | *.obj | *.ilk | *.pdb) ;;
|
*.c | *.o | *.obj) ;;
|
||||||
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
|
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -1164,12 +1164,7 @@ echo "configure:1164: checking f2c integer type" >&5
|
||||||
# Set this back later below!
|
# Set this back later below!
|
||||||
late_ac_cpp=$ac_cpp
|
late_ac_cpp=$ac_cpp
|
||||||
late_cflags=$CFLAGS
|
late_cflags=$CFLAGS
|
||||||
##gcc -c -DIN_GCC -DHAVE_CONFIG_H -I. -I/home/fx/c-e/egcs/gcc -I/home/fx/c-e/egcs/gcc/config -I/home/fx/c-e/egcs/gcc/../include /home/fx/c-e/egcs/gcc/f/proj.c
|
extra_includes="-I$topsrcdir/gcc/f -I$topsrcdir/gcc -I$topsrcdir/include -I$topsrcdir/gcc/config -I$r/gcc"
|
||||||
if test "$srcdir" != . ; then
|
|
||||||
extra_includes="-I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../include -I$srcdir/../gcc/config"
|
|
||||||
else
|
|
||||||
extra_includes="-I../../gcc/f -I../../gcc -I../../include -I../../gcc/config"
|
|
||||||
fi
|
|
||||||
ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes"
|
ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes"
|
||||||
|
|
||||||
# The AC_EGREP_CPPs below have been known to fail when the header
|
# The AC_EGREP_CPPs below have been known to fail when the header
|
||||||
|
@ -1178,7 +1173,7 @@ ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes"
|
||||||
# the headers.
|
# the headers.
|
||||||
CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes"
|
CFLAGS="$CFLAGS -DHAVE_CONFIG_H -DIN_GCC $extra_includes"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1182 "configure"
|
#line 1177 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "proj.h"
|
#include "proj.h"
|
||||||
#define FFECOM_DETERMINE_TYPES 1
|
#define FFECOM_DETERMINE_TYPES 1
|
||||||
|
@ -1187,7 +1182,7 @@ int main() {
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:1191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:1186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
echo "configure: failed program was:" >&5
|
echo "configure: failed program was:" >&5
|
||||||
|
@ -1201,9 +1196,9 @@ CFLAGS=$late_cflags
|
||||||
if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'g77_cv_sys_f2cinteger'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
echo "configure:1205: using $ac_cpp" >&5
|
echo "configure:1200: using $ac_cpp" >&5
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1207 "configure"
|
#line 1202 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "proj.h"
|
#include "proj.h"
|
||||||
#define FFECOM_DETERMINE_TYPES 1
|
#define FFECOM_DETERMINE_TYPES 1
|
||||||
|
@ -1225,9 +1220,9 @@ fi
|
||||||
rm -f conftest*
|
rm -f conftest*
|
||||||
|
|
||||||
if test "$g77_cv_sys_f2cinteger" = ""; then
|
if test "$g77_cv_sys_f2cinteger" = ""; then
|
||||||
echo "configure:1229: using $ac_cpp" >&5
|
echo "configure:1224: using $ac_cpp" >&5
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1231 "configure"
|
#line 1226 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "proj.h"
|
#include "proj.h"
|
||||||
#define FFECOM_DETERMINE_TYPES 1
|
#define FFECOM_DETERMINE_TYPES 1
|
||||||
|
@ -1261,13 +1256,13 @@ F2C_INTEGER=$g77_cv_sys_f2cinteger
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
|
echo $ac_n "checking f2c long int type""... $ac_c" 1>&6
|
||||||
echo "configure:1265: checking f2c long int type" >&5
|
echo "configure:1260: checking f2c long int type" >&5
|
||||||
if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'g77_cv_sys_f2clongint'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
echo "configure:1269: using $ac_cpp" >&5
|
echo "configure:1264: using $ac_cpp" >&5
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1271 "configure"
|
#line 1266 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "proj.h"
|
#include "proj.h"
|
||||||
#define FFECOM_DETERMINE_TYPES 1
|
#define FFECOM_DETERMINE_TYPES 1
|
||||||
|
@ -1290,9 +1285,9 @@ rm -f conftest*
|
||||||
|
|
||||||
|
|
||||||
if test "$g77_cv_sys_f2clongint" = ""; then
|
if test "$g77_cv_sys_f2clongint" = ""; then
|
||||||
echo "configure:1294: using $ac_cpp" >&5
|
echo "configure:1289: using $ac_cpp" >&5
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1296 "configure"
|
#line 1291 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include "proj.h"
|
#include "proj.h"
|
||||||
#define FFECOM_DETERMINE_TYPES 1
|
#define FFECOM_DETERMINE_TYPES 1
|
||||||
|
@ -1371,7 +1366,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||||
echo "configure:1375: checking host system type" >&5
|
echo "configure:1370: checking host system type" >&5
|
||||||
|
|
||||||
host_alias=$host
|
host_alias=$host
|
||||||
case "$host_alias" in
|
case "$host_alias" in
|
||||||
|
@ -1392,7 +1387,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
echo "$ac_t""$host" 1>&6
|
echo "$ac_t""$host" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||||
echo "configure:1396: checking target system type" >&5
|
echo "configure:1391: checking target system type" >&5
|
||||||
|
|
||||||
target_alias=$target
|
target_alias=$target
|
||||||
case "$target_alias" in
|
case "$target_alias" in
|
||||||
|
@ -1410,7 +1405,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
echo "$ac_t""$target" 1>&6
|
echo "$ac_t""$target" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||||
echo "configure:1414: checking build system type" >&5
|
echo "configure:1409: checking build system type" >&5
|
||||||
|
|
||||||
build_alias=$build
|
build_alias=$build
|
||||||
case "$build_alias" in
|
case "$build_alias" in
|
||||||
|
|
|
@ -101,12 +101,7 @@ AC_MSG_CHECKING(f2c integer type)
|
||||||
# Set this back later below!
|
# Set this back later below!
|
||||||
late_ac_cpp=$ac_cpp
|
late_ac_cpp=$ac_cpp
|
||||||
late_cflags=$CFLAGS
|
late_cflags=$CFLAGS
|
||||||
##gcc -c -DIN_GCC -DHAVE_CONFIG_H -I. -I/home/fx/c-e/egcs/gcc -I/home/fx/c-e/egcs/gcc/config -I/home/fx/c-e/egcs/gcc/../include /home/fx/c-e/egcs/gcc/f/proj.c
|
extra_includes="-I$topsrcdir/gcc/f -I$topsrcdir/gcc -I$topsrcdir/include -I$topsrcdir/gcc/config -I$r/gcc"
|
||||||
if test "$srcdir" != . ; then
|
|
||||||
extra_includes="-I$srcdir/../gcc/f -I../../gcc -I$srcdir/../gcc -I$srcdir/../include -I$srcdir/../gcc/config"
|
|
||||||
else
|
|
||||||
extra_includes="-I../../gcc/f -I../../gcc -I../../include -I../../gcc/config"
|
|
||||||
fi
|
|
||||||
ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes"
|
ac_cpp="$late_ac_cpp -DIN_GCC -DHAVE_CONFIG_H $extra_includes"
|
||||||
|
|
||||||
# The AC_EGREP_CPPs below have been known to fail when the header
|
# The AC_EGREP_CPPs below have been known to fail when the header
|
||||||
|
|
Loading…
Reference in New Issue