Rename all x modules from abc to abc-x.

2001-01-03  Alexander Larsson  <alexl@redhat.com>

	* configure.in:
	* modules/arabic/Makefile.am:
	* modules/arabic/arabic-x.c:
	* modules/basic/Makefile.am:
	* modules/basic/basic-x.c:
	* modules/hangul/Makefile.am:
	* modules/hangul/hangul-x.c:
	* modules/indic/Makefile.am:
	* modules/indic/bengali-x.c:
	* modules/indic/devanagari-x.c:
	* modules/indic/gujarati-x.c:
	* modules/indic/gurmukhi-x.c:
	* modules/indic/myanmar-x.c:
	* modules/tamil/Makefile.am:
	* modules/tamil/tamil-x.c:
	* modules/thai/Makefile.am:
	* modules/thai/thai-x.c:
	Rename all x modules from abc to abc-x.

	* modules/arabic/arabic.c:
	* modules/basic/basic.c:
	* modules/hangul/hangul.c:
	* modules/indic/bengali.c:
	* modules/indic/devanagari.c:
	* modules/indic/gujarati.c:
	* modules/indic/gurmukhi.c:
	* modules/indic/myanmar.c:
	* modules/tamil/tamil.c:
	* modules/thai/thai.c:
	These were all copied to file-x.c and then removed.

1 files changed, 27 insertions, 29 deletions

diff --git a/configure.in b/configure.in
index 7c977d0a..ebef855b 100644
--- a/configure.in
+++ b/configure.in
@@ -145,8 +145,8 @@ 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,bengali,gujarati,devanagari,myanmar"
-all_modules="arabic,arabic-xft,basic,basic-ft2,basic-xft,hangul,tamil,thai,$indic_modules"
+indic_modules="gurmukhi-x,bengali-x,gujarati-x,devanagari-x,myanmar-x"
+all_modules="arabic-x,arabic-xft,basic-x,basic-ft2,basic-xft,hangul-x,tamil-x,thai-x,$indic_modules"
 
 included_modules=""
 if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then
@@ -166,22 +166,20 @@ INCLUDED_XFT_MODULES=
 INCLUDED_FT2_MODULES=
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
 for module in $included_modules; do
-  if ! (echo "$all_modules" | grep "\(^\|,\)$module\(\$\|,\)" > /dev/null); then
-    AC_MSG_ERROR([the specified module $module does not exist])
+  if echo $indic_modules | grep "\(^\| \)$module\(\$\| \)" > /dev/null; then
+    dir=indic
   else
-    if echo $indic_modules | grep "\(^\| \)$module\(\$\| \)" > /dev/null; then
-      dir=indic
-    else
-      dir=`echo $module | sed "s/-.*//"`
-    fi
+    dir=`echo $module | sed "s/-.*//"`
+  fi
   
-    if echo $module | grep -- "-xft" > /dev/null; then
-      INCLUDED_XFT_MODULES="$INCLUDED_XFT_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
-    elif echo $module | grep -- "-ft2" > /dev/null; then
-      INCLUDED_FT2_MODULES="$INCLUDED_FT2_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
-    else
-      INCLUDED_X_MODULES="$INCLUDED_X_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
-    fi
+  if echo $module | grep -- "-xft\($\|,\)" > /dev/null; then
+    INCLUDED_XFT_MODULES="$INCLUDED_XFT_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
+  elif echo $module | grep -- "-ft2\($\|,\)" > /dev/null; then
+    INCLUDED_FT2_MODULES="$INCLUDED_FT2_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
+  elif echo $module | grep -- "-x\($\|,\)" > /dev/null; then
+    INCLUDED_X_MODULES="$INCLUDED_X_MODULES \$(top_builddir)/modules/$dir/libpango-$module.la"
+  else
+    AC_MSG_ERROR([the specified module $module does not exist])
   fi
 done
 IFS="$pango_save_ifs"
@@ -190,20 +188,20 @@ AC_SUBST(INCLUDED_X_MODULES)
 AC_SUBST(INCLUDED_XFT_MODULES)
 AC_SUBST(INCLUDED_FT2_MODULES)
 
-AM_CONDITIONAL(INCLUDE_ARABIC,echo $included_modules | grep '\(^\|,\)arabic\($\|,\)' > /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,echo $included_modules | grep '\(^\|,\)basic\($\|,\)' > /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_HANGUL,echo $included_modules | grep '\(^\|,\)hangul\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_TAMIL,echo $included_modules | grep '\(^\|,\)tamil\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_THAI,echo $included_modules | grep '\(^\|,\)thai\($\|,\)' > /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_THAI_X,echo $included_modules | grep '\(^\|,\)thai-x\($\|,\)' > /dev/null)
 
-AM_CONDITIONAL(INCLUDE_MYANMAR,echo $included_modules | grep '\(^\|,\)myanmar\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_GURMUKHI,echo $included_modules | grep '\(^\|,\)gurmukhi\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_BENGALI,echo $included_modules | grep '\(^\|,\)bengali\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_GUJARATI,echo $included_modules | grep '\(^\|,\)gujarati\($\|,\)' > /dev/null)
-AM_CONDITIONAL(INCLUDE_DEVANAGARI,echo $included_modules | grep '\(^\|,\)devanagari\($\|,\)' > /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)
 
 have_indic_modules="no"
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
@@ -329,7 +327,7 @@ EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
 for module in $included_modules; do
-  if ! (echo $module | grep -- "-ft2" > /dev/null || echo $module | grep -- "-xft" > /dev/null); then  
+  if echo $module | grep -- "-x\($\|,\)" > /dev/null; then  
     module_c=`echo $module | sed s/-/_/`
     cat >> pango/module-defs-x.c <<EOTEXT
  { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload },
@@ -356,7 +354,7 @@ EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
 for module in $included_modules; do
-  if echo $module | grep -- "-xft" > /dev/null; then
+  if echo $module | grep -- "-xft\($\|,\)" > /dev/null; then
     module_c=`echo $module | sed s/-/_/`
     cat >> pango/module-defs-xft.c <<EOTEXT
  { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload },
@@ -383,7 +381,7 @@ EOTEXT
 
 IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
 for module in $included_modules; do
-  if echo $module | grep -- "-ft2" > /dev/null; then
+  if echo $module | grep -- "-ft2\($\|,\)" > /dev/null; then
     module_c=`echo $module | sed s/-/_/`
     cat >> pango/module-defs-ft2.c <<EOTEXT
  { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_load,_pango_${module_c}_script_engine_unload },