bug 95258

Need to add a new extension to support Complex Text Layout
changing configure and configure.in
check for prabhat.hegde@sun.com
r=leaf sr=cls

config/autoconf.mk.in

@@ -76,6 +76,7 @@ MOZ_META_COMPONENTS = @MOZ_META_COMPONENTS@
 MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
+SUNCTL = @SUNCTL@
 ACCESSIBILITY = @ACCESSIBILITY@
 BUILD_IDLC = @BUILD_IDLC@
 MOZ_ENDER_LITE = @MOZ_ENDER_LITE@

configure

@@ -102,6 +102,8 @@ ac_help="$ac_help
   --disable-tests         Do not build tests libraries & programs"
 ac_help="$ac_help
   --disable-bidi          Disable bi-directional support"
+ac_help="$ac_help
+  --enable-ctl            Enable Thai CTL support"
 ac_help="$ac_help
   --disable-accessibility Disable accessibility support"
 ac_help="$ac_help
@@ -10730,6 +10732,19 @@ EOF
 
 fi
 
+SUNCTL=
+# Check whether --enable-ctl or --disable-ctl was given.
+if test "${enable_ctl+set}" = set; then
+  enableval="$enable_ctl"
+  if test "$enableval" = "yes"; then
+    SUNCTL=1
+  elif test "$enableval" = "no"; then
+    :
+  else
+    { echo "configure: error: Option, ctl, does not take an argument ($enableval)." 1>&2; exit 1; }
+  fi
+fi
+
 ACCESSIBILITY=1
 # Check whether --enable-accessibility or --disable-accessibility was given.
 if test "${enable_accessibility+set}" = set; then
@@ -11093,7 +11108,11 @@ fi
 
 
 MOZ_EXTENSIONS_DEFAULT="cookie wallet content-packs xml-rpc xmlextras help transformiix"
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin venkman" 
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin venkman ctl" 
+
+if test "${enable_ctl+set}" = set; then
+  MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
+fi
 
 # Check whether --with-extensions or --without-extensions was given.
 if test "${with_extensions+set}" = set; then
@@ -11125,6 +11144,11 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman`
     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
 fi
 
+if test -z "$SUNCTL" && test `echo "$MOZ_EXTENSIONS" | grep -c ctl` -ne 0; then
+   echo "configure: warning: Cannot build ctl without glib. Removing ctl from MOZ_EXTENSIONS." 1>&2
+   MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|ctl||'`
+fi
+
 # Check whether --enable-jar-packaging or --disable-jar-packaging was given.
 if test "${enable_jar_packaging+set}" = set; then
   enableval="$enable_jar_packaging"
@@ -13420,6 +13444,7 @@ s%@MOZ_STATIC_COMPONENTS@%$MOZ_STATIC_COMPONENTS%g
 s%@MOZ_META_COMPONENTS@%$MOZ_META_COMPONENTS%g
 s%@ENABLE_TESTS@%$ENABLE_TESTS%g
 s%@IBMBIDI@%$IBMBIDI%g
+s%@SUNCTL@%$SUNCTL%g
 s%@ACCESSIBILITY@%$ACCESSIBILITY%g
 s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g
 s%@BUILD_IDLC@%$BUILD_IDLC%g

configure.in

@@ -2964,6 +2964,15 @@ if test "$IBMBIDI"; then
   AC_DEFINE(IBMBIDI)
 fi
 
+dnl complex text support off by default
+SUNCTL=
+MOZ_ARG_ENABLE_BOOL(ctl,
+[  --enable-ctl           Enable Thai Complex Script support],
+  SUNCTL=1 )
+if test "$SUNCTL"; then
+  AC_DEFINE(SUNCTL)
+fi
+
 dnl accessibility support on by default
 ACCESSIBILITY=1
 MOZ_ARG_DISABLE_BOOL(accessibility,
@@ -3405,7 +3414,12 @@ dnl Need cookie and wallet to build mozilla, this should
 dnl not be the case, 18352 has been filed.
 dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
 MOZ_EXTENSIONS_DEFAULT="cookie wallet content-packs xml-rpc xmlextras help transformiix"
-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin venkman" 
+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin venkman ctl" 
+
+dnl Check if Thai Rendering Extension needs to be enabled
+if test -n "$SUNCTL"; then
+  MOZ_EXTENSIONS_DEFAULT = "$MOZ_EXTENSIONS_DEFAULT ctl"
+fi
 
 MOZ_ARG_WITH_STRING(extensions,
 [  --with-extensions       Enable extensions (dirs in extensions/)],
@@ -3433,6 +3447,11 @@ if test -z "$MOZ_JSDEBUGGER" && test `echo "$MOZ_EXTENSIONS" | grep -c venkman`
     MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'`
 fi
 
+if test -z "$MOZ_ENABLE_GTK" && test `echo "$MOZ_EXTENSIONS" | grep -c ctl` -ne 0; then
+    AC_MSG_WARN([Cannot build ctl without glib. Removing ctl from MOZ_EXTENSIONS.])
+    MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|ctl||'`
+fi
+
 dnl Disable jar packaging
 MOZ_ARG_DISABLE_BOOL(jar-packaging,
 [  --disable-jar-packaging Disable jar packaging of chrome (Deprecated) ],
@@ -4075,6 +4094,7 @@ AC_SUBST(MOZ_STATIC_COMPONENTS)
 AC_SUBST(MOZ_META_COMPONENTS)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
+AC_SUBST(SUNCTL)
 AC_SUBST(ACCESSIBILITY)
 AC_SUBST(MOZ_USER_DIR)
 AC_SUBST(BUILD_IDLC)