Scheint jetzt endlich zu funktionieren. Angepasst an neue Version, sowie an V962..

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4873 504e572c-2e33-0410-9681-be2bf7408885

SysBuild/network/thunderbird

@@ -84,11 +84,17 @@ mk32() {
 	CC="gcc $BUILDOPTIONS32   \
 	    -I/usr/X11R7/include/nss  \
 	    -I/usr/X11R7/include/nspr \
-	    -I/usr/X11R7/include/cairo" \
+	    -I/usr/X11R7/include/cairo \
+	    -lX11 \
+	    -lXrender \
+	    -L/usr/X11R7/lib" \
 	CXX="g++ $BUILDOPTIONS32  \
 	          -I/usr/X11R7/include/nspr \
 	          -I/usr/X11R7/include/nss \
-	          -I/usr/X11R7/include/cairo" \
+	          -I/usr/X11R7/include/cairo \
+		  -lX11 \
+		  -lXrender \
+		  -L/usr/X11R7/lib" \
 	LDFLAGS="-L/lib -L/usr/lib -L/usr/X11R7/lib" \
 	USE_ARCH=$UARCH \
 	../mozilla*/configure --host=$TARGET32 \
@@ -116,7 +122,7 @@ mk32() {
 			--build=$TARGET32 \
 			--enable-application=mail
 	make -j $NUMCPU OS_TEST=x86
-	make -j $NUMCPU DESTDIR=$TMPROOT install
+	make -j $NUMCPU DESTDIR=$TMPROOT OS_TEST=x86 install
 	cd ../mozilla*
 	rm -r ../build-thunderbird
 	mkdir ../build-thunderbird
@@ -127,34 +133,52 @@ mk() {
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=\${prefix}/lib64"
 	fi
-	CC="gcc $BUILDOPTIONS" \
-	CXX="g++ $BUILDOPTIONS" \
-	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
 	USE_ARCH=$UARCH \
-	../mozilla*/configure --build=$TARGET \
-		    --prefix=/opt/firefox \
-		    --libexecdir=/opt/firefox/bin \
-		    --sysconfdir=/etc/sysconfig/firefox \
-		    $ADDOPTIONS \
-		    --x-includes=/usr/X11R7/include \
-		    --x-libraries=/usr/X11R7/$LIBDIR \
-		    --with-x \
-		    --with-system-jpeg \
-		    --with-system-zlib \
-		    --with-system-bz2 \
-		    --with-java-include-path=/usr/$LIBDIR/jdk/include \
-		    --with-java-bin-path=/usr/$LIBDIR/jdk/bin \
-		    --enable-application=mail \
-		    --enable-startup-notification \
-		    --with-qt-dir=/opt/qt-4 \
-		    --enable-nativ-uconf \
-		    --enable-image-decoders=all \
-		    --enable-system-sqlite \
-		    --enable-safe-browsing \
-		    --enable-url-classifier \
-		    --disable-installer \
-		    --disable-updater \
-		    --disable-crashreporter
+	NSPR_CONFIG=/usr/X11R7/bin/nspr-config \
+	NSS_CONFIG=/usr/X11R7/bin/nss-config \
+	FT2_CONFIG=/usr/X11R7/bin/freetype-config \
+	CC="gcc $BUILDOPTIONS   \
+	    -I/usr/X11R7/include/nss  \
+	    -I/usr/X11R7/include/nspr \
+	    -I/usr/X11R7/include/cairo \
+	    -I/usr/$LIBDIR/glib-2.0/include \
+	    -lX11 \
+	    -lXrender \
+	    -L/usr/X11R7/$LIBDIR" \
+	CXX="g++ $BUILDOPTIONS  \
+	          -I/usr/X11R7/include/nspr \
+	          -I/usr/X11R7/include/nss \
+	          -I/usr/X11R7/include/cairo \
+	    	  -I/usr/$LIBDIR/glib-2.0/include \
+		  -lX11 \
+		  -lXrender \
+		  -L/usr/X11R7/$LIBDIR" \
+	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR -L/usr/X11R7/$LIBDIR" \
+	../mozilla*/configure --host=$TARGET \
+	                --build=$TARGET \
+			--prefix=/opt/thunderbird \
+			$ADDOPTIONS \
+			--with-nspr-prefix=/usr/X11R7 \
+			--with-nss-prefix=/usr/X11R7 \
+			--with-system-nspr \
+			--with-system-nss \
+			--with-system-bz2 \
+			--with-system-jpeg \
+			--with-system-png \
+			--with-system-zlib \
+			--disable-debug \
+			--disable-installer \
+			--disable-xprint \
+			--disable-tests \
+			--enable-canvas \
+			--enable-default-toolkit=gtk2 \
+			--enable-safe-browsing \
+			--enable-svg \
+			--enable-system-cairo \
+			--enable-system-sqlite \
+			--host=$TARGET \
+			--build=$TARGET \
+			--enable-application=mail
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
@@ -163,20 +187,20 @@ postmk() {
 	GetSVN Viitor_thunderbird $TMPROOT
 	cd ../mozilla*
 	rm -r ../build-thunderbird
-	echo "pref(\"network.protocol-handler.app.http\", \"firefox\");" >>$TMPROOT/opt/firefox/lib/thunderbird*/defaults/pref/all-thunderbird.js
-	echo "pref(\"network.protocol-handler.app.https\", \"firefox\");" >>$TMPROOT/opt/firefox/lib/thunderbird*/defaults/pref/all-thunderbird.js
+	echo "pref(\"network.protocol-handler.app.http\", \"firefox\");" >>$TMPROOT/opt/thunderbird/lib/thunderbird*/defaults/pref/all-thunderbird.js
+	echo "pref(\"network.protocol-handler.app.https\", \"firefox\");" >>$TMPROOT/opt/thunderbird/lib/thunderbird*/defaults/pref/all-thunderbird.js
 	if [ "$MK64BIT" == "true" ]; then
-		cd $TMPROOT/opt/firefox/lib64
+		cd $TMPROOT/opt/thunderbird/lib64
 		ln -s thunderbird-[0-9]* thunderbird
 		cd -
-		cd $TMPROOT/opt/firefox/include
+		cd $TMPROOT/opt/thunderbird/include
 		ln -s thunderbird* thunderbird
 		cd -
 	fi
-	cd $TMPROOT/opt/firefox/lib
+	cd $TMPROOT/opt/thunderbird/lib
 	ln -s thunderbird-[0-9]* thunderbird
 	cd -
-	cd $TMPROOT/opt/firefox/include
+	cd $TMPROOT/opt/thunderbird/include
 	ln -s thunderbird* thunderbird
 	cd -
 }