From 1f4bc1bf100d5d13e19c0c3b173d1d3a4dbe0e1b Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@linas.org>
Date: Mon, 23 Aug 1999 05:28:40 +0000
Subject: [PATCH] Fixes for dec-osf builds Date: Sun, 22 Aug 1999 20:59:09
 -0500 (CDT) From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>

1) adds top_srcdir to Makefile.init.in, since one of the Makefiles that
includes it needs top_srcdir but it isn't set in that particular Makefile.
This may not be the right call -- it should probably be substituted directly
into the Makefile.ins that are missing it.

2) It removes instances where (gcc|egcs)-specific C flags are in configure.in
or the Makefile.ins.  As long as CFLAGS is substituted into the Makefiles by
configure, there shouldn't be any need to augment CFLAGS.

3) It fixes a problem with finding libXpm and later libXmHTML on platforms
where $x_libraries (after a call to AC_PATH_X and AC_PATH_XTRA) is empty (i.e.
the libraries and header files are in standard places).  Using X_PRE_LIBS
may not be the right solution here either, so further work may be necessary
on this.

4) It makes sure that any CPPFLAGS specified by the person running configure
(e.g. -I/path/to/Xpm/headers -I/path/to/XmHTML/headers) is passed into the
Motif Makefile.in, so header files are found.

5) It updates the top level Makefile.init.in so that @CXX@ is used in place
of @C++@, since that's the common autoconf "variable" for it.  I don't think
C++ stuff is used anywhere here anyway so it's probably not needed, but I
noticed it so I thought I would fix it.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1915 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 Makefile.init.in           | 3 ++-
 configure.in               | 4 ++--
 src/swig/perl5/Makefile.in | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.init.in b/Makefile.init.in
index 8a01b215ce..0e448f4802 100644
--- a/Makefile.init.in
+++ b/Makefile.init.in
@@ -5,6 +5,7 @@
 export PATH := @GUILE_BIN@:@ABSOLUTE_TOP_SRCDIR@/lib/g-wrap-install/bin/:${PATH}
 
 srcdir  = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH   = @srcdir@
 
 prefix=@prefix@
@@ -23,7 +24,7 @@ sysconfdir=@sysconfdir@
 includedir=@includedir@
 
 CC           = @CC@
-C++          = @C++@
+CXX          = @CXX@
 CFLAGS       = @CFLAGS@
 CPPFLAGS     = @CPPFLAGS@
 INSTALL      = @INSTALL@
diff --git a/configure.in b/configure.in
index a00addabca..701c450401 100644
--- a/configure.in
+++ b/configure.in
@@ -225,7 +225,7 @@ AC_CHECK_LIB(png, png_read_image,
 
 AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
         AC_DEFINE(HAVE_XPM,1) X_LIBS="-lXpm $X_LIBS",
-        AC_DEFINE(HAVE_XPM,0), -L$x_libraries -lX11) 
+        AC_DEFINE(HAVE_XPM,0), $X_PRE_LIBS -lX11 $X_LIBS $X_EXTRA_LIBS) 
 
 # Don't build the xmhtml source if user already has it installed...
 # this is ugly, there must be a nicer way of setting this up ...
@@ -414,7 +414,7 @@ AC_SUBST(GNC_RUNTIME_CONFIGDIR)
 GTKSHEET_DIR="gtksheet"
 AC_SUBST(GTKSHEET_DIR)
 
-CFLAGS="${CFLAGS} -Werror -Wno-unused"
+#CFLAGS="${CFLAGS} -Werror -Wno-unused"
 
 ABSOLUTE_TOP_SRCDIR=`pwd`
 AC_SUBST(ABSOLUTE_TOP_SRCDIR)
diff --git a/src/swig/perl5/Makefile.in b/src/swig/perl5/Makefile.in
index 56c3a84dd1..0524c2ab65 100644
--- a/src/swig/perl5/Makefile.in
+++ b/src/swig/perl5/Makefile.in
@@ -33,8 +33,7 @@ INCLPATH = \
 
 # set -Dbool=char because the perl headers need this
 # use -fpic so that we can create loadable module
-CFLAGS := @CFLAGS@  ${INCLPATH} -Dbool=char -fpic -Wno-unused
-CFLAGS := $(filter-out -Werror,${CFLAGS})
+CFLAGS := @CFLAGS@  ${INCLPATH} -Dbool=char #-fpic -Wno-unused
 
 LDFLAGS  = @LDFLAGS@