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:
* configure, include/config.h.in: Rebuilt.
* configure.ac: Check for magic_t in magic.h.
## 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
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
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
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=$?
:
else
cat > conftest.$ac_ext << EOF
-#line 7057 "configure"
+#line 7069 "configure"
struct S { ~S(); };
void bar();
void foo()
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