[ooo-build-commit] .: configure.in

[Thorsten Behrens]

 configure.in |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 0df98d4077149a0e5ec7914de516387bcc7c7985
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Oct 4 10:33:18 2010 +0200

    Reworked the Darwin section of "GNU cp" to work a little better.

diff --git a/configure.in b/configure.in
index 37c724c..312c430 100644
--- a/configure.in
+++ b/configure.in
@@ -1050,11 +1050,7 @@ AC_SUBST(LIBERATION_FONTS_VER)
 
 
 AC_MSG_CHECKING([for GNU cp])
-if test "z`uname -s`" = "zDarwin"; then
-   GNUCP=gcp
-else
-   GNUCP=cp
-fi
+GNUCP="cp"
 if test "z$with_gnu_cp" != "z"; then
     if test "z${with_gnu_cp%%/*}" = "z" ; then
         # it's an absolute path
@@ -1067,6 +1063,16 @@ if test "z$with_gnu_cp" != "z"; then
         AC_MSG_ERROR([--with-gnu-cp requires an absolute path])
     fi
 fi
+if test "z`uname -s`" = "zDarwin"; then
+	if test "z$GNUCP" = "zcp"; then
+		AC_CHECK_PROG(xGNUCP, gcp, yes)
+		if ! test "z$xGNUCP" = "zyes"; then
+			AC_MSG_ERROR( GNU cp (GNU coreutils) must be installed )
+		else
+			GNUCP=gcp
+		fi
+	fi
+fi
 AC_MSG_RESULT([$GNUCP])
 AC_SUBST(GNUCP)