[Libreoffice-commits] .: 3 commits - configure.in

[Tor Lillqvist]

 configure.in |   45 +++++++++------------------------------------
 1 file changed, 9 insertions(+), 36 deletions(-)

New commits:
commit b2c2f8ca900e2bcffc043193596521ae759006ed
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 3 16:22:36 2011 +0300

    Bin pointless message that sticks out in the normal autoconf output

diff --git a/configure.in b/configure.in
index 6e74631..66b73e7 100755
--- a/configure.in
+++ b/configure.in
@@ -5628,7 +5628,6 @@ dnl ***************************************
 dnl testing for X libraries and includes...
 dnl ***************************************
 if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then
-   echo "Do Nothing for _os = Darwin"
    dnl Mac OS X using Aqua graphics. Don't check for X11.
    :
 elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then
commit 5a5ab16c6e042fc698e693bba0fc69dc6c75fa52
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 3 16:21:37 2011 +0300

    We can't effectively ignore a bogus /usr/bin/pkg-config on Mac OS X, just warn

diff --git a/configure.in b/configure.in
index 28572d4..6e74631 100755
--- a/configure.in
+++ b/configure.in
@@ -2434,12 +2434,12 @@ if test $_os = Darwin; then
    AC_MSG_CHECKING([for bogus pkg-config])
    if test -n "$PKG_CONFIG"; then
       if test "$PKG_CONFIG" = /usr/bin/pkg-config && ls -l /usr/bin/pkg-config | grep -q Mono.framework; then
-         AC_MSG_RESULT([yes, from Mono, ignoring])
-         PKG_CONFIG=""
+         AC_MSG_RESULT([yes, from Mono])
       else
-         AC_MSG_RESULT([yes, from unknown origin, ignoring])
-         PKG_CONFIG=""
+         AC_MSG_RESULT([yes, from unknown origin])
       fi
+      AC_MSG_WARN([This might have unexpected consequences, please consider hiding $PKG_CONFIG])
+      echo "Having a $PKG_CONFIG might have unexpected consequences, please consider hiding it" >>warn
    else
       AC_MSG_RESULT([no])
    fi
commit d4d3cc8659ae735e855e67d29b9df563914df681
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jun 3 15:49:12 2011 +0300

    Bin the fairly pointless --enable-check-only option

diff --git a/configure.in b/configure.in
index 7b21b82..28572d4 100755
--- a/configure.in
+++ b/configure.in
@@ -396,15 +396,6 @@ AC_ARG_ENABLE(neon,
         [Disable neon and the compilation of webdav binding.]),
 ,)
 
-AC_ARG_ENABLE(check-only,
-    AS_HELP_STRING([--enable-check-only],
-        [Use this option option if you just want to check your environment.
-         This option stops the generation of an ????env.set.])
-    [
-                          Usage:     --enable-check-only=yes
-    ],
-,)
-
 AC_ARG_ENABLE(build-unowinreg,
     AS_HELP_STRING([--enable-build-unowinreg],
         [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
@@ -8703,27 +8694,10 @@ else
    echo > set_soenv.stamp
 fi
 
-dnl Executing the set_soenv script to setup the environment variables.
-chmod a+x set_soenv
-if test -z "$enable_check_only"; then
-   './set_soenv'
-else
-   echo
-   echo Test Complete
-   echo No environment file will be generated
-   echo
-   num_warnings=`wc -l warn`
-   _num=`echo $num_warnings | $AWK '{ print $1 }'`
-   if test $_num -gt 0; then
-      echo The following warning\(s\) were generated by configure
-      echo ----------------------------------------------------
-      echo
-      cat warn
-      echo
-   else
-      echo There were no warnings
-   fi
-   echo
-fi
+dnl Run the set_soenv script to setup the *Env.sh script that sets
+dnl environment variables for the build.
+chmod +x set_soenv
+
+./set_soenv
 
 dnl vim:set shiftwidth=4 softtabstop=4 expandtab: