Mercurial > octave
changeset 1257:345c21405c57
[project @ 1995-04-12 01:31:50 by jwe]
| author | jwe |
|---|---|
| date | Wed, 12 Apr 1995 01:32:57 +0000 |
| parents | 8ed7f351d0de |
| children | c7a7ad888748 |
| files | aclocal.m4 configure.in |
| diffstat | 2 files changed, 32 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/aclocal.m4 Wed Apr 12 01:11:57 1995 +0000 +++ b/aclocal.m4 Wed Apr 12 01:32:57 1995 +0000 @@ -225,11 +225,34 @@ FLIBS="$octave_cv_flibs" AC_MSG_RESULT([$FLIBS])]) +dnl See if the Fortran compiler uses uppercase external names. +dnl +dnl OCTAVE_F77_UPPERCASE_NAMES() +AC_DEFUN(OCTAVE_F77_UPPERCASE_NAMES, +[AC_MSG_CHECKING([whether $F77 uses uppercase external names]) +AC_CACHE_VAL(octave_cv_f77_uppercase_names, +[octave_cv_f77_uppercase_names=no +cat > conftest.f <<EOF + subroutine xxyyzz () + return + end +EOF +if ${F77-f77} -c conftest.f 1>&AC_FD_CC 2>&AC_FD_CC; then + if test "`${NM-nm} conftest.o | grep XXYYZZ`" != ""; then + octave_cv_f77_uppercase_names=yes + fi +fi]) +AC_MSG_RESULT([$octave_cv_f77_uppercase_names]) +if test "$octave_cv_f77_uppercase_names" = yes; then + AC_DEFINE(F77_UPPERCASE_NAMES, 1) +fi]) + dnl See if the Fortran compiler appends underscores to external names. dnl dnl OCTAVE_F77_APPEND_UNDERSCORE() AC_DEFUN(OCTAVE_F77_APPEND_UNDERSCORE, [AC_MSG_CHECKING([whether $F77 appends underscores to external names]) +AC_REQUIRE([OCTAVE_F77_UPPERCASE_NAMES]) AC_CACHE_VAL(octave_cv_f77_append_underscore, [octave_cv_f77_append_underscore=no cat > conftest.f <<EOF @@ -238,10 +261,14 @@ end EOF if ${F77-f77} -c conftest.f 1>&AC_FD_CC 2>&AC_FD_CC; then - if test "`${NM-nm} conftest.o | grep xxyyzz_`" != ""; then - octave_cv_f77_append_underscore=yes - elif test "`${NM-nm} conftest.o | grep XXYYZZ_`" != ""; then - octave_cv_f77_append_underscore=yes + if test "$octave_cv_f77_uppercase_names" = yes; then + if test "`${NM-nm} conftest.o | grep XXYYZZ_`" != ""; then + octave_cv_f77_append_underscore=yes + fi + else + if test "`${NM-nm} conftest.o | grep xxyyzz_`" != ""; then + octave_cv_f77_append_underscore=yes + fi fi fi]) AC_MSG_RESULT([$octave_cv_f77_append_underscore])
--- a/configure.in Wed Apr 12 01:11:57 1995 +0000 +++ b/configure.in Wed Apr 12 01:32:57 1995 +0000 @@ -20,7 +20,7 @@ ### along with Octave; see the file COPYING. If not, write to the Free ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -AC_REVISION($Revision: 1.114 $) +AC_REVISION($Revision: 1.115 $) AC_PREREQ(2.0) AC_INIT(src/octave.cc) AC_CONFIG_HEADER(config.h) @@ -726,15 +726,6 @@ AC_MSG_RESULT([defining DEFAULT_PAGER to be $DEFAULT_PAGER]) fi -### Even though we include config.h in most files, some need to be -### compiled with the -D options on the compiler command line. Use -### UGLY_DEFS for that. - -AC_OUTPUT_MAKE_DEFS -UGLY_DEFS="$DEFS" -AC_MSG_RESULT([defining UGLY_DEFS to be $UGLY_DEFS]) -AC_SUBST(UGLY_DEFS) - ### Maybe add -Wall to compiler flags now that we're done feature ### testing. ###