Mercurial > octave-nkf

changeset 4626:1ba089061bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-11-16 00:33:07 by jwe]
author jwe
date Sun, 16 Nov 2003 00:33:07 +0000
parents 87c01a296263
children 212fc2115e09
files ChangeLog Makeconf.in configure.in src/ChangeLog src/version.h
diffstat 5 files changed, 50 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 15 12:51:20 2003 +0000
+++ b/ChangeLog	Sun Nov 16 00:33:07 2003 +0000
@@ -1,3 +1,13 @@
+2003-11-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makeconf.in (WARN_CFLAGS, WARN_CXXFLAGS): Substitute them.
+	(ALL_CFLAGS, BUG_CFLAGS): Add $(WARN_CFLAGS).
+	(ALL_CXXFLAGS, BUG_CXXFLAGS): Add $(WARN_CXXFLAGS).
+	(UGLY_ALL_CXXFLAGS): Delete.
+
+	* configure.in: Add -Wall and -Wshadow to WARN_CFLAGS and
+	WARN_CXXFLAGS instead of CFLAGS and CXXFLAGS.
+
 2003-11-12  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: If we need alloca, then also include it in LIBGLOB.
--- a/Makeconf.in	Sat Nov 15 12:51:20 2003 +0000
+++ b/Makeconf.in	Sun Nov 16 00:33:07 2003 +0000
@@ -66,7 +66,7 @@
 SHLEXT = @SHLEXT@
 SHLEXT_VER = @SHLEXT_VER@
 SHLLIB = @SHLLIB@
-SHLLIB_VER = @SHLLIB_VER@
+SHLLIB_VER = @SHLLIB_VvER@
 SHLBIN = @SHLBIN@
 SHLBIN_VER = @SHLBIN_VER@
 SHLLINKEXT=
@@ -122,8 +122,9 @@
 CFLAGS = @CFLAGS@
 CPICFLAG = @CPICFLAG@
 XTRA_CFLAGS = @XTRA_CFLAGS@
-ALL_CFLAGS = $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(CFLAGS)
-BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(CFLAGS)
+WARN_CFLAGS = @WARN_CFLAGS@
+ALL_CFLAGS = $(INCFLAGS) $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
+BUG_CFLAGS = $(DEFS) $(XTRA_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
 
 BUILD_CC = @BUILD_CC@
 BUILD_CFLAGS = @BUILD_CFLAGS@
@@ -137,9 +138,10 @@
 CXXFLAGS = @CXXFLAGS@
 CXXPICFLAG = @CXXPICFLAG@
 XTRA_CXXFLAGS = @XTRA_CXXFLAGS@
-ALL_CXXFLAGS = $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(CXXFLAGS)
-UGLY_ALL_CXXFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(XTRA_CXXFLAGS) $(CXXFLAGS)
-BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(CXXFLAGS)
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ALL_CXXFLAGS = \
+  $(INCFLAGS) $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
+BUG_CXXFLAGS = $(DEFS) $(XTRA_CXXFLAGS) $(WARN_CXXFLAGS) $(CXXFLAGS)
 
 BUILD_CXX = @BUILD_CXX@
 BUILD_CXXFLAGS = @BUILD_CXXFLAGS@
--- a/configure.in	Sat Nov 15 12:51:20 2003 +0000
+++ b/configure.in	Sun Nov 16 00:33:07 2003 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.439 $)
+AC_REVISION($Revision: 1.440 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1286,13 +1286,21 @@
 ### done feature testing. 
 
 if test -z "$EXTERN_CFLAGS"; then
-  OCTAVE_CC_FLAG(-Wall)
-  OCTAVE_CC_FLAG(-Wshadow)
+  OCTAVE_CC_FLAG(-Wall, [
+	WARN_CFLAGS="$WARN_CFLAGS -Wall";
+	AC_MSG_RESULT([adding -Wall to WARN_CFLAGS])])
+  OCTAVE_CC_FLAG(-Wshadow, [
+	WARN_CFLAGS="$WARN_CFLAGS -Wshadow";
+	AC_MSG_RESULT([adding -Wshadow to WARN_CFLAGS])])
 fi
 
 if test -z "$EXTERN_CXXFLAGS"; then
-  OCTAVE_CXX_FLAG(-Wall)
-  OCTAVE_CXX_FLAG(-Wshadow)
+  OCTAVE_CXX_FLAG(-Wall, [
+    WARN_CXXFLAGS="$WARN_CXXFLAGS -Wall";
+    AC_MSG_RESULT([adding -Wall to WARN_CXXFLAGS])])
+  OCTAVE_CXX_FLAG(-Wshadow, [
+    WARN_CXXFLAGS="$WARN_CXXFLAGS -Wshadow";
+    AC_MSG_RESULT([adding -Wshadow to WARN_CXXFLAGS])])
 fi
 
 ### Someday, maybe include -ansi and even -pedantic in this list...
@@ -1310,16 +1318,23 @@
    elif test "$enableval" = yes; then
      if test -z "$EXTERN_CFLAGS"; then
        for flag in $GCC_PICKY_FLAGS; do
-	 OCTAVE_CC_FLAG($flag)
+	 OCTAVE_CC_FLAG($flag, [
+	   WARN_CFLAGS="$WARN_CFLAGS $flag";
+	   AC_MSG_RESULT([adding $flag to WARN_CFLAGS])])
        done
      fi
      if test -z "$EXTERN_CXXFLAGS"; then
        for flag in $GXX_PICKY_FLAGS; do
-	 OCTAVE_CXX_FLAG($flag)
+	 OCTAVE_CXX_FLAG($flag, [
+	   WARN_CXXFLAGS="$WARN_CXXFLAGS $flag";
+	   AC_MSG_RESULT([adding $flag to WARN_CXXFLAGS])])
        done
      fi
    fi], [])
 
+AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
+
 ### Run configure in subdirectories.
 
 export CC
@@ -1466,8 +1481,8 @@
 
   Source directory:     $srcdir
   Installation prefix:  $prefix
-  C compiler:           $CC $XTRA_CFLAGS $CFLAGS
-  C++ compiler:         $CXX $XTRA_CXXFLAGS $CXXFLAGS
+  C compiler:           $CC $XTRA_CFLAGS $WARN_CFLAGS $CFLAGS
+  C++ compiler:         $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS
   Fortran compiler:     $FORT
   Fortran libraries:    $FLIBS
   BLAS libraries:       $BLAS_LIBS
--- a/src/ChangeLog	Sat Nov 15 12:51:20 2003 +0000
+++ b/src/ChangeLog	Sun Nov 16 00:33:07 2003 +0000
@@ -1,5 +1,11 @@
 2003-11-15  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* version.h (OCTAVE_VERSION): Now 2.1.51.
+	(OCTAVE_API_VERSION): Now api-v2.
+
+	* version.h (OCTAVE_BUGS_STATEMENT): Also tell people to look at
+	http://www.octave.org/bugs.html.
+
 	* oct-map.cc (Octave_map::assign): Use resize, not resize and fill.
 	* ov-typeinfo.cc (octave_value_typeinfo::do_register_type): Likewise.
 
@@ -11,9 +17,6 @@
 	($(DEF_FILES), $(MAKEDEPS)): Depend on it.	
 	(distclean): Remove it.
 
-	* version.h (OCTAVE_VERSION): Now 2.1.51.
-	(OCTAVE_API_VERSION): Now api-v2.
-
 	* parse.y (cancel_obj_idx): New rule.
 	(postfix_expr, prefix_expr): Use begin_obj_idx after every
 	postfix_expr on RHS.  Use cancel_obj_idx as soon as possible for
--- a/src/version.h	Sat Nov 15 12:51:20 2003 +0000
+++ b/src/version.h	Sun Nov 16 00:33:07 2003 +0000
@@ -45,7 +45,8 @@
 For more information, visit http://www.octave.org/help-wanted.html"
 
 #define OCTAVE_BUGS_STATEMENT \
-  "Report bugs to <bug-octave@bevo.che.wisc.edu>."
+  "Report bugs to <bug-octave@bevo.che.wisc.edu> (but first, please read\n\
+http://www.octave.org/bugs.html to learn how to write a helpful report)."
 
 #define OCTAVE_NAME_VERSION_AND_COPYRIGHT \
   OCTAVE_NAME_AND_VERSION ".\n" \