[Libreoffice-commits] .: configure.in

Miklos Vajna vmiklos at kemper.freedesktop.org
Sun Apr 3 07:42:43 PDT 2011


 configure.in |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit acfb6fd491b5afaa0b364b32ba62c871fdbc8e94
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Apr 3 16:26:47 2011 +0200

    Revert "configure: add hamcrest jar to classpath after junit, if found"
    
    This reverts commit 7d5c250a4d70b92460f3bf199dc8db9f69651b3b. It broke
    'jar tf' and it's not necessary: if 'Class-Path:' entry is missing from
    JUnit's manifest file, it should be fixed in JUnit.
    
    Acked-by: Rene Engelhard <rene at debian.org>

diff --git a/configure.in b/configure.in
index 6a84f97..80af57e 100755
--- a/configure.in
+++ b/configure.in
@@ -7657,11 +7657,6 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
         else
             OOO_JUNIT_JAR=/usr/share/java/junit.jar
         fi
-        # hamcrest is a dependency of junit, add it to the classpath if
-        # found
-        if test -e /usr/share/java/hamcrest-core.jar; then
-            OOO_JUNIT_JAR=$OOO_JUNIT_JAR:/usr/share/java/hamcrest-core.jar
-        fi
     else
         OOO_JUNIT_JAR=$with_junit
     fi


More information about the Libreoffice-commits mailing list