Mercurial > hg > octave-nkf

changeset 6057:0cc5f8afba3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-18 02:02:36 by jwe]
author jwe
date Wed, 18 Oct 2006 02:05:22 +0000
parents 1297bb9a3ad0
children cb4324a4fbb5
files ChangeLog aclocal.m4 libcruft/ChangeLog libcruft/lapack-xtra/xdlamch.f libcruft/misc/Makefile.in
diffstat 5 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-17  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* (OCTAVE_CXX_PREPENDS_UNDERSCORE, OCTAVE_CXX_ABI): Use $ac_objext
+	instead of assuming .o.
+
 2006-10-17  John W. Eaton  <jwe@octave.org>
 
 	* configure.in: Check for curl_easy_escap instead of
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -633,7 +633,7 @@
 bool FSmy_dld_fcn (void) { return false; }
 EOF
     if AC_TRY_EVAL(ac_compile); then
-      if test "`${NM-nm} conftest.o | grep _FSmy_dld_fcn`" != ""; then
+      if test "`${NM-nm} conftest.$ac_objext | grep _FSmy_dld_fcn`" != ""; then
         octave_cv_cxx_prepends_underscore=yes
       fi
     else
@@ -742,13 +742,13 @@
 bool FSmy_dld_fcn (void) { return false; }
 EOF
     if AC_TRY_EVAL(ac_compile); then
-      if test "`${NM-nm} conftest.o | grep FSmy_dld_fcn__Fv`" != ""; then
+      if test "`${NM-nm} conftest.$ac_objext | grep FSmy_dld_fcn__Fv`" != ""; then
         octave_cv_cxx_abi='gnu_v2'
       fi
-      if test "`${NM-nm} conftest.o | grep _Z12FSmy_dld_fcnv`" != ""; then
+      if test "`${NM-nm} conftest.$ac_objext | grep _Z12FSmy_dld_fcnv`" != ""; then
         octave_cv_cxx_abi='gnu_v3'
       fi
-      if test "`${NM-nm} conftest.o | grep __1cMFSmy_dld_fcn6F_b_`" != ""; then
+      if test "`${NM-nm} conftest.$ac_objext | grep __1cMFSmy_dld_fcn6F_b_`" != ""; then
         octave_cv_cxx_abi='sun_v5'
       fi
     else
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-17  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* lapack-xtra/xdlamch.f: Begin lines with spaces, not tabs.
+
+	* misc/Makefile.in (machar.o, pic/machar.o): Specify output file
+	name in compile command.
+
 2006-10-13  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* Makefile.in: Adapt rules to use $(LIBPRE).
--- a/libcruft/lapack-xtra/xdlamch.f
+++ b/libcruft/lapack-xtra/xdlamch.f
@@ -1,6 +1,6 @@
-	subroutine xdlamch (cmach, retval)
-	character cmach
-	double precision retval, dlamch
-	retval = dlamch (cmach)
-	return
-	end
+      subroutine xdlamch (cmach, retval)
+      character cmach
+      double precision retval, dlamch
+      retval = dlamch (cmach)
+      return
+      end
--- a/libcruft/misc/Makefile.in
+++ b/libcruft/misc/Makefile.in
@@ -62,7 +62,7 @@
 XALL_CFLAGS = $(patsubst -O%, , $(ALL_CFLAGS))
 
 machar.o: $(srcdir)/machar.c
-	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $<
+	$(XCC) -c $(CPPFLAGS) $(XALL_CFLAGS) -DDP $< -o $@
 
 pic/machar.o: $(srcdir)/machar.c
 	$(XCC) -c $(CPPFLAGS) $(CPICFLAG) $(XALL_CFLAGS) -DDP $< -o $@