configure, [...]: Rebuilt.

	* configure, Makefile.in: Rebuilt.
	* configure.ac (JAR): Check for -@ feature.
	* Makefile.am (libgcj-$(gcc_version).jar): Use find -prune.

From-SVN: r121429

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2e6853713568540136ddc7de33e6b6cab686a6bb..40ce7ee333e63b2c5835f85bdfe5fb025f9cfeee 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-31  Tom Tromey  <tromey@redhat.com>
+
+       * configure, Makefile.in: Rebuilt.
+       * configure.ac (JAR): Check for -@ feature.
+       * Makefile.am (libgcj-$(gcc_version).jar): Use find -prune.
+
 2007-01-31  Tom Tromey  <tromey@redhat.com>
 
        PR libgcj/30606:

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 6a7e1198907c123483ac990df6d6c1a2f37c292d..0b653a88259e0ec8605912abd001dcd04cd1bfd3 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -333,8 +333,7 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes
 ## Note that this now omits the property files.
 ## It doesn't matter since we don't use the jar at runtime.
        here=`pwd`; cd $(srcdir)/classpath/lib; \
-       find gnu java javax org sun -name '*.class' -print | \
-       fgrep -v .svn | \
+       find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \
        $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index ff6b9429f55361ffc5af74eebe22f7ac1d24729a..000543a3e38ded9b8f164f652faa9942ea95ee2c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -9902,8 +9902,7 @@ $(propertyo_files): %.lo: classpath/resource/%
 
 libgcj-$(gcc_version).jar: classpath/lib/compile-classes
        here=`pwd`; cd $(srcdir)/classpath/lib; \
-       find gnu java javax org sun -name '*.class' -print | \
-       fgrep -v .svn | \
+       find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \
        $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
 
 libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip

diff --git a/libjava/configure b/libjava/configure
index 0e87e5c2483a352f0032696321fdb65e94635551..31c43db600fdfa569d507f67fd2cbb8ffe240ed4 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -4198,6 +4198,18 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
+
+# We need a jar that supports -@.  This is a GNU extension.
+if test "$JAR" != no; then
+   rm -f config-test.jar
+   echo $srcdir/configure.ac | $JAR -cf@ config-test.jar
+   if test -f config-test.jar; then
+     rm -f config-test.jar
+   else
+     JAR=no
+   fi
+fi
+
 # Prefer the jar we found, but fall back to our jar script.
 if test "$JAR" = no; then
   if test "$ZIP" = no; then
@@ -6012,7 +6024,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6015 "configure"' > conftest.$ac_ext
+  echo '#line 6027 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7054,7 +7066,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
   :
 else
   cat > conftest.$ac_ext << EOF
-#line 7057 "configure"
+#line 7069 "configure"
 struct S { ~S(); };
 void bar();
 void foo()

diff --git a/libjava/configure.ac b/libjava/configure.ac
index a3a9d80a2b1a5dd2339291421ff9493738987810..ab637d4d42b0f8987d418cde909cb6099a51103a 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -117,6 +117,18 @@ AC_PROG_AWK
 AC_CHECK_PROGS([JAR], [jar fastjar gjar], no)
 AC_PATH_PROG([ZIP], [zip], no)
 AC_PATH_PROG([UNZIP], [unzip], unzip)
+
+# We need a jar that supports -@.  This is a GNU extension.
+if test "$JAR" != no; then
+   rm -f config-test.jar
+   echo $srcdir/configure.ac | $JAR -cf@ config-test.jar
+   if test -f config-test.jar; then
+     rm -f config-test.jar
+   else
+     JAR=no
+   fi
+fi
+
 # Prefer the jar we found, but fall back to our jar script.
 if test "$JAR" = no; then
   if test "$ZIP" = no; then