changeset 1018:9a64a46f2224

[project @ 1995-01-07 19:29:43 by jwe]
author jwe
date Sat, 07 Jan 1995 19:29:47 +0000
parents d52ca8be7d1e
children 7a632c749c67
files Makeconf.in configure.in
diffstat 2 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makeconf.in	Sat Jan 07 18:28:33 1995 +0000
+++ b/Makeconf.in	Sat Jan 07 19:29:47 1995 +0000
@@ -72,11 +72,13 @@
 CXXCPP = @CXXCPP@
 CXXFLAGS = @CXXFLAGS@
 NO_IMPLICIT_TEMPLATES = @NO_IMPLICIT_TEMPLATES@
-ALL_CXXFLAGS = $(INCFLAGS) $(DEFS) $(NO_IMPLICIT_TEMPLATES) \
+HOST_CXXFLAGS = @HOST_CXXFLAGS@
+ALL_CXXFLAGS = $(INCFLAGS) $(DEFS) $(HOST_CXXFLAGS) \
+	$(NO_IMPLICIT_TEMPLATES) $(GCC_IEEE_FP_FLAG) $(CXXFLAGS)
+UGLY_ALL_CXXFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(HOST_CXXFLAGS) \
+	$(NO_IMPLICIT_TEMPLATES) $(GCC_IEEE_FP_FLAG) $(CXXFLAGS)
+BUG_CXXFLAGS = $(DEFS) $(HOST_CXXFLAGS) $(NO_IMPLICIT_TEMPLATES) \
 	$(GCC_IEEE_FP_FLAG) $(CXXFLAGS)
-UGLY_ALL_CXXFLAGS = $(INCFLAGS) $(UGLY_DEFS) $(NO_IMPLICIT_TEMPLATES) \
-	$(GCC_IEEE_FP_FLAG) $(CXXFLAGS)
-BUG_CXXFLAGS = $(DEFS) $(NO_IMPLICIT_TEMPLATES) $(GCC_IEEE_FP_FLAG) $(CXXFLAGS)
 
 CPPFLAGS = @CPPFLAGS@
 
--- a/configure.in	Sat Jan 07 18:28:33 1995 +0000
+++ b/configure.in	Sat Jan 07 19:29:47 1995 +0000
@@ -21,7 +21,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-AC_REVISION($Revision: 1.84 $)
+AC_REVISION($Revision: 1.85 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h kpathsea/c-auto.h)
@@ -221,17 +221,20 @@
   ;;
 esac
 
+HOST_CXXFLAGS=
 case "$gxx_version" in
   2.6.*)
     case "$canonical_host_type" in
       rs6000-ibm-aix*)
-        CXXFLAGS="$CXXFLAGS -Wa,-u"
-        AC_MSG_RESULT([adding -Wa,-u to CXXFLAGS for AIX])
+        HOST_CXXFLAGS="-Wa,-u"
+        AC_MSG_RESULT([defining HOST_CXXFLAGS to be $HOST_CXXFLAGS])
       ;;
     esac
   ;;
 esac
 
+AC_SUBST(HOST_CXXFLAGS)
+
 ### See what libraries are used by the C++ compiler.  Need this for
 ### dynamic linking.