changeset 2854:f9088eb6b47a

[project @ 1997-03-28 22:54:28 by jwe]
author jwe
date Fri, 28 Mar 1997 22:54:28 +0000
parents ff4ee9ad942a
children 1bb7dc230a4b
files ChangeLog aclocal.m4 configure.in
diffstat 3 files changed, 26 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 28 16:53:08 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* aclocal.m4 (OCTAVE_FLIBS): Require OCTAVE_HOST_TYPE.
+	Skip -lkernel32 on cygwin32 systems.
+
 Wed Mar 26 17:04:11 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* COPYING: Update to latest version that includes correct address
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -67,6 +67,7 @@
 dnl OCTAVE_FLIBS()
 AC_DEFUN(OCTAVE_FLIBS,
 [AC_MSG_CHECKING([for Fortran libraries])
+AC_REQUIRE([OCTAVE_HOST_TYPE])
 AC_CACHE_VAL(octave_cv_flibs,
 [changequote(, )dnl
 echo "      END" > conftest.f
@@ -154,10 +155,25 @@
 	      exists=true
 	    fi
 	  done
-	  if $exists || test x$arg = x-lm -o x$arg = x-lc; then
+	  if $exists
 	    arg=
 	  else
-	    lflags="$lflags $arg"
+	    case "$arg" in
+	      -lkernel32)
+		case "$canonical_host_type" in
+		  *-*-cygwin32)
+		  ;;
+		  *)
+		    lflags="$lflags $arg"
+		  ;;
+		esac
+	      ;;
+	      -lm | -lc)
+	      ;;
+	      *)
+		lflags="$lflags $arg"
+	      ;;
+	    esac
 	  fi
 	;;
 	-u)
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.263 $)
+AC_REVISION($Revision: 1.264 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -200,7 +200,7 @@
   sed -e 's/^.*g.. version *//' -e 's/cygnus-//'`
 case "$gxx_version" in
 changequote(,)dnl
-  2.[6789].*|2.[123456789][0123456789].*)
+  2.[6789].* | 2.[123456789][0123456789].*)
 changequote([,])dnl
     if test -z "$EXTERN_CXXFLAGS"; then
       ADD_CXX_WALL=true
@@ -209,7 +209,7 @@
     AC_MSG_RESULT([defining NO_IMPLICIT_TEMPLATES to be $NO_IMPLICIT_TEMPLATES])
   ;;
 changequote(,)dnl
-  1.*|2.[012345].*)
+  1.* | 2.[012345].*)
 changequote([,])dnl
     AC_MSG_ERROR([g++ version $gxx_version will not work to compile Octave])
   ;;