openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1211816 - in /incubator/ooo/trunk/main: configure.in nss/makefile.mk
Date Thu, 08 Dec 2011 10:46:29 GMT
Author: jsc
Date: Thu Dec  8 10:46:29 2011
New Revision: 1211816

URL: http://svn.apache.org/viewvc?rev=1211816&view=rev
Log:
fix to solve build problems on MacOS in nss, when --disable-build-mozilla is used, means prebuild
moz libs

Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/nss/makefile.mk

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1211816&r1=1211815&r2=1211816&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Dec  8 10:46:29 2011
@@ -971,9 +971,9 @@ case "$build_os" in
 		test_cairo=yes
 		test_kde=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		_os=SunOS
 		AC_PATH_PROG( GNUTAR, gtar,,$PATH:/usr/sfw/bin)
 		if test -z "$GNUTAR"; then
@@ -1006,10 +1006,10 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
-        _os=Linux	
+        	test_gstreamer=yes
+        	_os=Linux	
 		;;
 	gnu)
 		test_cups=no
@@ -1019,30 +1019,30 @@ case "$build_os" in
 		test_cups=no
 		test_cairo=yes
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
 		test_cups=yes
 		test_gtk=yes
 		test_cairo=yes
-        test_randr=no
+        	test_randr=no
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=Darwin
-      if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-         AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
-         echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray"
>>warn
-         enable_systray=no
-      fi
+      		if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
+         	   AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
+         	   echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray"
>>warn
+         	   enable_systray=no
+      		fi
 		;;
 	os2*)
 		test_x=no
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		test_gtk=no
 		test_freetype=no
-        test_gstreamer=no
+        	test_gstreamer=no
 		_os=OS2
 		;;
 	freebsd*)
@@ -1051,9 +1051,9 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=yes
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		AC_MSG_CHECKING([the FreeBSD operating system release])
 		if test -n "$with_os_version"; then
 			OSVERSION="$with_os_version"
@@ -1077,7 +1077,7 @@ case "$build_os" in
 		;;
 	osf)
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		_os=OSF1
 		;;
 	netbsd)
@@ -1086,19 +1086,19 @@ case "$build_os" in
 		test_kde=yes
 		test_kde4=yes
 		test_cups=no
-        test_randr=yes
+        	test_randr=yes
 		test_freetype=yes
-        test_gstreamer=yes
+        	test_gstreamer=yes
 		PTHREAD_CFLAGS="-pthread"
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
 		;;
 	aix*)
 		test_cups=no
-        test_randr=no
+        	test_randr=no
 		test_freetype=yes
-        test_gstreamer=yes
-	   PTHREAD_LIBS=-pthread
+        	test_gstreamer=yes
+	   	PTHREAD_LIBS=-pthread
 		echo "AIX is an alpha port --- Use at own risk" >> warn
 		_os=AIX
 		;;
@@ -4586,6 +4586,7 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
+    WITH_MOZILLA=YES
 if test -z "$with_mozilla_version"; then
    MOZILLA_VERSION=
 else

Modified: incubator/ooo/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/nss/makefile.mk?rev=1211816&r1=1211815&r2=1211816&view=diff
==============================================================================
--- incubator/ooo/trunk/main/nss/makefile.mk (original)
+++ incubator/ooo/trunk/main/nss/makefile.mk Thu Dec  8 10:46:29 2011
@@ -47,6 +47,8 @@ TARFILE_ROOTDIR=nss-3.12.6
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
+MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
+.EXPORT : MACOS_SDK_DIR
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
 
@@ -78,8 +80,7 @@ USE_64:=1
 CPP:=gcc -E $(EXTRA_CFLAGS)
 CXX:=g++ $(EXTRA_CFLAGS)
 CC:=gcc $(EXTRA_CFLAGS)
-MACOS_SDK_DIR*=$(MACDEVSDK)
-.EXPORT : CPP MACOS_SDK_DIR
+.EXPORT : CPP
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(OS)"=="MACOSX"
 



Mime
View raw message