5 files changed, 86 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 2df5be262..8dd8372c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -434,6 +434,11 @@ libicu_a_SOURCES = \
 	src/lib/icu/Collate.cxx src/lib/icu/Collate.hxx \
 	src/lib/icu/Error.cxx src/lib/icu/Error.hxx
 
+if HAVE_ICU
+libicu_a_SOURCES += \
+	src/lib/icu/Init.cxx src/lib/icu/Init.hxx
+endif
+
 ICU_LDADD = libicu.a $(ICU_LIBS)
 
 # PCM library
diff --git a/src/Main.cxx b/src/Main.cxx
index 79fc9d601..5a33e121b 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -57,7 +57,7 @@
 #include "util/Domain.hxx"
 #include "thread/Id.hxx"
 #include "thread/Slack.hxx"
-#include "lib/icu/Collate.hxx"
+#include "lib/icu/Init.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/ConfigData.hxx"
 #include "config/ConfigDefaults.hxx"
@@ -430,7 +430,7 @@ int mpd_main(int argc, char *argv[])
 #endif
 #endif
 
-	if (!IcuCollateInit(error)) {
+	if (!IcuInit(error)) {
 		LogError(error);
 		return EXIT_FAILURE;
 	}
@@ -696,7 +696,7 @@ int mpd_main(int argc, char *argv[])
 	WSACleanup();
 #endif
 
-	IcuCollateFinish();
+	IcuFinish();
 
 	log_deinit();
 	return EXIT_SUCCESS;
diff --git a/src/lib/icu/Collate.cxx b/src/lib/icu/Collate.cxx
index 4d1526b28..f6621eb21 100644
--- a/src/lib/icu/Collate.cxx
+++ b/src/lib/icu/Collate.cxx
@@ -43,10 +43,11 @@
 static UCollator *collator;
 #endif
 
+#ifdef HAVE_ICU
+
 bool
 IcuCollateInit(Error &error)
 {
-#ifdef HAVE_ICU
 	assert(collator == nullptr);
 	assert(!error.IsDefined());
 
@@ -57,9 +58,6 @@ IcuCollateInit(Error &error)
 			     "ucol_open() failed: %s", u_errorName(code));
 		return false;
 	}
-#else
-	(void)error;
-#endif
 
 	return true;
 }
@@ -67,15 +65,11 @@ IcuCollateInit(Error &error)
 void
 IcuCollateFinish()
 {
-#ifdef HAVE_ICU
 	assert(collator != nullptr);
 
 	ucol_close(collator);
-#endif
 }
 
-#ifdef HAVE_ICU
-
 static WritableBuffer<UChar>
 UCharFromUTF8(const char *src)
 {
diff --git a/src/lib/icu/Init.cxx b/src/lib/icu/Init.cxx
new file mode 100644
index 000000000..e6c0814d8
--- /dev/null
+++ b/src/lib/icu/Init.cxx
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Init.hxx"
+#include "Collate.hxx"
+
+bool
+IcuInit(Error &error)
+{
+	return IcuCollateInit(error);
+}
+
+void
+IcuFinish()
+{
+	IcuCollateFinish();
+}
diff --git a/src/lib/icu/Init.hxx b/src/lib/icu/Init.hxx
new file mode 100644
index 000000000..9f585e2bd
--- /dev/null
+++ b/src/lib/icu/Init.hxx
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_ICU_INIT_HXX
+#define MPD_ICU_INIT_HXX
+
+#include "check.h"
+
+class Error;
+
+#ifdef HAVE_ICU
+
+bool
+IcuInit(Error &error);
+
+void
+IcuFinish();
+
+#else
+
+static inline bool IcuInit(Error &) { return true; }
+static inline void IcuFinish() {}
+
+#endif
+
+#endif