[Libreoffice-commits] .: config_host.mk.in configure.in

[Fridrich Strba]

 config_host.mk.in |    1 +
 configure.in      |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit ed8cb1ae0ff1537d2885c2d3cde50a2b6dd4a29d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Jul 23 12:50:21 2012 +0200

    Check for uuidgen and for winegcc
    
    Change-Id: I38c92dad50fd13dcd32a07feed860eb60349c080

diff --git a/config_host.mk.in b/config_host.mk.in
index 5e24730..f28c03b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -565,6 +565,7 @@ export VISIO_LIBS=@VISIO_LIBS@
 export WATCH_WINDOW_EXTENSION_PACK=@WATCH_WINDOW_EXTENSION_PACK@
 export WINDOWS_SDK_HOME=@WINDOWS_SDK_HOME@
 export WINDRES=@WINDRES@
+export WINEGCC=@WINEGCC@
 export WITHOUT_AFMS=@WITHOUT_AFMS@
 export WITHOUT_PPDS=@WITHOUT_PPDS@
 export WITH_AGFA_MONOTYPE_FONTS=@WITH_AGFA_MONOTYPE_FONTS@
diff --git a/configure.in b/configure.in
index 980a2fb..27c63c1 100644
--- a/configure.in
+++ b/configure.in
@@ -74,6 +74,8 @@ else
 fi
 AC_SUBST(CROSS_COMPILING)
 
+AC_PATH_PROG(WINEGCC, winegcc)
+
 AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
 AC_PATH_PROG(GREP, grep)
@@ -8571,6 +8573,11 @@ if test "$_os" = "WINNT"; then
         UUIDGEN=uuidgen.exe
         AC_SUBST(UUIDGEN)
     fi
+else
+    AC_PATH_PROG([UUIDGEN], [uuidgen])
+    if test -z "$UUIDGEN"; then
+        AC_MSG_WARN([uuid is needed for dev-install])
+    fi
 fi
 
 dnl =========================================