Ok, there was one bug in the previous patch (thanks to Wilddev for
testing on RH8).  This one actually appears to work.  It is based off
of current-CVS.  I am particularly interested in making sure it works
on MacOS and other non-Linux platforms (I can test Solaris, but I have
not done so, yet).

Thanks for testing!!!

-derek

Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.306
diff -u -r1.306 configure.in
--- configure.in        2 Oct 2002 19:43:58 -0000       1.306
+++ configure.in        5 Oct 2002 04:18:01 -0000
@@ -838,39 +838,10 @@
 ### --------------------------------------------------------------------------
 ### Makefile creation
 
-#
-# God, this is ugly....
-#
-# The libtool 2.52 and 2.53 info pages specify two different
-# *incompatible* ways to create the LTLIBOBJS variable.  2.53 makes it
-# an error to directly access the LIBOBJS variable, but then provides
-# a hack to get past this test by introducing the four character
-# sequence '@&t@' that expands to the empty string.  This expansion
-# occurs *after* the LIBOBJS usage test has taken place.
-# Unfortunately, the '@&t@' sequence doesn't exist in 2.52, so we're
-# stuck with this big ugly version check.  Sigh!  At some point in the
-# future, Autoconf 2.53 can be made a required version and this code
-# can be cleaned up.
-#
 # This is necessary so that .o files in LIBOBJS are also built via
 # the ANSI2KNR-filtering rules.
-
-AUTOCONF_VERSION=`autoconf --version`
-autoconf_major_version=`echo ${AUTOCONF_VERSION} | \
-       sed 's/^.*Autoconf.* \([[0-9]]*\)\.\([[0-9]]*\).*$/\1/'`
-autoconf_minor_version=`echo ${AUTOCONF_VERSION} | \
-       sed 's/^.*Autoconf.* \([[0-9]]*\)\.\([[0-9]]*\).*$/\2/'`
-if test "$autoconf_major_version" -gt 2   -o \
-    \( "$autoconf_major_version" -eq 2   -a \
-      "$autoconf_minor_version" -gt 52 \)  ; then
-    LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
-                  sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
-    LTLIBOBJS=`echo "$LIB@&t@OBJS" |
-                  sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
-else
-    LTLIBOBJS=`echo "$LIBOBJS" | sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
-fi
-AC_SUBST(LTLIBOBJS)
+LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
+AC_SUBST(LIBOBJS_SEDSCRIPT)
 
 AC_OUTPUT( m4/Makefile  intl/Makefile 
           dnl # Makefiles
Index: lib/libc/Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/libc/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- lib/libc/Makefile.am        18 May 2002 20:32:06 -0000      1.4
+++ lib/libc/Makefile.am        5 Oct 2002 04:18:04 -0000
@@ -9,8 +9,16 @@
 
 # This will automatically be filled in with the necessary object file
 # names.  Configure does this based upon the AC_REPLACE_FUNCS macros.
-libc_missing_la_LIBADD = @LTLIBOBJS@
+LIBOBJS = @LIBOBJS@
+LTLIBOBJS = $(shell echo "$(LIBOBJS)" | sed '@LIBOBJS_SEDSCRIPT@' | \
+       sed 's,\.[^.]* ,.lo ,g;s,\.[^.]*$$,.lo,')
+
+libc_missing_la_LIBADD = $(LTLIBOBJS)
 
 # Not currently used.  If added to AC_REPLACE_FUNCS then this line
 # should be removed.
 EXTRA_DIST = scm_strptime.c
+
+print_libobjs:
+       @echo "LIBOBJS = $(LIBOBJS)"
+       @echo "LTLIBOBJS = $(LTLIBOBJS)"


Attachment: gnucash-autoconf_diff_gz_DEFANGED-3360.DEFANGED-0
Description: application/defanged-0



-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       [EMAIL PROTECTED]                        PGP key available
This message has been 'sanitized'.  This means that potentially
dangerous content has been rewritten or removed.  The following
log describes which actions were taken.

Sanitizer (start="1033791696"):
  Part (pos="1308"):
    SanitizeFile (filename="unnamed.txt", mimetype="text/plain"):
      Match (rule="2"):
        Enforced policy: accept

  Part (pos="4609"):
    SanitizeFile (filename="gnucash-autoconf.diff.gz", mimetype="application/gzip"):
      Match (rule="default"):
        Enforced policy: defang

      Replaced mime type with: application/DEFANGED-3360
      Replaced file name with: gnucash-autoconf_diff_gz.DEFANGED-3360

  Part (pos="6504"):
    SanitizeFile (filename="unnamed.txt", mimetype="text/plain"):
      Match (rule="2"):
        Enforced policy: accept

  Total modifications so far: 1


Anomy 0.0.0 : Sanitizer.pm
$Id: Sanitizer.pm,v 1.54 2002/02/15 16:59:07 bre Exp $
This message has been 'sanitized'.  This means that potentially
dangerous content has been rewritten or removed.  The following
log describes which actions were taken.

Sanitizer (start="1033791725"):
  Part (pos="2759"):
    SanitizeFile (filename="unnamed.txt", mimetype="text/plain"):
      Match (rule="2"):
        Enforced policy: accept

  Part (pos="6060"):
    SanitizeFile (filename="gnucash-autoconf_diff_gz.DEFANGED-3360", mimetype="application/DEFANGED-3360"):
      Match (rule="default"):
        Enforced policy: defang

      Replaced mime type with: application/DEFANGED-0
      Replaced file name with: gnucash-autoconf_diff_gz_DEFANGED-3360.DEFANGED-0

  Part (pos="7946"):
    SanitizeFile (filename="unnamed.txt", mimetype="text/plain"):
      Match (rule="2"):
        Enforced policy: accept

  Part (pos="8218"):
    SanitizeFile (filename="sanitizer.log", mimetype="text/sanitizer-log"):
      Match (rule="2"):
        Enforced policy: accept

  Total modifications so far: 1


Anomy 0.0.0 : Sanitizer.pm
$Id: Sanitizer.pm,v 1.54 2002/02/15 16:59:07 bre Exp $

Reply via email to