Rob Browning's patch to break out g-wrap.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2277 57a11ea4-9604-0410-9ed3-97b8803252fd

ChangeLog

@@ -1,3 +1,19 @@
+2000-05-08  Rob Browning  <rlb@cs.utexas.edu>
+
+	* make-gnucash-patch.in: change gnucash.h to gnucash.c in ignores.
+	Delete src/messages_i18n.h from ignores.
+	Remove g-wrap files from ignores.
+
+	* src/guile/gnucash.c.in: new file (now auto-generated)
+	This and the following change fix a mutual dependency problem.
+
+	* src/guile/gnucash.h: new file (no longer auto-generated).
+
+	* src/Makefile.in (CLEAN_SUBDIRS): add quotes.
+	(all targets): build g-wrap before guile. 
+
+	* Makefile.init.in (VERSION): Added to fix problems with rpm spec, etc.
+
 2000-05-08  Dave Peticolas  <peticola@cs.ucdavis.edu>
 
 	* src/register/pricecell.c: allow the cell to be blanked directly.
@@ -75,6 +91,61 @@
 	(gnc_lconv_set_char): check for the lconv default value using
 	CHAR_MAX, not 127.
 
+2000-05-02  Rob Browning  <rlb@cs.utexas.edu>
+
+	* Makefile.in: switch to sed to handle non-makefile generation.
+
+	* Makefile.init.in: kill PATH mangling.
+	Add DIFF GUILE and g-wrap command handling.
+	
+	* configure.in: Many changes related to the great g-wrap exodus
+        and the change to handle non-makefile with sed.
+	Kill recursive var expansion.
+	Kill prefix pre-expansion.
+        Remove fancy guile handling - presume newer guile (which is required).
+        Remove non-makefiles from AC_OUTPUT (except the locale stuff for now).
+
+	* doc/build-system: Document configure handling of non-makefiles.
+
+	* lib/Makefile.in: expunge g-wrap.
+
+	* make-gnucash-patch.in: use sed @--@ handling for expansions.
+	Be strict.
+	Add ignore for src/messages_i18n.h
+
+	* po/Makefile.in.in: handle extract-macros.perl.in vars with sed.
+
+	* po/extract-macros.perl.in: handle vars with sed.
+
+	* rpm/Makefile.in: new file.  Handle gnucash.spec.in with sed.
+
+	* rpm/gnucash.spec.in: use @--@ vars.
+
+	* src/Makefile.in: handle src/quotes in the build process.
+	Re-order src/guile to build before src/g-wrap.
+	
+	* src/g-wrap/Makefile.in: handle new version of g-wrap.
+
+	* src/gnome/Makefile.in: fix compile var handling for g-wrap, etc.
+
+	* src/guile/Makefile.in: fix compile var handling for g-wrap, etc.
+	Add sed handling for gnucash.h.in.
+
+	* src/guile/gnucash.h.in: handle g-wrap changes.
+	Handle removal of EXPANDED vars.
+	Switch to sed @--@ vars.
+
+	* src/qt/Makefile.in: fix compile var handling for g-wrap, etc.
+
+	* src/quotes/Makefile.in: new file.
+	Handle gnc-prices.in with sed.
+
+	* src/quotes/gnc-prices.in: Switch to sed @--@ vars.
+
+	* src/scm/Makefile.in: Handle bootstrap.scm.in with sed.
+
+	* src/scm/bootstrap.scm.in: Switch to sed @--@ vars.
+
 2000-05-02  Robert Graham Merkel  <rgmerk@mira.net>
 
 	* man/gnc-prices.1: fixed typo.
@@ -356,9 +427,7 @@
 	* src/register/splitreg.c (configLayout): add the xto cell into
 	the transaction cursor.
 
- 2000-03-31  Rob Browning  <rlb@cs.utexas.edu>
+2000-03-31  Rob Browning  <rlb@cs.utexas.edu>
-
- 	* src/scm/bootstrap.scm.in: use new GNC_EXPANDED_ vars.
 
  	* src/scm/Makefile.in: set top_srcdir and include Makefile.init
 

Makefile.in

@@ -51,7 +51,19 @@ motif-static: motif.static
 gnome-static: gnome.static
 qt-static: qt.static
 
-build-flavor: config.status
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.
+make-gnucash-patch: make-gnucash-patch.in
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-PERL-@:${PERL}:g'
+	chmod +x $@.tmp
+	mv $@.tmp $@
+
+build-flavor: config.status make-gnucash-patch
+	@cd rpm     && ${MAKE} default
 	@cd lib     && ${MAKE} ${FLAVOR}
 	@cd src     && ${MAKE} ${FLAVOR}
 	ln -sf gnucash.${FLAVOR} gnucash.bin
@@ -115,7 +127,7 @@ config.status: configure
 		exit 1; \
 	fi
 
-CLEAN_SUBDIRS += lib src po
+CLEAN_SUBDIRS += lib src po rpm
 TRASH += TAGS *~ *.o *.bak
 
 DIST_TRASH += Makefile *~ *.o *.bak share/scm gnucash.bin

Makefile.init.in

@@ -20,8 +20,6 @@
 
 @SET_MAKE@
 
-export PATH := @GUILE_BIN@:@ABSOLUTE_TOP_SRCDIR@/lib/g-wrap-install/bin/:${PATH}
-
 srcdir  = @srcdir@
 VPATH   = @srcdir@
 
@@ -41,6 +39,9 @@ sysconfdir=@sysconfdir@
 includedir=@includedir@
 mandir=@mandir@
 
+VERSION = @VERSION@
+PACKAGE = @PACKAGE@
+
 ABSOLUTE_TOP_SRCDIR=@ABSOLUTE_TOP_SRCDIR@
 
 CC           = @CC@
@@ -54,11 +55,20 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 SWIG         = @SWIG@
 PERL         = @PERL@
+GUILE        = @GUILE@
 
 CPU          = @target_cpu@
 
 OPT_STYLE_INSTALL=@OPT_STYLE_INSTALL@
 
+GUILE_LINK_ARGS = @GUILE_LINK_ARGS@
+GUILE_COMPILE_ARGS = @GUILE_COMPILE_ARGS@
+
+G_WRAP_LINK_ARGS = @G_WRAP_LINK_ARGS@
+G_WRAP_COMPILE_ARGS = @G_WRAP_COMPILE_ARGS@
+
+LOCALE_DIR = @LOCALE_DIR@
+
 # These are *only* to be used at *install* time.
 GNC_DOCDIR=@GNC_DOCDIR@
 GNC_BINDIR=@GNC_BINDIR@

configure.in

@@ -22,7 +22,7 @@
 ### check for various programs, and stuff (do this first because later
 ### commands depend on them):
 
-AC_INIT(src/guile/gnucash.h.in)
+AC_INIT(src/guile/gnucash.h)
 
 AM_INIT_AUTOMAKE(gnucash,1.3.7)
 
@@ -42,35 +42,6 @@ AC_HEADER_STDC
 
 AC_CHECK_FUNCS(stpcpy memcpy)   
 
-
-### --------------------------------------------------------------------------
-### Fix up prefix for recursive expansion
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
-
-### --------------------------------------------------------------------------
-### Useful POSIX shell functions
-###
-
-# This has to be a variable because we need to be able to export it,
-# and POSIX shells AFAIK don't have "export -f"
-
-gnc_recursively_expand_var () {
-
-  # Note that this function will only work for cases where any sign of
-  # a $ means that there is a variable reference that can be expanded.
-  # I.e. it would fail miserably for something like pattern='^bar.*$'.
-
-  local expanded_var=${1}
-  while echo $expanded_var | grep '\$' > /dev/null
-  do
-    expanded_var=`eval echo ${expanded_var}`
-  done
-  echo $expanded_var
-}
-
-
 ### --------------------------------------------------------------------------
 ### Variables
 ### Set up all the initial variable values...
@@ -113,16 +84,12 @@ AC_ARG_WITH( locale-dir,
   LOCALE_DIR="$with_locale_dir",
   LOCALE_DIR="$prefix/share/locale")
 
-GNC_EXPANDED_LOCALE_DIR=`gnc_recursively_expand_var "${LOCALE_DIR}"`
-
 AC_SUBST(LOCALE_DIR)
-AC_SUBST(GNC_EXPANDED_LOCALE_DIR)
 
 # We need the variable below defined for the gettext checks to work
 ac_cv_header_locale_h=yes
 AC_CAN_USE_GNU_GETTEXT
 
-
 ### --------------------------------------------------------------------------
 ## qt-version of gnucash
 # The qt version of gnucash is far from doing anything usefull, so most people
@@ -408,98 +375,73 @@ AC_SUBST(GNOME_TARGET)
 AC_SUBST(GNOME_STATIC_TARGET)
 
 
+### --------------------------------------------------------------------------
+### G-wrap (libraries and executable)
+
+G_WRAP_COMPILE_ARGS=""
+G_WRAP_LINK_ARGS=""
+
+# Find the configure script
+AC_PATH_PROG(G_WRAP_CONFIG,g-wrap-config)
+
+if test -x "${G_WRAP_CONFIG}";
+then
+  # Find out what the g-wrap compile and link flags are.
+  G_WRAP_COMPILE_ARGS=`${G_WRAP_CONFIG} --c-compile-args guile`
+  G_WRAP_LINK_ARGS=`${G_WRAP_CONFIG} --c-static-link-args guile`
+fi
+
+# Find the tool
+AC_PATH_PROG(G_WRAP, g-wrap)
+
+if test x"${G_WRAP_COMPILE_ARGS}" = x || \
+   test x"${G_WRAP_LINK_ARGS}" = x || \
+   ! test -x "${G_WRAP}";
+then
+  AC_MSG_ERROR([
+
+  g-wrap does not appear to be installed.  It must be installed and
+  its binary directory must be in your PATH.  If you need to install
+  g-wrap, you can find it at ftp://ftp.gnucash.org/pub/g-wrap.])
+fi
+
+AC_SUBST(G_WRAP)
+AC_SUBST(G_WRAP_CONFIG)
+AC_SUBST(G_WRAP_COMPILE_ARGS)
+AC_SUBST(G_WRAP_LINK_ARGS)
+
 ### --------------------------------------------------------------------------
 ### Guile (libraries and executable)
 
-# Don't disable this.  It's the only reliable way to detect guile's
+GUILE_COMPILE_ARGS=""
-# settings on current guile installs.  If it doesn't work for you, then
+GUILE_LINK_ARGS=""
-# don't specify --with-guile-config.  (RLB)
 
-# In the long run, --with-guile should go away in favor of
+AC_PATH_PROG(GUILE_CONFIG,guile-config)
-# --with-guile-config.  It might make sense to do this now.  If you have
-# guile 1.3 installed, but don't have guile-config, your install is
-# most likely broken anyway, and should be fixed. (RLB)
 
-# Let the user override the guile-config executable.
+if test -x "${GUILE_CONFIG}";
-AC_ARG_WITH( guile-config, 
+then
-  [  --with-guile-config=executable which guile-config to use to find guile ],
+  # Find out what the guile compile and link flags are.
-  AC_MSG_CHECKING([for guile-config])
+  GUILE_COMPILE_ARGS=`${GUILE_CONFIG} compile`
-  AC_MSG_RESULT([${with_guile_config}])
+  GUILE_LINK_ARGS=`${GUILE_CONFIG} link`
-  GUILE_CONFIG="$with_guile_config"
-  LIBS="`${GUILE_CONFIG} link` ${LIBS}"
-  CFLAGS="$CFLAGS `${GUILE_CONFIG} compile`")
-
-if test x"$GUILE_CONFIG" = x; then
-  # Try to find a default guile-config
-  AC_PATH_PROG(GUILE_CONFIG,guile-config)
 fi
 
-# Still allow the old method (for now).
+# Find the binary
-AC_ARG_WITH( guile, 
+AC_PATH_PROG(GUILE, guile)
-  [  --with-guile=PATH       specify where to look for guile includes and libs],
-  LIBS="-L$with_guile/lib ${LIBS}"  CFLAGS="$CFLAGS -I$with_guile/include")
 
-# You can't have both...
+if test x"${GUILE_COMPILE_ARGS}" = x || \
-if test x"$GUILE_CONFIG" != x && test x"$with_guile" != x ; then
+   test x"${GUILE_LINK_ARGS}" = x || \
-  AC_MSG_ERROR([${GUILE_CONFIG} ================ ${with_guile}])
+   ! test -x "${GUILE}";
-  AC_MSG_ERROR([You cannot specify both --with-guile and --with-guile-config])
+then
+  AC_MSG_ERROR([
+
+  Guile does not appear to be installed.  It must be installed and
+  its binary directory must be in your PATH.])
 fi
 
-if test x"$GUILE_CONFIG" = x; then
+AC_SUBST(GUILE)
-  # If we didn't get GUILE_CONFIG, then do things the old, dumb way.
-
-  # Have to use AC_TRY_LINK here because AC_CHECK_LIB caches the
-  # results, so one failure makes all further attempts fail.
-
-  GNC_LIBS_SAFE=${LIBS}
-  AC_CACHE_CHECK([for guile], ac_cv_lib_guile,    
-    for GNC_TEST_LIBS in "-lguile" "-lguile -ldl" "-lguile -lqthreads" \
-        "-lguile -ltermcap" "-lguile -lqthreads -ltermcap" \
-        "-lguile -lreadline -lncurses"; do
-        if test x"${GUILELIBS}" != x; then
-            ac_cv_lib_guile=${GUILELIBS}
-            break
-        else
-            LIBS="${GNC_TEST_LIBS} ${GNC_LIBS_SAFE}"
-            AC_TRY_LINK([#include<guile/gh.h>], [gh_eval_file;],
-            GUILELIBS="${GNC_TEST_LIBS}")
-        fi
-    done)
-
-  GUILELIBS=${ac_cv_lib_guile}
-else
-  # We did find a suitable guile-config.  Use that.
-  # and use any guile binary in that same directory.
-  GUILE_INC=`${GUILE_CONFIG} compile`
-  GUILELIBS=`${GUILE_CONFIG} link`
-fi
-
-# Find the appropriate guile binary.
-if test x"$GUILE_CONFIG" != x; then
-  AC_PATH_PROG(GUILE_BIN, guile,,`dirname ${GUILE_CONFIG}`)
-fi
-
-# If that didn't work, try the --with-guile directory, if any.
-if test x"$GUILE_BIN" = x && test x"$with_guile" != x; then
-  AC_PATH_PROG(GUILE_BIN, guile,,`${with_guile}/bin`)
-fi
-
-# Final stab at locating a guile binary.
-if test x"${GUILE_BIN}" = x; then     
-  AC_PATH_PROG(GUILE_BIN,guile)
-fi
-
-if test x"${GUILELIBS}" = x || test x"${GUILE_BIN}" = x; then
-  AC_MSG_ERROR([Cannot configure guile bits.  Do you have guile 1.3 installed?])
-fi
-
-# Get just the directory for the guile binary.
-GUILE_BIN=`dirname ${GUILE_BIN}`
-
 AC_SUBST(GUILE_CONFIG)
-AC_SUBST(GUILE_BIN)
+AC_SUBST(GUILE_COMPILE_ARGS)
-AC_SUBST(GUILE_INC)
+AC_SUBST(GUILE_LINK_ARGS)
-AC_SUBST(GUILELIBS)
 
 ### --------------------------------------------------------------------------
 ### Plotutils
@@ -541,10 +483,6 @@ else
   GNC_SHAREDIR='${datadir}/gnucash'
 fi
 
-GNC_EXPANDED_LIBDIR=`gnc_recursively_expand_var "${GNC_LIBDIR}"`
-GNC_EXPANDED_CONFIGDIR=`gnc_recursively_expand_var "${GNC_CONFIGDIR}"`
-GNC_EXPANDED_SHAREDIR=`gnc_recursively_expand_var "${GNC_SHAREDIR}"`
-
 GNC_MANDIR='${mandir}'
 
 AC_SUBST(GNC_DOCDIR)
@@ -553,16 +491,6 @@ AC_SUBST(GNC_LIBDIR)
 AC_SUBST(GNC_CONFIGDIR)
 AC_SUBST(GNC_SHAREDIR)
 AC_SUBST(GNC_MANDIR)
-AC_SUBST(GNC_EXPANDED_LIBDIR)
-AC_SUBST(GNC_EXPANDED_CONFIGDIR)
-AC_SUBST(GNC_EXPANDED_SHAREDIR)
-
-# HACK : inserts the path to gnucash.pm, which is used in the
-# reporting code and is defined in gnucash.h
-
-GNC_EXPANDED_PERLLIBPATH=`gnc_recursively_expand_var "${GNC_LIBDIR}"`
-
-AC_SUBST(GNC_EXPANDED_PERLLIBPATH)
 
 # Get the absolute top level directory.  This is only used to add some
 # ./lib/* paths to PATH for local build binaries like gwrap.  For all
@@ -577,32 +505,31 @@ AC_SUBST(ABSOLUTE_TOP_SRCDIR)
 
 AC_CONFIG_HEADER(config.h)
 
-AC_OUTPUT(Makefile
+AC_OUTPUT(
-          Makefile.init
+          dnl # Makefiles
-          make-gnucash-patch
-          src/Makefile
-          src/engine/Makefile
-          src/guile/Makefile
-          src/guile/gnucash.h
-          src/guile/i18n.h
-          src/scm/Makefile
-          src/scm/bootstrap.scm
-          src/g-wrap/Makefile
-          src/gnome/Makefile
-          src/motif/Makefile
-          src/qt/Makefile
-          src/quotes/gnc-prices
-          src/register/Makefile
-	  src/register/gnome/Makefile
-          src/reports/Makefile
-          src/swig/Makefile
-          src/swig/perl5/Makefile
 	  po/Makefile.in
-	  po/extract-macros.perl
+	  src/register/gnome/Makefile
-          rpm/gnucash.spec
+          Makefile
+          Makefile.init
+          lib/ComboBox-1.33/Makefile
           lib/Makefile
           lib/Xbae-4.6.2-linas/Makefile
           lib/Xbae-4.6.2-linas/src/Makefile
-          lib/ComboBox-1.33/Makefile,
+          rpm/Makefile
-          chmod a+x ./gnucash
+          src/Makefile
-          chmod a+x ./make-gnucash-patch)
+          src/engine/Makefile
+          src/g-wrap/Makefile
+          src/gnome/Makefile
+          src/guile/Makefile
+          src/motif/Makefile
+          src/qt/Makefile
+          src/quotes/Makefile
+          src/register/Makefile
+          src/reports/Makefile
+          src/scm/Makefile
+          src/swig/Makefile
+          src/swig/perl5/Makefile
+          dnl # non-makefiles
+          dnl # Please read doc/build-system before adding *anything* here
+          ,
+          chmod a+x ./gnucash)

doc/build-system

@@ -1,5 +1,66 @@
 -*-text-*-
 
+===========================================================================
+* Adding files to AC_OUTPUT in configure.in.
+
+Please do not add any non-makefiles to AC_OUTPUT unless you're
+*absolutely* sure that it's safe and necessary to do so.  If you're
+not sure, then please use the "generation with sed by hand approach"
+that we use for other non-makefiles like src/scm/bootstrap.scm.  See
+src/scm/bootstrap.scm.in and src/scm/Makefile.in for details.
+
+The reasoning behind this is that there are often variables that
+autoconf uses and replaces via the @@ mechanism that are recursively
+defined in terms of other variables.  For example, @datadir@ might
+expand into $prefix/share, which itself contains an unexpanded
+variable.  Unless the @datadir@ replacement is performed on a file
+that will eventually be processed by make, there's no guarantee that
+the variable will *ever* be fully expanded and then your code will
+break.
+
+To get around this, we handle all non-makefiles (with a few notable
+exceptions) manually with sed.  For example, we have
+src/scm/bootstrap.scm.in which is processed in src/scm/Makefile.in
+according to the following rule:
+
+  ## We borrow guile's convention and use @-...-@ as the substitution
+  ## brackets here, instead of the usual @...@.  This prevents autoconf
+  ## from substituting the values directly into the left-hand sides of
+  ## the sed substitutions.  *sigh*
+  bootstrap.scm: bootstrap.scm.in
+        rm -f $@.tmp
+        sed < $@.in > $@.tmp \
+            -e 's:@-VERSION-@:${VERSION}:g' \
+            -e 's:@-GNC_CONFIGDIR-@:${GNC_SHAREDIR}:g' \
+            -e 's:@-GNC_SHAREDIR-@:${GNC_CONFIGDIR}:g'
+        chmod +x $@.tmp
+        mv $@.tmp $@
+
+This approach guarantees that the variables referred to will be
+properly expanded at the right times.
+
+The only non-Makefiles files that must be handled directly by
+AC_OUTPUT are files that refer to variables that, when expanded, may
+have makefile-hostile characters like '#' in them like
+INCLUDE_LOCALE_H.  These may need to be replaced directly in the
+relevant file via AC_OUTPUT since going through a makefile would break
+the makefile when it interprets the '#' as the beginning of a comment.
+You'd have something like this:
+
+  FOO = "#include <locale.h>"
+
+If you end up in a situation where you need to refer to both these
+makefile-hostile variables and non-makefile hostile variables in the
+same file, please restructure things (breaking the file up if
+necessary) so that only the makefile hostile variables are in the
+files being handled by AC_OUTPUT directly.
+
+===========================================================================
+
+It is not safe to use $prefix in configure.in for anything other than
+an unexpanded reference.  If the user doesn't specify a --prefix, then
+it'll be set to NONE until the end of the configure process.
+
 ===========================================================================
 
 Deleting .SUFFIX rules

lib/Makefile.in

@@ -32,7 +32,7 @@ include @top_srcdir@/Makefile.init
 
 ######################################################################
 # See Makefile.common for information about these variables.
-CLEAN_SUBDIRS := ComboBox-1.33 Xbae-4.6.2-linas g-wrap
+CLEAN_SUBDIRS := ComboBox-1.33 Xbae-4.6.2-linas
 ######################################################################
 
 all:
@@ -47,28 +47,11 @@ all:
 # definitions of *_SRCS, etc., but before the usage of *_OBJS.
 include @top_srcdir@/Makefile.common
 
-
+motif motif.static:
-# Right now we only configure g-wrap once per make distclean, but we
-# try and re-build every make.
-g-wrap.configure:
-	(cd g-wrap && \
-	 ./configure --prefix=${ABSOLUTE_TOP_SRCDIR}/lib/g-wrap-install)
-	touch g-wrap.configure
-DIST_TRASH += g-wrap.configure
-
-g-wrap-install: g-wrap.configure
-	(cd g-wrap && ${MAKE})
-	(cd g-wrap && ${MAKE} install)
-TRASH += g-wrap-install
-
-.PHONY: g-wrap-install
-
-
-motif motif.static: g-wrap-install
 	@cd ComboBox-1.33;    $(MAKE) default
 	@cd Xbae-4.6.2-linas; $(MAKE) default
 
-gnome gnome.static: g-wrap-install
+gnome gnome.static:
 
 qt qt.static: g-wrap-install
 

make-gnucash-patch.in

@@ -1,4 +1,4 @@
-#!@PERL@
+#!@-PERL-@ -w
 #
 # This perl script is used to make a patch for your GnuCash
 # development work. All patches should be submitted to the
@@ -10,6 +10,7 @@
 #
 # Author: Dave Peticolas <peticola@cs.ucdavis.edu>
 
+use strict;
 
 ###########################################################
 # This section must be configured for your own setup.     #
@@ -122,7 +123,7 @@ gnc-autogen.h
 src/g-wrap/gnc.c
 src/g-wrap/gnc.h
 src/g-wrap/gnc.html
-src/guile/gnucash.h
+src/guile/gnucash.c
 src/scm/bootstrap.scm
 src/swig/perl5/gnucash.engine_wrap.doc
 g-wrap.info
@@ -144,12 +145,6 @@ gnucash.pot
 po/pseudo-source.c
 stamp-cat-id
 po/extract-macros.perl
-include/messages_i18n.h
-lib/g-wrap/aclocal.m4
-lib/g-wrap/conf-h.in
-lib/g-wrap/stamp-h.in
-lib/g-wrap/*/Makefile.in
 src/guile/i18n.h
 make-gnucash-patch
-lib/g-wrap.configure
 rpm/gnucash.spec

po/Makefile.in.in

@@ -1,3 +1,4 @@
+# -*-makefile-*-
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995 Free Software Foundation, Inc.
 #
@@ -18,6 +19,8 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
+PERL = @PERL@
+
 SHELL = /bin/sh
 @SET_MAKE@
 
@@ -91,7 +94,20 @@ $(PACKAGE).pot: pseudo-source.c $(POTFILES)
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
 	        && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
 
-pseudo-source.c: $(top_srcdir)/src/messages_i18n.h
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.  *sigh*
+extract-macros.perl: extract-macros.perl.in
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-PACKAGE-@:${PACKAGE}:g' \
+            -e 's:@-PERL-@:${PERL}:g' \
+            -e 's:@-CPP-@:${CPP}:g'
+	chmod +x $@.tmp
+	mv $@.tmp $@
+
+pseudo-source.c: $(top_srcdir)/src/messages_i18n.h extract-macros.perl
 	perl -s extract-macros.perl $< > $@
 
 install: install-exec install-data

po/extract-macros.perl.in

@@ -1,4 +1,4 @@
-#! /usr/bin/perl -s
+#!@-PERL-@ -w -s
 #
 # extract-macros.perl.in - Generate C file for input to xgettext
 # Copyright (C) 1999 Laurent Pélecq
@@ -23,8 +23,8 @@
 
 # Begin variables set by configure
 
-$package_name="@PACKAGE@";
+$package_name="@-PACKAGE-@";
-$cpp="@CPP@";
+$cpp="@-CPP-@";
 
 # End variables set by configure
 

rpm/.cvsignore

@@ -1 +1,2 @@
+Makefile
 gnucash.spec

rpm/Makefile.in

@@ -0,0 +1,46 @@
+# Makefile -- makefile for ./rpm
+# Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>              
+#                                                                  
+# This program is free software; you can redistribute it and/or    
+# modify it under the terms of the GNU General Public License as   
+# published by the Free Software Foundation; either version 2 of   
+# the License, or (at your option) any later version.              
+#                                                                  
+# This program is distributed in the hope that it will be useful,  
+# but WITHOUT ANY WARRANTY; without even the implied warranty of   
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
+# GNU General Public License for more details.                     
+#                                                                  
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software      
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        
+
+top_srcdir = @top_srcdir@
+
+include ${top_srcdir}/Makefile.init
+
+######################################################################
+# See Makefile.common for information about these variables.
+#
+# CLEAN_SUBDIRS := 
+######################################################################
+
+all: default
+
+# This inclusion must come after the first target, and after the
+# definitions of *_SRCS, etc., but before the usage of *_OBJS.
+include @top_srcdir@/Makefile.common
+
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.  *sigh*
+gnucash.spec: gnucash.spec.in Makefile
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-VERSION-@:${VERSION}:'
+	mv $@.tmp $@
+
+default: gnucash.spec
+
+.PHONY: default

rpm/gnucash.spec.in

@@ -1,6 +1,6 @@
 Name: gnucash
 Summary: GnuCash is an application to keep track of your finances.
-Version: @VERSION@
+Version: @-VERSION-@
 Release: 1
 Copyright: Free Software Foundation
 Group: Applications/Finance

src/Makefile.in

@@ -37,7 +37,8 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH} ${CPPFLAGS}
 ######################################################################
 # See Makefile.common for information about these variables.
 COMMON_SRCS   := MultiLedger.c SplitLedger.c Destroy.c EuroUtils.c
-CLEAN_SUBDIRS := engine gnome motif register g-wrap guile reports swig qt scm
+CLEAN_SUBDIRS := engine gnome motif register g-wrap guile reports
+CLEAN_SUBDIRS += swig qt scm quotes
 MOTIF_SRCS := FileDialog.c Refresh.c
 GNOME_SRCS := FileDialog.c Refresh.c
 ######################################################################
@@ -51,33 +52,36 @@ include @top_srcdir@/Makefile.common
 default: $(OBJS)
 
 motif motif.static: ${MOTIF_OBJS}
+	@cd quotes          && $(MAKE) default
 	@cd scm             && $(MAKE) default
 	@cd engine          && $(MAKE) default
 	@cd register        && $(MAKE) motif
 	@cd reports         && $(MAKE) default
 	@cd g-wrap          && $(MAKE) motif
-	@cd swig            && $(MAKE) motif
 	@cd guile           && $(MAKE) default
+	@cd swig            && $(MAKE) motif
 	@cd motif           && $(MAKE) $@
 
 gnome gnome.static: ${GNOME_OBJS}
+	@cd quotes          && $(MAKE) default
 	@cd scm             && $(MAKE) default
 	@cd engine          && $(MAKE) default
 	@cd register        && $(MAKE) gnome
 	@cd reports         && $(MAKE) default
 	@cd g-wrap          && $(MAKE) gnome
-	@cd swig            && $(MAKE) gnome
 	@cd guile           && $(MAKE) default
+	@cd swig            && $(MAKE) gnome
 	@cd gnome           && $(MAKE) $@
 
 qt qt.static: $(QT_OBJS)
+	@cd quotes          && $(MAKE) default
 	@cd scm             && $(MAKE) default
 	@cd engine          && $(MAKE) default
 	@cd register        && $(MAKE) qt
 	@cd reports         && $(MAKE) default
 	@cd g-wrap          && $(MAKE) qt
-	@cd swig            && $(MAKE) qt
 	@cd guile           && $(MAKE) default 	
+	@cd swig            && $(MAKE) qt
 	@cd qt              && $(MAKE) $@
 
 .PHONY: default qt qt.static gnome gnome.static motif motif.static all

src/gnome/Makefile.in

@@ -35,13 +35,13 @@ INCLPATH := -I.. \
 	    -I@top_srcdir@/src/register/gnome 
 
 # All the other GNOME CFLAGS are handled in Makefile.common now
-CFLAGS   = @CFLAGS@ ${INCLPATH}
+CFLAGS   = @CFLAGS@ ${INCLPATH} ${GUILE_COMPILE_ARGS} ${G_WRAP_COMPILE_ARGS}
 LDFLAGS  = @LDFLAGS@
 
-GUILELIBS = @GUILELIBS@
+LIBS     = -L$(prefix)/lib @LIBS@ \
-LIBS      = -L$(prefix)/lib @LIBS@ \
+            $(shell ${GNOME_CONFIG_BIN} --libs gnomeui print @GTK_XMHTML@) \
-            $(shell ${GNOME_CONFIG_BIN} --libs gnomeui print @GTK_XMHTML@) $(GUILELIBS) \
+            $(GUILE_LINK_ARGS) \
-            @top_srcdir@/lib/g-wrap-install/lib/libgwrapguile.a
+            $(G_WRAP_LINK_ARGS)
 
 ifeq (${HAVE_PLOTUTILS},1)
   LIBS += @PLOTUTILS_LIBS@

src/quotes/.cvsignore

@@ -1 +1,2 @@
+Makefile
 gnc-prices

src/quotes/Makefile.in

@@ -0,0 +1,48 @@
+# Makefile -- makefile for src/quotes
+# Copyright (C) 2000 Rob Browning <rlb@cs.utexas.edu>              
+#                                                                  
+# This program is free software; you can redistribute it and/or    
+# modify it under the terms of the GNU General Public License as   
+# published by the Free Software Foundation; either version 2 of   
+# the License, or (at your option) any later version.              
+#                                                                  
+# This program is distributed in the hope that it will be useful,  
+# but WITHOUT ANY WARRANTY; without even the implied warranty of   
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    
+# GNU General Public License for more details.                     
+#                                                                  
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software      
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        
+
+top_srcdir = @top_srcdir@
+
+include ${top_srcdir}/Makefile.init
+
+######################################################################
+# See Makefile.common for information about these variables.
+#
+# CLEAN_SUBDIRS := 
+######################################################################
+
+all: default
+
+# This inclusion must come after the first target, and after the
+# definitions of *_SRCS, etc., but before the usage of *_OBJS.
+include @top_srcdir@/Makefile.common
+
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.
+gnc-prices: gnc-prices.in
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-PERL-@:${PERL}:g' \
+            -e 's:@-GNC_LIBDIR-@:${GNC_LIBDIR}:g'
+	chmod +x $@.tmp
+	mv $@.tmp $@
+
+default: gnc-prices
+
+.PHONY: default

src/quotes/gnc-prices.in

@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!@-PERL-@ -w
 #
 # FILE:
 # gnc-prices
@@ -13,7 +13,7 @@
 
 # hack alert -- this pathname should *NOT* be hard-coded, nor should the
 #               ones below it.
-use lib '@GNC_EXPANDED_LIBDIR@';
+use lib '@-GNC_LIBDIR-@';
 use Quote;
 use gnucash;
 

src/scm/Makefile.in

@@ -31,7 +31,18 @@ all: default
 # definitions of *_SRCS, etc., but before the usage of *_OBJS.
 include @top_srcdir@/Makefile.common
 
-default:
+## We borrow guile's convention and use @-...-@ as the substitution
-	@echo Nothing to do.
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.  *sigh*
+bootstrap.scm: bootstrap.scm.in Makefile
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-VERSION-@:${VERSION}:' \
+            -e 's:@-GNC_CONFIGDIR-@:${GNC_CONFIGDIR}:' \
+            -e 's:@-GNC_SHAREDIR-@:${GNC_SHAREDIR}:'
+	mv $@.tmp $@
+
+default: bootstrap.scm
 
 .PHONY: default

src/scm/bootstrap.scm.in

@@ -74,9 +74,9 @@
       (primitive-load boot-file)))
 
 ;; Automatically generated defaults
-(define gnc:_config-dir-default_ "@GNC_EXPANDED_CONFIGDIR@")
+(define gnc:_config-dir-default_ "@-GNC_CONFIGDIR-@")
-(define gnc:_share-dir-default_ "@GNC_EXPANDED_SHAREDIR@")
+(define gnc:_share-dir-default_ "@-GNC_SHAREDIR-@")
-(define gnc:version "@VERSION@")
+(define gnc:version "@-VERSION-@")
 
 ;; These will be converted to config vars later (see prefs.scm)
 (define gnc:*load-path* #f)