[Libreoffice-commits] .: 3 commits - configure.in solenv/gbuild

[Tor Lillqvist]

 configure.in                  |   16 +++-------------
 solenv/gbuild/platform/ios.mk |    2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 677da6ca3d8d0cf548ec5584d4875de4597121d2
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Sep 30 15:48:22 2011 +0300

    Fix copy/paste error

diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 4f9cc96..661f25d 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -381,7 +381,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_EXT := $(OUTDIR)/lib
+gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
commit cb4a3b13e81f57624b50c2a8f4463d4b42595595
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Sep 30 15:44:05 2011 +0300

    Remove a commented out obsolete test

diff --git a/configure.in b/configure.in
index 5da3d75..2bf85ec 100644
--- a/configure.in
+++ b/configure.in
@@ -5790,11 +5790,6 @@ else
     enable_build_mozilla=1
     AC_MSG_RESULT([$MOZILLA_TOOLKIT])
 fi
-#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
-#   #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
-#   #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
-#   AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
-#fi
 
 AC_SUBST(MOZILLA_TOOLKIT)
 
commit 62a4321812cd5ad919198f2d824e48216bdf03d0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Sep 30 15:41:42 2011 +0300

    Surely MOZILLA_TOOLKIT is never "gtk2" for MacOSX

diff --git a/configure.in b/configure.in
index 6511744..5da3d75 100644
--- a/configure.in
+++ b/configure.in
@@ -5898,14 +5898,9 @@ Use "./download" to download.])
             AC_MSG_RESULT([ok])
         fi
     elif test "$_os" = "Darwin"; then
-        if test "$MOZILLA_TOOLKIT" = "gtk2"; then
-            AC_MSG_NOTICE([checking whether Mozilla can be built...])
-            PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build Mozilla]), AC_MSG_ERROR([Prerequisites to build Mozilla not met. Either use the precompiled Mozilla binaries or install the missing packages]))
-        else
-            PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
-            if test -z "$MOZIDL"; then
-                AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
-            fi
+        PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3,  MOZIDL="TRUE", MOZIDL="")
+        if test -z "$MOZIDL"; then
+            AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build Mozilla with Mac toolkit.])
         fi
     else
         # Generic Unix/Linux section