svn commit: r423429 - in /httpd/apreq/trunk: Makefile.am acinclude.m4

[pg...@apache.org]

Author: pgollucci
Date: Wed Jul 19 03:40:15 2006
New Revision: 423429

URL: http://svn.apache.org/viewvc?rev=423429&view=rev
Log:
bsdtar (default on FreeBSD) is nolonger with the Fedora Core series FC5 and higher.

Fortunately, FreeBSD has gtar available as a port (/usr/local/archivers/gtar)
which will be used by default now on this platform via some Makefile.am/acinclude.m4 foo.

This change should only affect release managers and make the resulting tarballs
usable by all.

Reported by: Bojan Smojver <bo...@rexursive.com>
Message ID : <11...@coyote.rexursive.com> (start of thread)
Redhat Bug : https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=198305



Modified:
    httpd/apreq/trunk/Makefile.am
    httpd/apreq/trunk/acinclude.m4

Modified: httpd/apreq/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/Makefile.am?rev=423429&r1=423428&r2=423429&view=diff
==============================================================================
--- httpd/apreq/trunk/Makefile.am (original)
+++ httpd/apreq/trunk/Makefile.am Wed Jul 19 03:40:15 2006
@@ -35,18 +35,22 @@
 PERL_TEST = 
 endif
 
+TAR=@TAR@
+
 release: reconfig docs_clean docs distdir
 	@PERL@ build/version_check.pl > $(distdir)/PREREQUISITES
 	@PERL@ build/version_check.pl -version=@PACKAGE_VERSION@ > $(distdir)/META.yml
 	echo MANIFEST > $(distdir)/MANIFEST
 	@cd $(distdir); @PERL@ -M$(EUM) -e "$(EUM)::mkmanifest"
-	@PERL@ -ple '$$_="$(distdir)/$$_"' $(distdir)/MANIFEST | tar -czf $(distdir).tar.gz -T -
+	if [ ! -x $(TAR) ]; then echo "$(TAR) is not executable."; fi
+	@PERL@ -ple '$$_="$(distdir)/$$_"' $(distdir)/MANIFEST | $(TAR) -czf $(distdir).tar.gz -T -
 	rm -rf $(distdir)
 	@echo "Made $(distdir).tar.gz"
 
 release_test:
 	-rm -rf $(distdir)
-	tar xzvf $(distdir).tar.gz
+	if [ ! -x $(TAR) ]; then echo "$(TAR) is not executable."; fi
+	$(TAR) xzvf $(distdir).tar.gz
 	@cd $(distdir); @PERL@ -M$(EUM) -e "die 'Bogus MANIFEST' if $(EUM)::manicheck"
 	@cd $(distdir); @PERL@ Makefile.PL -apxs @APACHE2_APXS@ && $(MAKE) test
 	rm -rf $(distdir)

Modified: httpd/apreq/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/apreq/trunk/acinclude.m4?rev=423429&r1=423428&r2=423429&view=diff
==============================================================================
--- httpd/apreq/trunk/acinclude.m4 (original)
+++ httpd/apreq/trunk/acinclude.m4 Wed Jul 19 03:40:15 2006
@@ -37,6 +37,8 @@
                 AC_HELP_STRING([--with-expat],[specify expat location]),
                 [EXPAT_DIR=$withval],[EXPAT_DIR=""])
 
+        OS=`$PERL -e 'print $^O'`
+
         prereq_check="$PERL $PERL_OPTS build/version_check.pl"
 
         if test -n "$APACHE2_SRC"; then
@@ -215,6 +217,15 @@
 
         echo "lib$APREQ_LIBNAME Version: $APREQ_DOTTED_VERSION"
 
+        ## Apparently FC5 doesn't like bsdtar
+        ## which is the default /usr/bin/tar on FreeBSD
+        ## by default /usr/ports/archivers/gtar installs here
+        if test "x$OS" = 'xfreebsd'; then
+          TAR='/usr/local/bin/gtar'
+        else
+          TAR='tar'
+        fi
+     
         AC_SUBST(APREQ_CONFIG)
         AC_SUBST(APREQ_LIBNAME)
         AC_SUBST(APREQ_LIBTOOL_VERSION)
@@ -240,6 +251,7 @@
         AC_SUBST(PERL)
         AC_SUBST(PERL_OPTS)
         AC_SUBST(MM_OPTS)
+        AC_SUBST(TAR)
 ])
 
 dnl APR_CONFIG_NICE(filename)