|
 |
f085be |
From cb6511354b500d1b1bd8ff140fdf0ea106b174d4 Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: David Tardon <dtardon@redhat.com>
|
|
|
f085be |
Date: Wed, 3 Sep 2014 16:20:40 +0200
|
|
|
f085be |
Subject: [PATCH] drop useless test for ant-apache-regexp
|
|
|
f085be |
|
|
|
f085be |
It has not been needed since commit
|
|
|
f085be |
1de48c417404464ca1e34e5c5d1c82a9342349bb 4 years ago.
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I53ceb5d8d6c02c7a13c86cdd884e4fc378a2c492
|
|
|
f085be |
---
|
|
|
f085be |
configure.ac | 44 --------------------------------------------
|
|
|
f085be |
1 file changed, 44 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/configure.ac b/configure.ac
|
|
|
f085be |
index f65ab66..897cb1e 100644
|
|
|
f085be |
--- a/configure.ac
|
|
|
f085be |
+++ b/configure.ac
|
|
|
f085be |
@@ -12311,50 +12311,6 @@ EOF
|
|
|
f085be |
AC_MSG_ERROR([no, you need at least Ant >= $ant_minver])
|
|
|
f085be |
fi
|
|
|
f085be |
|
|
|
f085be |
- if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
|
|
|
f085be |
- AC_MSG_CHECKING([whether Ant supports mapper type="regexp"])
|
|
|
f085be |
- rm -rf confdir
|
|
|
f085be |
- mkdir confdir
|
|
|
f085be |
- cat > conftest.java << EOF
|
|
|
f085be |
- public class conftest {
|
|
|
f085be |
- int testmethod(int a, int b) {
|
|
|
f085be |
- return a + b;
|
|
|
f085be |
- }
|
|
|
f085be |
- }
|
|
|
f085be |
-EOF
|
|
|
f085be |
-
|
|
|
f085be |
- cat > conftest.xml << EOF
|
|
|
f085be |
- <project name="conftest" default="conftest">
|
|
|
f085be |
- <target name="conftest" depends="copytest">
|
|
|
f085be |
- <javac srcdir="." includes="conftest.java">
|
|
|
f085be |
- </javac>
|
|
|
f085be |
- </target>
|
|
|
f085be |
- <target name="copytest">
|
|
|
f085be |
- <copy todir="confdir">
|
|
|
f085be |
- <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
|
|
|
f085be |
- <filterset/>
|
|
|
f085be |
- <mapper type="regexp" from="^(.*[/\\])foo([/\\].*)" to="\1baa\2"/>
|
|
|
f085be |
- </copy>
|
|
|
f085be |
- </target>
|
|
|
f085be |
- </project>
|
|
|
f085be |
-EOF
|
|
|
f085be |
-
|
|
|
f085be |
- if test "$JAVACISGCJ" = "yes"; then
|
|
|
f085be |
- JAVA_HOME=; export JAVA_HOME
|
|
|
f085be |
- ant_gcj="-Dbuild.compiler=gcj"
|
|
|
f085be |
- fi
|
|
|
f085be |
- AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
|
|
|
f085be |
- if test $? = 0 -a -f ./conftest.class; then
|
|
|
f085be |
- AC_MSG_RESULT([yes])
|
|
|
f085be |
- rm -rf confdir
|
|
|
f085be |
- else
|
|
|
f085be |
- echo "configure: Ant test failed" >&5
|
|
|
f085be |
- cat conftest.java >&5
|
|
|
f085be |
- cat conftest.xml >&5
|
|
|
f085be |
- rm -rf confdir
|
|
|
f085be |
- AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
|
|
|
f085be |
- fi
|
|
|
f085be |
- fi
|
|
|
f085be |
rm -f conftest* core core.* *.core
|
|
|
f085be |
fi
|
|
|
f085be |
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|