From 97e32aa949b0e3d3e9c86543fad2b63a87d844d9 Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Sat, 21 Dec 2002 18:15:24 +0000
Subject: [PATCH] UTF8 library is now a shared library.

---
 t/output/Makefile.am |  3 ++-
 t/path1.test         |  2 +-
 t/path2.test         |  2 +-
 t/src/Makefile.am    | 38 ++++++++++++++++++++------------------
 t/src/standalone.c   |  2 +-
 t/src/test_bulk.sh   |  2 +-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/t/output/Makefile.am b/t/output/Makefile.am
index 90c0520..abf1931 100644
--- a/t/output/Makefile.am
+++ b/t/output/Makefile.am
@@ -3,5 +3,6 @@
 # $Name$
 
 REF_FILES := $(wildcard $(srcdir)/*.ref)
+GED_FILES := $(wildcard $(srcdir)/*.ged)
 
-EXTRA_DIST=$(REF_FILES)
+EXTRA_DIST=$(REF_FILES) $(GED_FILES)
diff --git a/t/path1.test b/t/path1.test
index 16459a4..d6457ee 100755
--- a/t/path1.test
+++ b/t/path1.test
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 builddir=`pwd`
-LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$builddir/../utf8/.libs:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 unset GCONV_PATH
 $builddir/src/pathtest
diff --git a/t/path2.test b/t/path2.test
index 167e769..a9a1948 100755
--- a/t/path2.test
+++ b/t/path2.test
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 builddir=`pwd`
-LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$builddir/../utf8/.libs:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 GCONV_PATH=./ansel
 export GCONV_PATH
diff --git a/t/src/Makefile.am b/t/src/Makefile.am
index 333bd0a..c325db1 100644
--- a/t/src/Makefile.am
+++ b/t/src/Makefile.am
@@ -3,41 +3,43 @@
 # $Name$
 
 INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../../include \
-           -I $(srcdir)/../../utf8
+           -I $(srcdir)/../../utf8 -I $(srcdir)/../intl
 CFLAGS   = -O2 @EXTRA_CFLAGS@
 
-noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl updategomtest \
-		  writegomtest
+noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl \
+                  updategomtest writegomtest
 noinst_HEADERS = output.h dump_gom.h portability.h
 
 testgedcom_SOURCES = standalone.c output.c portability.c
-testgedcom_LDFLAGS = -L../../gedcom/.libs
-testgedcom_LDADD  = -lgedcom ../../utf8/libutf8.la @INTLLIBS@
+testgedcom_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
+testgedcom_LDADD  = -lgedcom -lutf8tools
 
 pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L../../gedcom/.libs
-pathtest_LDADD = -lgedcom @INTLLIBS@
+pathtest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
+pathtest_LDADD = -lgedcom -lutf8tools
 
 gomtest_SOURCES = gomtest.c output.c dump_gom.c portability.c
-gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-gomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
+gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs -L../../utf8/.libs
+gomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools
 
 updatetest_SOURCES = update.c output.c portability.c
-updatetest_LDFLAGS = -L../../gedcom/.libs
-updatetest_LDADD = -lgedcom @INTLLIBS@
+updatetest_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
+updatetest_LDADD = -lgedcom -lutf8tools
 
 updategomtest_SOURCES = update_gom.c output.c dump_gom.c portability.c
-updategomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-updategomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
+updategomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
+                        -L../../utf8/.libs
+updategomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools
 
 writegomtest_SOURCES = gom_write.c output.c portability.c
-writegomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-writegomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
+writegomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
+                       -L../../utf8/.libs
+writegomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools
 
 testintl_SOURCES = testintl.c output.c
-testintl_LDFLAGS = -L../../gedcom/.libs
-testintl_LDADD = -lgedcom @INTLLIBS@
+testintl_LDFLAGS = -L../../gedcom/.libs -L../../utf8/.libs
+testintl_LDADD = -lgedcom -lutf8tools @INTLLIBS@
 
-TEST_SCRIPT=test_script test_gom test_update test_intl test_updategom test_writegom
+TEST_SCRIPT=test_script test_gom test_update test_intl test_updategom test_writegom test_prologue.sh test_bulk.sh
 
 EXTRA_DIST=$(TEST_SCRIPT)
diff --git a/t/src/standalone.c b/t/src/standalone.c
index 9c22284..2456a84 100644
--- a/t/src/standalone.c
+++ b/t/src/standalone.c
@@ -30,7 +30,7 @@
 #include <locale.h>
 #include <errno.h>
 #include <iconv.h>
-#include "utf8.h"
+#include "utf8tools.h"
 
 #define BOGUS_FILE_NAME "bogus.ged"
 int total_conv_fails = 0;
diff --git a/t/src/test_bulk.sh b/t/src/test_bulk.sh
index 4712041..1c2fee2 100644
--- a/t/src/test_bulk.sh
+++ b/t/src/test_bulk.sh
@@ -3,7 +3,7 @@
 # Common test part for the test scripts
 
 ltcmd="$builddir/../libtool --mode=execute"
-for lib in $test_libs
+for lib in $test_libs $builddir/../utf8/libutf8tools.la
 do
   ltcmd="$ltcmd -dlopen $lib"
 done
-- 
2.30.2