Mercurial > hg > octave-lyh

changeset 4125:040314da2fec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-10-25 12:55:47 by jwe]
author jwe
date Fri, 25 Oct 2002 12:55:47 +0000
parents 0435429c1050
children b10790694d48
files ChangeLog aclocal.m4 doc/ChangeLog doc/faq/Makefile.in doc/interpreter/Makefile.in doc/liboctave/Makefile.in
diffstat 6 files changed, 24 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-25  Per Persson <persquare@mac.com>
+
+	* aclocal.m4 (OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION): Fix
+	first test to properly fail on OS X.  Fix typo in final test to
+	set result.
+
 2002-10-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mk-opts.pl (emit_opt_class_header): Make set_options another
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -403,7 +403,7 @@
     AC_LINK_IFELSE([OCTAVE_LANG_PROG_NO_CONFDEFS([#pragma implementation
 #include "conftest.h"])],
       [octave_pii_test_2=yes], [octave_pii_test_2=no])
-    if test $octave_pii_test_1 = yes && test $octave_pii_test_1 = yes; then
+    if test $octave_pii_test_1 = yes && test $octave_pii_test_2 = yes; then
       octave_cv_cxx_pragma_interface_implementation=yes
     else
       octave_cv_cxx_pragma_interface_implementation=no
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-25  Paul Kienzle <pkienzle@users.sf.net>
+
+	* interpreter/Makefile.in (octave_toc.html): Use -expandinfo and
+	-split_chapter instead of -expand info and -split chapter.
+	* liboctave/Makefile.in (liboctave_toc.html): Likewisel
+	* faq/Makefile.in (Octave-FAQ_toc.html): Likewise.
+
+2002-10-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* interpreter/Makefile.in (munge-texi$(BUILD_EXEEXT)): Always use
+	-DNO_PRAGMA_INTERFACE_IMPLEMENTATION for compiling and linking.
+
 2002-10-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* interpreter/Makefile.in (%.texi : %.txi):
--- a/doc/faq/Makefile.in
+++ b/doc/faq/Makefile.in
@@ -52,7 +52,7 @@
 # These option forms are supported by texi2html 1.65 and probably also
 # more recent versions.
 Octave-FAQ_toc.html:
-	-texi2html -expand info -split chapter $(srcdir)/Octave-FAQ.texi
+	-texi2html -expandinfo -split_chapter $(srcdir)/Octave-FAQ.texi
 
 check install install-strip uninstall:
 .PHONY: check install install-strip uninstall
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -65,10 +65,10 @@
 $(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT)
 
 %.o : %.cc
-	$(BUILD_CXX) -c $(INCFLAGS) -DHAVE_CONFIG_H $< -o $@
+	$(BUILD_CXX) -DNO_PRAGMA_INTERFACE_IMPLEMENTATION=1 -c $(INCFLAGS) -DHAVE_CONFIG_H $< -o $@
 
 munge-texi$(BUILD_EXEEXT): munge-texi.o Map-s.o
-	$(BUILD_CXX) -o $@ $^
+	$(BUILD_CXX) -DNO_PRAGMA_INTERFACE_IMPLEMENTATION=1 -o $@ $^
 
 src-DOCSTRINGS:
 	$(MAKE) -C ../../src DOCSTRINGS
@@ -113,7 +113,7 @@
 # These option forms are supported by texi2html 1.65 and probably also
 # more recent versions.
 octave_toc.html: $(MAIN_TEXINFO) $(SUB_TEXINFO)
-	-texi2html -expand info -split chapter -I $(srcdir)/.. $<
+	-texi2html -expandinfo -split_chapter -I $(srcdir)/.. $<
 
 check: all
 .PHONY: check
--- a/doc/liboctave/Makefile.in
+++ b/doc/liboctave/Makefile.in
@@ -56,7 +56,7 @@
 # These option forms are supported by texi2html 1.65 and probably also
 # more recent versions.
 liboctave_toc.html:
-	-texi2html -expand info -split chapter -I $(srcdir)/.. \
+	-texi2html -expandinfo -split_chapter -I $(srcdir)/.. \
 	  $(srcdir)/liboctave.texi
 
 check: