[Libreoffice-commits] .: 2 commits - configure.in .gitignore

[Norbert Thiebaud]

 .gitignore   |    1 -
 configure.in |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ba75626b22c15785a418bd7645a508a2d99b12e4
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Sep 6 17:32:15 2011 -0400

    silence the hamcrest check

diff --git a/configure.in b/configure.in
index 638a9bb..e992ef8 100755
--- a/configure.in
+++ b/configure.in
@@ -8861,7 +8861,7 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
     if test $? -eq 0; then
         # check if either class-path entry is available for hamcrest or
         # it's bundled
-        if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep hamcrest || \
+        if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
             "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
             AC_MSG_RESULT([$OOO_JUNIT_JAR])
         else
commit dfa4249d809454e6bc5b4af77a4e08d3a489178e
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Sep 6 17:00:33 2011 -0400

    clean visibility.cxx
    
    The visibility configure test failed to clean up visibility.cxx.
    This patch fixes that.

diff --git a/.gitignore b/.gitignore
index 58f491f..8afcf96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,7 +53,6 @@
 /Makefile
 /makefile.mk
 /set_soenv
-/visibility.cxx
 /post_download
 /bin/repo-list
 /src.downloaded
diff --git a/configure.in b/configure.in
index f2c3cba..638a9bb 100755
--- a/configure.in
+++ b/configure.in
@@ -3572,7 +3572,7 @@ _ACEOF
                 ;;
             esac
         fi
-        rm -f visibility.s
+        rm -f visibility.s visibility.cxx
 
         AC_MSG_RESULT([$gccvisbroken])
         if test "$gccvisbroken" = "yes"; then