From 9f2627e8fc238b4768852c0c7e7febae567e7001 Mon Sep 17 00:00:00 2001
From: Shachar Shemesh <wine-patches@shemesh.biz>
Date: Tue, 6 Apr 2004 20:13:21 +0000
Subject: [PATCH] Static libraries names for ICU are libsicu*.a now. Add
 printout of the linking test.

---
 configure    | 10 ++++++++--
 configure.ac |  9 ++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index cf04fbdd12..27467ec704 100755
--- a/configure
+++ b/configure
@@ -10334,8 +10334,10 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes"
 then
     saved_libs="$LIBS"
     ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
-    ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}"
-    ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}"
+    ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}"
+    ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}"
+    echo "$as_me:$LINENO: checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB" >&5
+echo $ECHO_N "checking whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB... $ECHO_C" >&6
     LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10380,10 +10382,14 @@ _ACEOF
 
                  ICULIBS="$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
 
+                 echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 328ac834e1..b461aca026 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,12 +419,15 @@ if test "$ac_cv_header_unicode_ubidi_h" = "yes"
 then
     saved_libs="$LIBS"
     ICU_LIB_DIR="${ICU_LIB_DIR-/usr/lib}"
-    ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libicuuc.a}"
-    ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libicudata.a}"
+    ICUUC_LIB="${ICUUC_LIB-$ICU_LIB_DIR/libsicuuc.a}"
+    ICUDATA_LIB="${ICUDATA_LIB-$ICU_LIB_DIR/libsicudata.a}"
+    AC_MSG_CHECKING(whether can link with ICU libraries $ICUUC_LIB and $ICUDATA_LIB)
     LIBS="$LIBS $ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s"
     AC_TRY_LINK([#include <unicode/ubidi.h>],[ubidi_open()],
                 [AC_DEFINE(HAVE_ICU,1,[Define to 1 if the ICU libraries are installed])
-                 AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")])
+                 AC_SUBST(ICULIBS,"$ICUUC_LIB $ICUDATA_LIB -lstdc++ -lgcc_s")
+                 AC_MSG_RESULT(yes)],
+                [AC_MSG_RESULT(no)])
     LIBS="$saved_libs"
 fi