gnucash gcc 3.2/redhat 8.0 compilation fixes

[Haakon Loevdal]

Hi. First of all, thank you for a wonderful program.

I had to make some changes in order to get gnucash-1.7 to compile
on my system (redhat 8.0 with gcc 3.2). The following diff is against cvs.

# This is a patch for gnucash.cvs-orig to update it to gnucash
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####

#### Patch data follows ####
diff -c 'gnucash.cvs-orig/Makefile.am' 'gnucash/Makefile.am'
Index: ./Makefile.am
*** ./Makefile.am	Tue Jan 21 05:40:14 2003
--- ./Makefile.am	Wed Jan 22 22:13:30 2003
***************
*** 23,28 ****
--- 23,29 ----
    INSTALL \
    NEWS \
    README \
+   README.cvs \
    README.patches
  
  m4datadir = $(datadir)/aclocal
diff -c 'gnucash.cvs-orig/configure.in' 'gnucash/configure.in'
Index: ./configure.in
*** ./configure.in	Tue Jan 21 21:32:51 2003
--- ./configure.in	Wed Jan 22 22:22:26 2003
***************
*** 389,395 ****
      if test "x$enableval" != "xno" ; then
  
        PGSQL_CFLAGS=`${PG_CONFIG} --includedir`
!       if test "x$PGSQL_CFLAGS" != x; then
           CFLAGS="${CFLAGS} -I${PGSQL_CFLAGS}"
        fi
  
--- 389,395 ----
      if test "x$enableval" != "xno" ; then
  
        PGSQL_CFLAGS=`${PG_CONFIG} --includedir`
!       if test "x$PGSQL_CFLAGS" != x && test "x$PGSQL_CFLAGS" != x/usr/include; then
           CFLAGS="${CFLAGS} -I${PGSQL_CFLAGS}"
        fi
  
***************
*** 1042,1047 ****
--- 1042,1051 ----
  ### --------------------------------------------------------------------------
  ### Makefile creation
  
+ # delete any occurences of -I /usr/include.  Newer gcc's
+ # don't like that at all.
+ CFLAGS="`echo $CFLAGS '' | sed 's_ -I \?/usr/include\( \|$\)__'`"
+ 
  # This is necessary so that .o files in LIBOBJS are also built via
  # the ANSI2KNR-filtering rules.
  LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
diff -c 'gnucash.cvs-orig/rpm/gnucash.spec.in' 'gnucash/rpm/gnucash.spec.in'
Index: ./rpm/gnucash.spec.in
*** ./rpm/gnucash.spec.in	Mon Dec 23 21:50:00 2002
--- ./rpm/gnucash.spec.in	Wed Jan 22 22:55:05 2003
***************
*** 26,31 ****
--- 26,32 ----
  Requires:	g-wrap >= 1.3.4, umb-scheme >= 3.2, gal >= 0.8
  BuildPrereq: 	g-wrap-devel >= 1.3.4, gtkhtml-devel >= 0.8
  BuildPrereq: 	Guppi-devel, gal-devel, libxml-devel
+ BuildPrereq:	GConf-devel
  BuildPrereq: 	libglade-devel, libghttp-devel, python-devel, libtermcap-devel
  BuildPrereq: 	readline-devel
  Prereq: 	/sbin/ldconfig /sbin/install-info
***************
*** 80,85 ****
--- 81,91 ----
  
  LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$RPM_BUILD_ROOT%{_libdir}/gnucash make DESTDIR=$RPM_BUILD_ROOT install
  
+ # Remove dir file, otherwise rpm might complain:
+ #    Installed (but unpackaged) file(s) found:
+ #   /usr/share/info/dir
+ [ "$RPM_BUILD_ROOT" != "/" ] && rm $RPM_BUILD_ROOT%{_infodir}/dir
+ 
  %find_lang %name
  
  %clean
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Wed Jan 22 22:57:13 2003
# Generated by        : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile.am' 4002 1043270010 0100664
# p 'configure.in' 37482 1043270546 0100664
# p 'rpm/gnucash.spec.in' 4124 1043272505 0100664
#### End of ApplyPatch data ####

#### End of Patch kit [created: Wed Jan 22 22:57:13 2003] ####
#### Checksum: 107 3591 1292 ####


BR Håkon Løvdal