weechat-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Weechat-cvs] weechat configure.in


From: kolter
Subject: [Weechat-cvs] weechat configure.in
Date: Thu, 15 Jun 2006 09:04:12 +0000

CVSROOT:        /sources/weechat
Module name:    weechat
Changes by:     kolter <kolter> 06/06/15 09:04:12

Modified files:
        .              : configure.in 

Log message:
        add iconv/libiconv detection

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/weechat/configure.in?cvsroot=weechat&r1=1.123&r2=1.124

Patches:
Index: configure.in
===================================================================
RCS file: /sources/weechat/weechat/configure.in,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- configure.in        11 Jun 2006 02:28:23 -0000      1.123
+++ configure.in        15 Jun 2006 09:04:12 -0000      1.124
@@ -188,6 +188,42 @@
 fi
 
 # 
------------------------------------------------------------------------------
+#                                  iconv
+# 
------------------------------------------------------------------------------
+
+iconv_found="no"
+
+AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
+if test "x$ac_found_iconv_header" = "xyes" ; then
+   
AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
+   if test "x$ac_found_iconv_lib" = "xyes" ; then
+      LIBS="$LIBS -liconv"
+   fi
+   AC_MSG_CHECKING(for iconv usability in programs)   
+   AC_TRY_RUN([
+       #include <iconv.h>
+       int main(int argc, char **argv) {
+           iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
+            if (conv != (iconv_t) -1) {
+             return 0;
+            }
+           return 1;
+      }],iconv_found="yes")
+  if test "x$iconv_found" = "xno" ; then
+     AC_MSG_RESULT(no)
+  else
+     AC_MSG_RESULT(yes)
+  fi
+fi
+
+if test "x$iconv_found" = "xno" ; then
+   AC_MSG_ERROR([
+*** Iconv headers and/or libraries couldn't be found in your system.
+*** Try to install them with your software package manager.
+*** WeeChat can't be built without Iconv support.])
+fi
+
+# 
------------------------------------------------------------------------------
 #                                   plugins
 # 
------------------------------------------------------------------------------
 
@@ -632,8 +668,6 @@
           CFLAGS="$CFLAGS -pthread"
         fi
         CFLAGS="$CFLAGS $CPPFLAGS"
-       # bad hack
-       LDFLAGS="$LDFLAGS -liconv"
        ;;
 gnu*)  
        if test "x$enable_plugins" = "xyes" ; then




reply via email to

[Prev in Thread] Current Thread [Next in Thread]