From bb12832c308af394d5b7420d33340e78b946ff02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Mon, 30 Jun 2014 10:35:33 +0200
Subject: [PATCH] added all combinations of runtime and builtin options

---
 .travis.yml       | 19 ++++++++++++++++---
 tools/Makefile.am |  2 +-
 tools/psl.c       |  5 ++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6b268be..59fa4b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,22 @@ compiler:
 script:
   - ./autogen.sh
   - ./configure && make -j4 && make check -j4
-  - ./configure --without-libicu && make clean && make -j4 && make check -j4
-  - ./configure --disable-builtin && make clean && make -j4 && make check -j4
-  - ./configure --disable-builtin --without-libicu && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libicu --enable-builtin=libicu && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libicu --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libicu --enable-builtin=libidn && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libicu --disable-builtin && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn2 --enable-builtin=libicu && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn2 --enable-builtin=libidn && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn2 --disable-builtin && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn --enable-builtin=libicu && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn --enable-builtin=libidn && make clean && make -j4 && make check -j4
+  - ./configure --enable-runtime=libidn --disable-builtin && make clean && make -j4 && make check -j4
+  - ./configure --disable-runtime --enable-builtin=libicu && make clean && make -j4 && make check -j4
+  - ./configure --disable-runtime --enable-builtin=libidn2 && make clean && make -j4 && make check -j4
+  - ./configure --disable-runtime --enable-builtin=libidn && make clean && make -j4 && make check -j4
+  - ./configure --disable-runtime --disable-builtin && make clean && make -j4 && make check -j4
   - ./configure --enable-gtk-doc && make -j4 && make check -j4
   - make distcheck
 before_install:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 73cf0a6..f758ccd 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = ../src/libpsl.la
 
 #if WITH_LIBICU
-#  LDADD += $(LIBICU_LIBS)
+#  LDADD += -licuuc
 #endif
 #if WITH_LIBIDN2
 #  LDADD += -lidn2
diff --git a/tools/psl.c b/tools/psl.c
index 976ada6..82618b5 100644
--- a/tools/psl.c
+++ b/tools/psl.c
@@ -37,10 +37,12 @@
 #include <string.h>
 #include <ctype.h>
 
+/*
 #ifdef WITH_LIBICU
 #	include <unicode/uloc.h>
 #	include <unicode/ucnv.h>
 #endif
+*/
 
 #include <libpsl.h>
 
@@ -217,11 +219,12 @@ int main(int argc, const char *const *argv)
 			printf("builtin compile time: %ld (%s)\n", psl_builtin_compile_time(), time2str(psl_builtin_compile_time()));
 			printf("builtin file time: %ld (%s)\n", psl_builtin_file_time(), time2str(psl_builtin_file_time()));
 			printf("builtin SHA1 file hash: %s\n", psl_builtin_sha1sum());
-
+/*
 #ifdef WITH_LIBICU
 			printf("uloc_getDefault=%s\n", uloc_getDefault());
 			printf("ucnv_getDefaultName=%s\n", ucnv_getDefaultName());
 #endif
+*/
 		} else
 			printf("No builtin PSL data available\n");
 	}