ooo-build r13997 - branches/ooo-build-3-0

[szalaik svn gnome org]

Author: szalaik
Date: Mon Sep 22 12:36:30 2008
New Revision: 13997
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13997&view=rev

Log:
2008-09-22  Kalman Szalai - KAMI <kamihir freemail hu>

	* configure.in: --with-sun-templates configure update (Thx 
Petr!)



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/configure.in

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Mon Sep 22 12:36:30 2008
@@ -1193,26 +1193,31 @@
 
 
 AC_MSG_CHECKING([for SUN templates intergration (only supported languages displayed)])
-SUNTEMPLATES_LANG=
-if test "z$with_sun_templates" = "zyes" ; then
-	for sun_supported_lang in en-US de it fr es
-	do
-		if test -n "`echo $with_lang | grep "$sun_supported_lang"`" ; then
-		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $sun_supported_lang"
-		fi
-	done
-elif test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
-	SUNTEMPLATES_LANG=""
+if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
+    SUNTEMPLATES_LANG=""
     AC_MSG_RESULT([no integration])
 else
-	for sun_supported_lang in en-US de it fr es
-	do
-		if test -n "`echo $with_sun_templates | grep "$sun_supported_lang"`" ; then
-		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $sun_supported_lang"
-		fi
+    sun_supported_langs="en-US de it fr es"
+    if test "z$with_sun_templates" = "zyes" ; then
+	wanted_sun_templates="$sun_supported_langs"
+    else
+	# check whether the langs are supported by Sun
+	wanted_sun_templates=
+	for lang in $with_sun_templates ; do
+	    if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
+		wanted_sun_templates="$wanted_sun_templates $lang"
+	    fi
 	done
+    fi
+    SUNTEMPLATES_LANG=
+    # check whether the langs are requested at all
+    for lang in $wanted_sun_templates ; do
+	if test -n "`echo $with_lang | grep "$lang"`" ; then
+		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+	fi
+    done
+    AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 fi
-AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 AC_SUBST(SUNTEMPLATES_LANG)