Re: gzip-1.3.6 compilation failure on MacOS X

[Paul Eggert]

"Bruno Haible" <address@hidden> writes:

> Here is a fix, using 'match.s' instead of '_match.s'.

Thanks for the diagnosis and patch.  I think it's better to use
some name other than match.s, since match.s might confuse some
versions of 'make' -- presumably this is why the existing
code uses _match.s rather than match.s.  So I switched to
'match_.s' instead, and installed this:

2006-12-06  Bruno Haible  <address@hidden>  (tiny change)
        and Paul Eggert  <address@hidden>

        Fix build failure on case-insensitive file systems.
        * configure.ac: Use match_.s instead of _match.s.
        * Makefile.am (MOSTLYCLEANFILES): Likewise.
        * lib/Makefile.am (match.$(OBJEXT)): Likewise.
        (MOSTLYCLEANFILES): Likewise.

Index: configure.ac
===================================================================
RCS file: /cvsroot/gzip/gzip/configure.ac,v
retrieving revision 1.4
diff -u -r1.4 configure.ac
--- configure.ac        7 Dec 2006 06:58:13 -0000       1.4
+++ configure.ac        7 Dec 2006 07:23:05 -0000
@@ -59,15 +59,15 @@
    *' NO_ASM '*) ;;
    *)
      if cp $srcdir/lib/match.c _match.S &&
-        eval "$ASCPP _match.S > _match.s 2>/dev/null"; then
-       if test ! -s _match.s || grep error < _match.s > /dev/null; then
+       eval "$ASCPP _match.S > match_.s 2>/dev/null"; then
+       if test ! -s match_.s || grep error < match_.s > /dev/null; then
         :
-       elif eval "$CC -c _match.s >/dev/null 2>&1" &&
-           test -f _match.$OBJEXT; then
+       elif eval "$CC -c match_.s >/dev/null 2>&1" &&
+           test -f match_.$OBJEXT; then
         gzip_cv_assembler=yes
        fi
      fi
-     rm -f _match.S _match.s _match.$OBJEXT;;
+     rm -f _match.S match_.s match_.$OBJEXT;;
    esac])
 if test $gzip_cv_assembler = yes; then
   AC_DEFINE(ASMV, ,
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gzip/gzip/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- Makefile.am 1 Dec 2006 20:52:52 -0000       1.14
+++ Makefile.am 7 Dec 2006 07:23:05 -0000
@@ -98,4 +98,4 @@

 MAINTAINERCLEANFILES = gzip.doc

-MOSTLYCLEANFILES = _match.s _match.S gzexe zdiff zforce zgrep zless zmore znew
+MOSTLYCLEANFILES = match_.s _match.S gzexe zdiff zforce zgrep zless zmore znew
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/gzip/gzip/lib/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- lib/Makefile.am     20 Nov 2006 08:40:34 -0000      1.1
+++ lib/Makefile.am     7 Dec 2006 07:23:05 -0000
@@ -27,9 +27,9 @@

 match.$(OBJEXT): match.c
        cp $(srcdir)/match.c _match.S
-       $(ASCPP) _match.S >_match.s
-       $(CC) -c $(CFLAGS) _match.s
-       mv _match.$(OBJEXT) match.$(OBJEXT)
-       rm -f _match.S _match.s
+       $(ASCPP) _match.S > match_.s
+       $(CC) -c $(CFLAGS) match_.s
+       mv match_.$(OBJEXT) $@
+       rm -f _match.S match_.s

-MOSTLYCLEANFILES += _match.S _match.s
+MOSTLYCLEANFILES += _match.S match_.s