changeset 7062:1eb94c1da37d

[project @ 2007-10-24 19:57:57 by jwe]
author jwe
date Wed, 24 Oct 2007 19:57:57 +0000
parents 005c785b8d81
children 58102cc15ddf
files ChangeLog FLEX.patch acx_blas.m4 octMakefile.in
diffstat 4 files changed, 8 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 24 19:00:12 2007 +0000
+++ b/ChangeLog	Wed Oct 24 19:57:57 2007 +0000
@@ -1,5 +1,11 @@
 2007-10-24  John W. Eaton  <jwe@octave.org>
 
+	* FLEX.patch: Delete obsolete file.
+	* octMakefile.in (DISTFILES): Remove it from the list.
+
+	* acx_blas.m4: Use "-Wl,-framework -Wl,vecLib" instead of
+	just "-framework vecLib" in test for Mac OS X test.
+
 	* configure.in, aclocal.m4: Avoid AC_TRY_EVAL.
 
 	* aclocal.m4 (OCTAVE_STRPTIME_BROKEN): New macro.
--- a/FLEX.patch	Wed Oct 24 19:00:12 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-*** flex.skl~	Tue Sep 10 18:58:54 1996
---- flex.skl	Tue Nov 24 23:10:34 1998
-***************
-*** 1179,1185 ****
---- 1179,1189 ----
-  %-
-  #ifndef YY_ALWAYS_INTERACTIVE
-  #ifndef YY_NEVER_INTERACTIVE
-+ #ifdef __cplusplus
-+ extern "C" int isatty YY_PROTO(( int ));
-+ #else
-  extern int isatty YY_PROTO(( int ));
-+ #endif
-  #endif
-  #endif
-  
--- a/acx_blas.m4	Wed Oct 24 19:00:12 2007 +0000
+++ b/acx_blas.m4	Wed Oct 24 19:57:57 2007 +0000
@@ -90,7 +90,7 @@
 
 # BLAS in Apple vecLib framework? (Mac OS X)
 if test $acx_blas_ok = no; then
-	vlib_flags="-framework vecLib"
+	vlib_flags="-Wl,-framework -Wl,vecLib"
 	save_LIBS="$LIBS"; LIBS="$vlib_flags $LIBS"
 	AC_MSG_CHECKING([for $sgemm in $vlib_flags])
 	AC_LINK_IFELSE([AC_LANG_CALL([], [$sgemm])],
--- a/octMakefile.in	Wed Oct 24 19:00:12 2007 +0000
+++ b/octMakefile.in	Wed Oct 24 19:57:57 2007 +0000
@@ -42,7 +42,7 @@
 BUILT_DISTFILES = $(BUILT_CONF_DISTFILES) BUGS INSTALL.OCTAVE
 
 DISTFILES = $(CONF_DISTFILES) \
-	COPYING FLEX.patch INSTALL NEWS \
+	COPYING INSTALL NEWS \
 	NEWS.[0-9] PROJECTS README README.Linux README.Windows \
 	README.Cygwin README.MSVC \
 	README.MachTen README.kpathsea ROADMAP SENDING-PATCHES \