Moved ansel conversion code to iconv/glibc directory.

diff --git a/configure.in b/configure.in
index f680443721c3fc78f1e195904d9459f10ec6c9d4..ef83cc941d67fc0c6b647f2491e05fd77df46921 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ else
   AC_MSG_RESULT(libc)
   AC_GLIBC_ICONV
   if test "$is_glibc_iconv" = yes; then
-    DIRS="ansel"
+    DIRS="glibc"
     is_ansel_supported=yes
     AC_SUBST(DIRS)
   fi
@@ -110,7 +110,9 @@ AC_OUTPUT(Makefile
          gedcom/Makefile
          gedcom/calendar/Makefile
          gom/Makefile
-         ansel/Makefile
+         iconv/Makefile
+         iconv/glibc/Makefile
+         iconv/libiconv/Makefile
          utf8/Makefile
          t/Makefile
          t/src/Makefile

diff --git a/t/anselconv.test b/t/anselconv.test
index 4c54b66d1c4610a074e19e8d32c15bb78c02bbc6..f0e3876159f683551bd4690849c59cf63549f7f0 100755 (executable)
--- a/t/anselconv.test
+++ b/t/anselconv.test
@@ -9,8 +9,8 @@ builddir=`pwd`
 
 export GCONV_PATH=.:$GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
-ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
-ln -s $srcdir/../ansel/gconv-modules .
+ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
+ln -s $srcdir/../iconv/glibc/gconv-modules .
 
 retval=0
 

diff --git a/t/src/test_gom b/t/src/test_gom
index 7cc8e035a656bff40dd2a7aa0103e4af309f74f1..39a2225612d894c74553cf18e981c10970b02810 100755 (executable)
--- a/t/src/test_gom
+++ b/t/src/test_gom
@@ -38,8 +38,8 @@ builddir=`pwd`
 ltcmd="$srcdir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la -dlopen $builddir/../gom/libgedcom_gom.la"
 export GCONV_PATH=.:$GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
-ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
-ln -s $srcdir/../ansel/gconv-modules .
+ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
+ln -s $srcdir/../iconv/glibc/gconv-modules .
 rm -f core
 if [ "$GOM_DMALLOC_TEST" = "" ]
 then

diff --git a/t/src/test_script b/t/src/test_script
index 1e21a52c0eedd25f5aae7cc94683db500e0cb2e0..90c21337a267a3f685821c738f1201e2b5d8a0f1 100755 (executable)
--- a/t/src/test_script
+++ b/t/src/test_script
@@ -36,8 +36,8 @@ builddir=`pwd`
 ltcmd="$srcdir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la"
 export GCONV_PATH=.:$GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
-ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
-ln -s $srcdir/../ansel/gconv-modules .
+ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
+ln -s $srcdir/../iconv/glibc/gconv-modules .
 rm -f core
 $ltcmd $GEDCOM_TESTENV $builddir/src/testgedcom $options $testfile
 result=$?

diff --git a/t/src/test_update b/t/src/test_update
index 4e1050cc59850deeb7dba69d0c4a58b71bbc6def..506f620e332324f2767575b91de4ebe2a82b398c 100755 (executable)
--- a/t/src/test_update
+++ b/t/src/test_update
@@ -34,8 +34,8 @@ ltcmd="$srcdir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.l
 export GCONV_PATH=.:$GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
 ln -s $srcdir/../data/new.ged .
-ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
-ln -s $srcdir/../ansel/gconv-modules .
+ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
+ln -s $srcdir/../iconv/glibc/gconv-modules .
 rm -f core
 $ltcmd $GEDCOM_TESTENV $builddir/src/updatetest $options
 result=$?