get make dist working again

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

ChangeLog

@@ -1,3 +1,10 @@
+2005-11-03  Neil Williams <linux@codehelp.co.uk>
+
+	* Various Makefile.am : Remove .cvsignore from
+	EXTRA_DIST to allow make dist to complete again.
+	* various directories : set svn.ignore for symlinks
+	created during the build.
+
 2005-11-03  Neil Williams <linux@codehelp.co.uk>
 
 	* src/gnome-utils/test/Makefile.am : Tweak trunk

accounts/C/Makefile.am

@@ -36,5 +36,4 @@ EXTRA_DIST = \
   acctlist_retiremt.gnucash-xea \
   acctlist_spouseinc.gnucash-xea \
   acctlist_spouseretire.gnucash-xea \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA} 

accounts/Makefile.am

@@ -1,5 +1,3 @@
 
 SUBDIRS = C da de_CH de_DE el_GR es_ES fr_FR hu_HU it pt_BR pt_PT sk tr_TR
 
-EXTRA_DIST = \
-  .cvsignore

accounts/da/Makefile.am

@@ -8,5 +8,4 @@ account_DATA = \
   acctchrt_homeown.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/de_CH/Makefile.am

@@ -10,5 +10,4 @@ account_DATA = \
   acctchrt_chkmu.gnucash-xea 
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/de_DE/Makefile.am

@@ -18,5 +18,4 @@ account_DATA = \
 EXTRA_DIST = \
   ${account_DATA} \
   acctlist_full.gnucash \
-  acctchrt_full.gnucash-xea \
-  .cvsignore
+  acctchrt_full.gnucash-xea 

accounts/el_GR/Makefile.am

@@ -7,5 +7,4 @@ account_DATA = \
   acctchrt_brokerage.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/es_ES/Makefile.am

@@ -19,6 +19,5 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}
 

accounts/fr_FR/Makefile.am

@@ -19,5 +19,4 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/hu_HU/Makefile.am

@@ -20,5 +20,4 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/it/Makefile.am

@@ -18,5 +18,4 @@ account_DATA = \
 
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/pt_BR/Makefile.am

@@ -19,5 +19,4 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/pt_PT/Makefile.am

@@ -18,5 +18,4 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/sk/Makefile.am

@@ -19,5 +19,4 @@ account_DATA = \
   acctchrt_spouseretire.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

accounts/tr_TR/Makefile.am

@@ -12,5 +12,4 @@ account_DATA = \
  acctchrt_TEKDUZ.gnucash-xea
 
 EXTRA_DIST = \
-  ${account_DATA} \
-  .cvsignore
+  ${account_DATA}

configure.in

@@ -403,21 +403,21 @@ if test pkg-config = no; then
 fi
 AC_MSG_CHECKING([for QOF, version >= $QOF_REQUIRED])
 if test "$withval" != "yes"; then
-        QOF=`$PKG_CONFIG --exists '$withval/lib/pkgconfig/qof-1.pc >= $QOF_REQUIRED'`
-        QOF_LIBS=`$PKG_CONFIG --libs $withval/lib/pkgconfig/qof-1.pc`
-        QOF_CFLAGS=`$PKG_CONFIG --cflags $withval/lib/pkgconfig/qof-1.pc`
-        QOF_VERSION=`$PKG_CONFIG --modversion $withval/lib/pkgconfig/qof-1.pc`
-        QOF_PREFIX=`$PKG_CONFIG --variable=prefix $withval/lib/pkgconfig/qof-1.pc`
-        QOF_LIB_DIR=`$PKG_CONFIG --variable=libdir $withval/lib/pkgconfig/qof-1.pc`
-        QOF_XML_DIR=`$PKG_CONFIG --variable=xmldir $withval/lib/pkgconfig/qof-1.pc`
+        QOF=`$PKG_CONFIG --silence-errors --exists '$withval/lib/pkgconfig/qof-1.pc >= $QOF_REQUIRED'`
+        QOF_LIBS=`$PKG_CONFIG --silence-errors --libs $withval/lib/pkgconfig/qof-1.pc`
+        QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags $withval/lib/pkgconfig/qof-1.pc`
+        QOF_VERSION=`$PKG_CONFIG --silence-errors --modversion $withval/lib/pkgconfig/qof-1.pc`
+        QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix $withval/lib/pkgconfig/qof-1.pc`
+        QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir $withval/lib/pkgconfig/qof-1.pc`
+        QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir $withval/lib/pkgconfig/qof-1.pc`
 else
-        QOF=`$PKG_CONFIG --exists 'qof-1 >= $QOF_REQUIRED'`
-        QOF_LIBS=`$PKG_CONFIG --libs qof-1`
-        QOF_CFLAGS=`$PKG_CONFIG --cflags qof-1`
-        QOF_VERSION=`$PKG_CONFIG --modversion qof-1`
-        QOF_PREFIX=`$PKG_CONFIG --variable=prefix qof-1`
-        QOF_LIB_DIR=`$PKG_CONFIG --variable=libdir qof-1`
-        QOF_XML_DIR=`$PKG_CONFIG --variable=xmldir qof-1`
+        QOF=`$PKG_CONFIG --silence-errors --exists 'qof-1 >= $QOF_REQUIRED'`
+        QOF_LIBS=`$PKG_CONFIG --silence-errors --libs qof-1`
+        QOF_CFLAGS=`$PKG_CONFIG --silence-errors --cflags qof-1`
+        QOF_VERSION=`$PKG_CONFIG --silence-errors --modversion qof-1`
+        QOF_PREFIX=`$PKG_CONFIG --silence-errors --variable=prefix qof-1`
+        QOF_LIB_DIR=`$PKG_CONFIG --silence-errors --variable=libdir qof-1`
+        QOF_XML_DIR=`$PKG_CONFIG --silence-errors --variable=xmldir qof-1`
 fi
 if test x$QOF_XML_DIR = x; then
         AC_MSG_RESULT([no, will use internal QOF code])
@@ -436,7 +436,7 @@ else
         AC_MSG_RESULT([yes])
 fi
 AM_CONDITIONAL(USE_LIBQOF, [test x$HAVE_LIBQOF != x])
-AM_CONDITIONAL(USE_LIBQOF, [test $HAVE_LIBQOF = "use_internal"])
+AM_CONDITIONAL(USE_LIBQOF, [test "$HAVE_LIBQOF" = "use_internal"])
 AC_SUBST(USE_LIBQOF)
 AC_SUBST(QOF_CFLAGS)
 AC_SUBST(QOF_LIBS)
@@ -463,6 +463,11 @@ AC_SUBST(LIBGOFFICE_LIBS)
 
 if test x"$LIBGOFFICE_LIBS" = x; then
   AC_MSG_RESULT([No, GOffice not found, will build using internal goffice library.])
+  if test x"$LIBGSF_LIBS" != x; then
+    AC_MSG_NOTICE([Sorry, the internal goffice code cannot build with libgsf >= $GSF_REQUIRED.])
+    AC_MSG_ERROR([Please either install goffice or downgrade libgsf to earlier than $GSF_REQUIRED])
+    exit 1
+  fi
 else
   AC_MSG_RESULT([Yes, using GOffice])
   AC_DEFINE(HAVE_GOFFICE,,[We have found an external GOffice])

doc/Makefile.am

@@ -15,7 +15,6 @@ tipsdir = $(GNC_SHAREDIR)
 tips_DATA = tip_of_the_day.list
 
 EXTRA_DIST = \
-  .cvsignore \
   ${doc_DATA} \
   RAW-NOTES \
   README.build-system \

doc/examples/Makefile.am

@@ -29,5 +29,4 @@ doc_DATA = \
   xfer.xac
 
 EXTRA_DIST = \
-  .cvsignore \
   ${doc_DATA}

intl-scm/Makefile.am

@@ -1,5 +1,4 @@
 EXTRA_DIST = \
-  .cvsignore \
   guile-strings.c \
   xgettext.scm
 

lib/srfi/Makefile.am

@@ -5,7 +5,6 @@ gncscm_DATA = @GNC_ADD_ON_SRFIS@
 
 EXTRA_DIST = \
   README \
-  .cvsignore \
   srfi-1.scm \
   srfi-2.scm \
   srfi-8.scm \

ltmain.sh

@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.16
-TIMESTAMP=" (1.1220.2.235 2005/04/25 18:13:26)"
+VERSION="1.5.20 Debian 1.5.20-2"
+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
 
 # See if we are running on zsh, and set the options which allow our
 # commands through without removal of \ escapes.
@@ -88,14 +88,15 @@ rm="rm -f"
 Xsed="${SED}"' -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 # test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
   ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
   ;;
 esac
 
@@ -133,7 +134,6 @@ show_help=
 execute_dlfiles=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
-quote_scanset='[[~#^*{};<>?'"'"' 	]'
 
 #####################################
 # Shell function definitions:
@@ -192,7 +192,7 @@ func_infer_tag ()
       CC_quoted=
       for arg in $CC; do
 	case $arg in
-	  *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	  arg="\"$arg\""
 	  ;;
 	esac
@@ -213,7 +213,7 @@ func_infer_tag ()
 	    for arg in $CC; do
 	    # Double-quote args containing other shell metacharacters.
 	    case $arg in
-	      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	      arg="\"$arg\""
 	      ;;
 	    esac
@@ -337,7 +337,7 @@ func_extract_archives ()
  	    func_extract_an_archive "$my_xdir" "$my_xabs"
 	  fi # $darwin_arches
 	fi # $run
-      ;;
+	;;
       *)
         func_extract_an_archive "$my_xdir" "$my_xabs"
         ;;
@@ -576,7 +576,7 @@ if test -z "$show_help"; then
 
     for arg
     do
-      case "$arg_mode" in
+      case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
 	lastarg="$arg"
@@ -627,7 +627,7 @@ if test -z "$show_help"; then
 	    # Many Bourne shells cannot handle close brackets correctly
 	    # in scan sets, so we specify it separately.
 	    case $arg in
-	      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	      arg="\"$arg\""
 	      ;;
 	    esac
@@ -662,7 +662,7 @@ if test -z "$show_help"; then
       # in scan sets (worked around with variable expansion),
       # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
       # at all, so we specify them separately.
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	lastarg="\"$lastarg\""
 	;;
       esac
@@ -737,13 +737,12 @@ if test -z "$show_help"; then
 
     qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
     case $qlibobj in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	qlibobj="\"$qlibobj\"" ;;
     esac
-    if test "X$libobj" != "X$qlibobj"; then
-	$echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-	exit $EXIT_FAILURE
-    fi
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then
@@ -824,7 +823,7 @@ compiler."
     fi
     qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
     case $qsrcfile in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
       qsrcfile="\"$qsrcfile\"" ;;
     esac
 
@@ -1111,7 +1110,7 @@ EOF
       arg="$1"
       shift
       case $arg in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
 	;;
       *) qarg=$arg ;;
@@ -1357,6 +1356,8 @@ EOF
 	  ;;
         darwin_framework)
 	  compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
 	  prev=
 	  continue
 	  ;;
@@ -1418,9 +1419,11 @@ EOF
 	continue
 	;;
 
-      -framework)
+      -framework|-arch)
         prev=darwin_framework
         compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
         continue
         ;;
 
@@ -1539,7 +1542,7 @@ EOF
 	# to be aesthetically quoted because they are evaled later.
 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 	case $arg in
-	*$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	  arg="\"$arg\""
 	  ;;
 	esac
@@ -1655,7 +1658,7 @@ EOF
 	for flag in $args; do
 	  IFS="$save_ifs"
 	  case $flag in
-	    *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	    flag="\"$flag\""
 	    ;;
 	  esac
@@ -1673,7 +1676,7 @@ EOF
 	for flag in $args; do
 	  IFS="$save_ifs"
 	  case $flag in
-	    *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	    flag="\"$flag\""
 	    ;;
 	  esac
@@ -1706,7 +1709,7 @@ EOF
 	# to be aesthetically quoted because they are evaled later.
 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 	case $arg in
-	*$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	  arg="\"$arg\""
 	  ;;
 	esac
@@ -1840,7 +1843,7 @@ EOF
 	# to be aesthetically quoted because they are evaled later.
 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 	case $arg in
-	*$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	  arg="\"$arg\""
 	  ;;
 	esac
@@ -1990,7 +1993,10 @@ EOF
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -2405,7 +2411,7 @@ EOF
 	      case "$temp_rpath " in
 	      *" $dir "*) ;;
 	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
 	      esac
 	    fi
 
@@ -2591,7 +2597,7 @@ EOF
 		add_dir="-L$dir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
+		  case $libdir in
 		    [\\/]*)
 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		      ;;
@@ -2664,7 +2670,7 @@ EOF
 	      add_dir="-L$libdir"
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
+		case $libdir in
 		  [\\/]*)
 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		    ;;
@@ -2725,8 +2731,6 @@ EOF
 	      fi
 	    fi
 	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
 	    deplibs="$dir/$old_library $deplibs"
 	    link_static=yes
 	  fi
@@ -3103,6 +3107,11 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -3416,7 +3425,7 @@ EOF
 	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3453,7 +3462,7 @@ EOF
 	    # Error occurred in the first compile.  Let's try to salvage
 	    # the situation: Compile a separate program for each library.
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
@@ -3505,7 +3514,7 @@ EOF
 	  set dummy $deplibs_check_method
 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
             if test "$name" != "" && test  "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3574,7 +3583,7 @@ EOF
 	  set dummy $deplibs_check_method
 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
 	    if test -n "$name" && test "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3815,6 +3824,9 @@ EOF
 	        # The command line is too long to execute in one step.
 	        $show "using reloadable object file for export list..."
 	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
 	      fi
 	    done
 	    IFS="$save_ifs"
@@ -3884,7 +3896,8 @@ EOF
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
@@ -3919,7 +3932,7 @@ EOF
 	  do
 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
 	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 		 test "$len" -le "$max_cmd_len"; }; then
 	      objlist="$objlist $obj"
 	    else
@@ -4009,13 +4022,30 @@ EOF
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
 	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
+	  $run eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
+
+	    exit $lt_exit
+	  }
 	done
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
+
 	  exit $EXIT_SUCCESS
 	fi
 
@@ -4360,7 +4390,7 @@ extern \"C\" {
 	    if test -z "$export_symbols"; then
 	      export_symbols="$output_objdir/$outputname.exp"
 	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	    else
 	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
@@ -4762,6 +4792,7 @@ EOF
 EOF
 
 	    cat >> $cwrappersource <<"EOF"
+  return 127;
 }
 
 void *
@@ -5025,13 +5056,13 @@ else
 	# Backslashes separate directories on plain windows
 	*-*-mingw | *-*-os2*)
 	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
 	  ;;
 
 	*)
 	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
 "
 	  ;;
 	esac
@@ -5041,7 +5072,7 @@ else
     fi
   else
     # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
     exit $EXIT_FAILURE
@@ -5164,7 +5195,7 @@ fi\
 	    oldobjs="$objlist $obj"
 	    objlist="$objlist $obj"
 	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	       test "$len" -le "$max_cmd_len"; then
 	      :
 	    else
@@ -5361,11 +5392,11 @@ relink_command=\"$relink_command\""
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+       $echo "X$nonopt" | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5374,14 +5405,14 @@ relink_command=\"$relink_command\""
       shift
     else
       install_prog=
-      arg="$nonopt"
+      arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
     case $arg in
-    *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
       arg="\"$arg\""
       ;;
     esac
@@ -5399,28 +5430,31 @@ relink_command=\"$relink_command\""
     do
       if test -n "$dest"; then
 	files="$files $dest"
-	dest="$arg"
+	dest=$arg
 	continue
       fi
 
       case $arg in
       -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
       -s)
 	stripme=" -s"
 	continue
 	;;
-      -*) ;;
-
+      -*)
+	;;
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
 	  prev=
 	else
-	  dest="$arg"
+	  dest=$arg
 	  continue
 	fi
 	;;
@@ -5429,7 +5463,7 @@ relink_command=\"$relink_command\""
       # Aesthetically quote the argument.
       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5598,11 +5632,14 @@ relink_command=\"$relink_command\""
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
 	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
 	      fi
 	    done
 	  fi
@@ -5615,7 +5652,16 @@ relink_command=\"$relink_command\""
 	    IFS="$save_ifs"
 	    eval cmd=\"$cmd\"
 	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
 	  done
 	  IFS="$save_ifs"
 	fi
@@ -5709,17 +5755,15 @@ relink_command=\"$relink_command\""
 	  notinst_deplibs=
 	  relink_command=
 
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  # Check the variables that should have been set.
@@ -5747,17 +5791,15 @@ relink_command=\"$relink_command\""
 	  done
 
 	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  outputname=
@@ -5798,7 +5840,7 @@ relink_command=\"$relink_command\""
 	fi
 
 	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
+	# one anyway 
 	case $install_prog,$host in
 	*/usr/bin/install*,*cygwin*)
 	  case $file:$destfile in

po/ChangeLog

@@ -0,0 +1,4 @@
+2005-11-03  Neil Williams <linux@codehelp.co.uk>
+
+	* po/ChangeLog : Add ChangeLog for translations.
+

rpm/Makefile.am

@@ -1,6 +1,5 @@
 
 EXTRA_DIST = \
-  .cvsignore \
   gnucash.spec.in \
   gnucash.spec
 

src/Makefile.am

@@ -40,7 +40,6 @@ noinst_HEADERS = \
 bin_SCRIPTS = gnc-test-env
 
 EXTRA_DIST = \
-  .cvsignore \
   README.modules \
   gnc-test-env \
   valgrind-gnucash.supp \

src/app-utils/Makefile.am

@@ -100,7 +100,6 @@ gwmod_DATA = gw-app-utils.scm gw-app-utils-spec.scm
 noinst_DATA = .scm-links
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncmod_DATA} \
   ${gncscm_DATA} \
   ${gwmod_DATA} \

src/backend/postgres/Makefile.am

@@ -57,7 +57,6 @@ noinst_HEADERS = \
   newtables.h
 
 EXTRA_DIST = \
-  .cvsignore \
   README \
   design.txt \
   functions.sql \

src/backend/rpc/Makefile.am

@@ -38,7 +38,6 @@ RPCGEN_FILES = \
   gncRpc_svc.c
 
 EXTRA_DIST = \
-  .cvsignore \
   README \
   gncRpc_server_stubs.c \
   $(RPCGEN_SRCS)

src/bin/Makefile.am

@@ -25,7 +25,7 @@ bin_SCRIPTS = ${gnc_common_scripts} update-gnucash-gconf
 # if you change gncoverridedir, make sure you change ./overrides/Makefile.am too.
 gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
 
-EXTRA_DIST = .cvsignore generate-gnc-script update-gnucash-gconf.in
+EXTRA_DIST = generate-gnc-script update-gnucash-gconf.in
 
 ## Gnucash scripts -- real code is in overrides, these just get you there.
 ${gnc_common_scripts}: generate-gnc-script

src/bin/overrides/Makefile.am

@@ -8,7 +8,6 @@ gncoverrides_SCRIPTS = \
   guile
 
 EXTRA_DIST = \
-  .cvsignore \
   gnucash \
   gnucash-env.in \
   gnucash-build-env.in \

src/business/business-core/Makefile.am

@@ -78,7 +78,6 @@ gwmod_DATA = \
   gw-business-core-spec.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncmod_DATA} \
   ${gwmod_DATA}
 

src/business/business-gnome/Makefile.am

@@ -96,7 +96,6 @@ gwmod_DATA = \
   gw-business-gnome-spec.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncmod_DATA} \
   ${gwmod_DATA} \
   ${gncscmmod_DATA}

src/business/business-gnome/glade/Makefile.am

@@ -12,5 +12,4 @@ glade_DATA = \
   vendor.glade
 
 EXTRA_DIST = \
-  .cvsignore \
   ${glade_DATA}

src/business/business-reports/Makefile.am

@@ -18,7 +18,6 @@ gncscmmod_DATA = \
    owner-report.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncscmmod_DATA}
 
 CLEANFILES = gnucash report .scm-links

src/business/business-utils/Makefile.am

@@ -36,7 +36,6 @@ gncscm_DATA = \
   business-prefs.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncscm_DATA} \
   ${gncmod_DATA}
 

src/business/dialog-tax-table/Makefile.am

@@ -54,7 +54,6 @@ gladedir = $(GNC_GLADE_DIR)
 glade_DATA = tax-tables.glade
 
 EXTRA_DIST = \
-  .cvsignore \
   ${glade_DATA} \
   ${gwmod_DATA} \
   ${gncmod_DATA}

src/calculation/Makefile.am

@@ -18,7 +18,6 @@ noinst_HEADERS = \
   fin_static_proto.h
 
 EXTRA_DIST = \
-  .cvsignore \
   README \
   amort_opt.c \
   amort_prt.c \

src/core-utils/Makefile.am

@@ -28,7 +28,7 @@ noinst_HEADERS = \
   gnc-gobject-utils.h \
   gw-core-utils.h
 
-EXTRA_DIST = .cvsignore ${gwmod_DATA}
+EXTRA_DIST = ${gwmod_DATA}
 
 AM_CFLAGS = \
   -I${top_srcdir}/lib/glib26 \

src/engine/Makefile.am

@@ -233,7 +233,6 @@ gwmod_DATA = \
   gw-kvp.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   README.query-api \
   design.txt \
   extensions.txt \

src/experimental/Makefile.am

@@ -3,5 +3,4 @@ SUBDIRS = cbb gg
 DIST_SUBDIRS = ${SUBDIRS} cgi-bin
 
 EXTRA_DIST = \
-  .cvsignore \
   README

src/experimental/cgi-bin/Makefile.am

@@ -3,8 +3,6 @@
 
 bin_PROGRAMS = hello hello2 fastcgi-hello hello3 gnc-server
 
-EXTRA_DIST = .cvsignore
-
 AM_CFLAGS = \
 	-I../../engine -I${srcdir}/../../engine \
 	-I../../backend/file -I${srcdir}/../../backend/file \
@@ -32,7 +30,6 @@ gnc_server_SOURCES = \
 noinst_HEADERS = 
 
 
-EXTRA_DIST += \
-  .cvsignore \
+EXTRA_DIST = \
   README \
   login.html

src/experimental/ofx/explore/Makefile.am

@@ -1,6 +1,5 @@
 
 EXTRA_DIST = \
-  .cvsignore \
   README.OFX \
   length.cc \
   parse_error \

src/gnome-search/Makefile.am

@@ -66,6 +66,5 @@ glade_DATA = \
   search.glade
 
 EXTRA_DIST = \
-  .cvsignore \
   ${glade_DATA}
 

src/gnome-utils/Makefile.am

@@ -268,7 +268,6 @@ glade_DATA = \
   transfer.glade
 
 EXTRA_DIST = \
-  .cvsignore \
   gnc-dir.h.in \
   gnc-svninfo.h \
   ${glade_DATA} \

src/gnome/Makefile.am

@@ -120,7 +120,6 @@ noinst_HEADERS = \
   gw-gnc.h
 
 EXTRA_DIST = \
-  .cvsignore \
   gnucash.desktop.in \
   gnucash.keys.in \
   gnucash.mime \

src/import-export/Makefile.am

@@ -71,7 +71,6 @@ AM_CFLAGS = \
 
 EXTRA_DIST = \
   $(glade_DATA) \
-  .cvsignore \
   generic-import-design.txt
 
 if GNUCASH_SEPARATE_BUILDDIR

src/import-export/binary-import/Makefile.am

@@ -44,5 +44,4 @@ gladedir = $(GNC_GLADE_DIR)
 glade_DATA = binary-import.glade
 
 EXTRA_DIST = \
-  .cvsignore \
   ${glade_DATA}

src/import-export/log-replay/Makefile.am

@@ -38,7 +38,4 @@ uidir = $(GNC_UI_DIR)
 dist_ui_DATA = \
 	gnc-plugin-log-replay-ui.xml
 
-EXTRA_DIST = \
-  .cvsignore
-
 CLEANFILES = g-wrapped

src/import-export/mt940/Makefile.am

@@ -39,5 +39,3 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-mt940-ui.xml
 
-EXTRA_DIST = \
-  .cvsignore

src/import-export/ofx/Makefile.am

@@ -40,5 +40,3 @@ uidir = $(GNC_UI_DIR)
 ui_DATA = \
 	gnc-plugin-ofx-ui.xml
 
-EXTRA_DIST = \
-  .cvsignore

src/import-export/qif-import/Makefile.am

@@ -71,7 +71,6 @@ ui_DATA = \
 	gnc-plugin-qif-import-ui.xml
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncscm_DATA} \
   ${glade_DATA} \
   file-format.txt \

src/network-utils/Makefile.am

@@ -28,5 +28,3 @@ libgncmod_network_utils_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${GNOME_LIBS} ${QOF_LIBS}
 
-EXTRA_DIST = \
-  .cvsignore

src/optional/Makefile.am

@@ -1,7 +1,4 @@
 
-EXTRA_DIST = \
-  .cvsignore
-
 # N.B. Do *not* specify subdirs, since we do *not* want the swig subdirs
 # built by default, since many folks may not have swig installed, and this
 # is, after all, optional. But do put them in the dist.

src/optional/swig/Makefile.am

@@ -24,7 +24,6 @@ noinst_HEADERS = \
   helperfuncs.h
 
 EXTRA_DIST = \
-  .cvsignore \
   examples/scan-acct.pl \
   perl5_typemaps.i \
   gnucash-swig-defines.c

src/pixmaps/Makefile.am

@@ -18,5 +18,4 @@ gncpixmap_DATA = \
   stock_split_watermark.png
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncpixmap_DATA}

src/quotes/Makefile.am

@@ -5,7 +5,6 @@ bin_SCRIPTS = dump-finance-quote gnc-prices update-finance-quote
 gncshare_SCRIPTS = finance-quote-helper finance-quote-check
 
 EXTRA_DIST = \
-  .cvsignore \
   Quote_example.pl \
   finance-quote-check.in \
   finance-quote-helper.in \

src/register/register-core/Makefile.am

@@ -58,7 +58,6 @@ noinst_HEADERS = \
   gw-register-core.h
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gwmod_DATA}
 
 AM_CFLAGS = \

src/register/register-gnome/Makefile.am

@@ -48,9 +48,6 @@ noinst_HEADERS = \
   quickfillcell-gnome.h \
   table-gnome.h
 
-EXTRA_DIST = \
-  .cvsignore
-
 AM_CFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \

src/report/report-gnome/Makefile.am

@@ -71,7 +71,6 @@ noinst_HEADERS = \
  gw-report-gnome.h
 
 EXTRA_DIST = \
-  .cvsignore \
   ${glade_DATA} \
   ${gwmod_DATA} \
   ${gncmod_DATA} \

src/scm/Makefile.am

@@ -32,7 +32,6 @@ config_DATA = config
 SCM_FILES = ${gncscm_DATA} ${gncscmmod_DATA}
 
 EXTRA_DIST = \
-  .cvsignore \
   build-config.scm.in \
   config \
   startup-design.txt \

src/scm/gnumeric/Makefile.am

@@ -6,5 +6,4 @@ gncscm_DATA = \
   table-utils.scm
 
 EXTRA_DIST = \
-  .cvsignore \
   ${gncscm_DATA}

src/scm/printing/Makefile.am

@@ -5,4 +5,4 @@ gncscm_DATA = print-check.scm
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/printing
 gncscmmod_DATA = number-to-words.scm
 
-EXTRA_DIST = .cvsignore ${gncscmmod_DATA} ${gncscm_DATA}
+EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA}