updated the list of available modules (bug #71411).

2002-02-14  Sven Neumann  <sven@gimp.org>

	* configure.in: updated the list of available modules (bug #71411).

8 files changed, 54 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 0a2abcd3..a9b77b7c 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,7 @@
+2002-02-14  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: updated the list of available modules (bug #71411).
+
 2002-02-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/makefile.msc : update version, 
diff --git a/configure.in b/configure.in
index 8152c4d3..1a747ff6 100644
--- a/configure.in
+++ b/configure.in
@@ -270,8 +270,15 @@ AC_MSG_CHECKING(modules to link statically)
 
 AC_ARG_WITH(included_modules, [ --with-included-modules=MODULE1,MODULE2,...     Build the given modules into Pango])
 
-indic_modules="gurmukhi-x,bengali-x,gujarati-x,devanagari-x,myanmar-x"
-all_modules="arabic-x,arabic-ft2,arabic-xft,hebrew-x,basic-x,basic-ft2,basic-xft,basic-win32,hangul-x,tamil-x,tamil-xft,thai-x,$indic_modules"
+arabic_modules="arabic-ft2,arabic-x,arabic-xft"
+basic_modules="basic-ft2,basic-win32,basic-x,basic-xft"
+hangul_modules="hangul-x"
+hebrew_modules="hebrew-ft2,hebrew-x,hebrew-xft"
+indic_modules="bengali-x,devanagari-x,gurmukhi-x,gujarati-x,myanmar-x"
+tamil_modules="tamil-x,tamil-xft"
+thai_modules="thai-x"
+
+all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$tamil_modules,$thai_modules"
 
 included_modules=""
 if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then
@@ -318,24 +325,32 @@ AC_SUBST(INCLUDED_XFT_MODULES)
 AC_SUBST(INCLUDED_FT2_MODULES)
 AC_SUBST(INCLUDED_WIN32_MODULES)
 
-AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | grep '\(^\|,\)arabic-x\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_ARABIC_FT2,echo $included_modules | grep '\(^\|,\)arabic-ft2\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_ARABIC_X,echo $included_modules | grep '\(^\|,\)arabic-x\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_ARABIC_XFT,echo $included_modules | grep '\(^\|,\)arabic-xft\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | grep '\(^\|,\)basic-x\($\|,\)' > /dev/null)
+
 AM_CONDITIONAL(INCLUDE_BASIC_FT2,echo $included_modules | grep '\(^\|,\)basic-ft2\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | grep '\(^\|,\)basic-xft\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_WIN32,echo $included_modules | grep '\(^\|,\)basic-win32\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_BASIC_XFT,echo $included_modules | grep '\(^\|,\)basic-xft\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_BASIC_X,echo $included_modules | grep '\(^\|,\)basic-x\($\|,\)' > /dev/null)
+
 AM_CONDITIONAL(INCLUDE_HANGUL_X,echo $included_modules | grep '\(^\|,\)hangul-x\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | grep '\(^\|,\)tamil-x\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_TAMIL_XFT,echo $included_modules | grep '\(^\|,\)tamil-xft\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null)
+
+AM_CONDITIONAL(INCLUDE_HEBREW_FT2,echo $included_modules | grep '\(^\|,\)hebrew-ft2\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_HEBREW_X,echo $included_modules | grep '\(^\|,\)hebrew-x\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_HEBREW_XFT,echo $included_modules | grep '\(^\|,\)hebrew-xft\($\|,\)' > /dev/null)
 
-AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | grep '\(^\|,\)myanmar-x\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | grep '\(^\|,\)gurmukhi-x\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_BENGALI_X,echo $included_modules | grep '\(^\|,\)bengali-x\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | grep '\(^\|,\)gujarati-x\($\|,\)' > /dev/null)
 AM_CONDITIONAL(INCLUDE_DEVANAGARI_X,echo $included_modules | grep '\(^\|,\)devanagari-x\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_GUJARATI_X,echo $included_modules | grep '\(^\|,\)gujarati-x\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_GURMUKHI_X,echo $included_modules | grep '\(^\|,\)gurmukhi-x\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_MYANMAR_X,echo $included_modules | grep '\(^\|,\)myanmar-x\($\|,\)' > /dev/null)
+
+AM_CONDITIONAL(INCLUDE_TAMIL_X,echo $included_modules | grep '\(^\|,\)tamil-x\($\|,\)' > /dev/null)
+AM_CONDITIONAL(INCLUDE_TAMIL_XFT,echo $included_modules | grep '\(^\|,\)tamil-xft\($\|,\)' > /dev/null)
+
+AM_CONDITIONAL(INCLUDE_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null)
+
 
 #
 # We use flockfile to implement pango_getline() - should be moved to GLib