Version 0.2.6.3

CMakeLists.txt

@@ -24,7 +24,7 @@ IF(PREFIX)
   SET(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix" FORCE)
 ENDIF(PREFIX)
 
-SET(VERSION 0.2.6.2)
+SET(VERSION 0.2.6.3)
 SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/weechat)
 SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share/weechat)

ChangeLog

@@ -1,9 +1,13 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2009-04-18
+ChangeLog - 2009-06-13
 
 
+Version 0.2.6.3 (2009-06-13):
+   * fix gnutls detection (use pkg-config instead of libgnutls-config)
+     (bug #26790)
+
 Version 0.2.6.2 (2009-04-18):
    * fix bug with charset decoding (for example with iso2022jp)
 

NEWS

@@ -1,6 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
+* FlashCode, 2009-06-13
+
+    WeeChat 0.2.6.3 released.
+
+    This version fixes gnutls detection.
+
 * FlashCode, 2009-04-18
 
     WeeChat 0.2.6.2 released.

cmake/FindGnuTLS.cmake

@@ -30,19 +30,21 @@ IF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
    set(GNUTLS_FIND_QUIETLY TRUE)
 ENDIF(GNUTLS_INCLUDE_PATH AND GNUTLS_LIBRARY)
 
-FIND_PROGRAM(GNUTLS_CONFIG_EXECUTABLE NAMES libgnutls-config)
+FIND_PROGRAM(PKG_CONFIG_EXECUTABLE NAMES pkg-config)
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --prefix
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix gnutls
    OUTPUT_VARIABLE GNUTLS_PREFIX
 )
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --cflags
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --cflags gnutls
    OUTPUT_VARIABLE GNUTLS_CFLAGS
 )
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_CFLAGS "${GNUTLS_FLAGS}")
 
-EXECUTE_PROCESS(COMMAND ${GNUTLS_CONFIG_EXECUTABLE} --libs
+EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --libs gnutls
    OUTPUT_VARIABLE GNUTLS_LDFLAGS
 )
+STRING(REGEX REPLACE "[\r\n]" "" GNUTLS_LDFLAGS "${GNUTLS_LDFLAGS}")
 
 SET(GNUTLS_POSSIBLE_INCLUDE_PATH "${GNUTLS_PREFIX}/include")
 SET(GNUTLS_POSSIBLE_LIB_DIR "${GNUTLS_PREFIX}/lib")

configure.in

@@ -18,10 +18,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.56)
-AC_INIT(WeeChat, 0.2.6.2, flashcode@flashtux.org)
+AC_INIT(WeeChat, 0.2.6.3, flashcode@flashtux.org)
 AC_CONFIG_SRCDIR([src/common/weechat.c])
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([weechat], [0.2.6.2])
+AM_INIT_AUTOMAKE([weechat], [0.2.6.3])
 
 # Checks for programs
 AC_PROG_CC
@@ -600,20 +600,28 @@ fi
 # ------------------------------------------------------------------------------
 
 if test "x$enable_gnutls" = "xyes" ; then
-    found_gnutls="no"
-    AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[
+   AC_CHECK_HEADER(gnutls/gnutls.h,ac_found_gnutls_header="yes",ac_found_gnutls_header="no")
+   AC_CHECK_LIB(gnutls,gnutls_global_init,ac_found_gnutls_lib="yes",ac_found_gnutls_lib="no")
+
+   AC_MSG_CHECKING(for gnutls headers and librairies)
+   if test "x$ac_found_gnutls_header" = "xno" -o "x$ac_found_gnutls_lib" = "xno" ; then
+      AC_MSG_RESULT(no)
+      AC_MSG_WARN([
 *** libgnutls was not found. You may want to get it from ftp://ftp.gnutls.org/pub/gnutls/
-*** WeeChat will be built without GnuTLS support.]]))
-    if test "x$found_gnutls" = "xyes" ; then
-        GNUTLS_CFLAGS=`libgnutls-config --cflags`
-        GNUTLS_LFLAGS=`libgnutls-config --libs`
+*** WeeChat will be built without GnuTLS support.])
+      enable_gnutls="no"
+      not_found="$not_found gnutls"
+    else
+	AC_MSG_RESULT(yes)
+        GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
+        GNUTLS_LFLAGS=`pkg-config gnutls --libs`
         AC_SUBST(GNUTLS_CFLAGS)
         AC_SUBST(GNUTLS_LFLAGS)
         AC_DEFINE(HAVE_GNUTLS)
-    else
-        enable_gnutls="no"
-        not_found="$not_found gnutls"
+        CFLAGS="$CFLAGS -DHAVE_GNUTLS"
     fi
+else
+    not_asked="$not_asked gnutls"
 fi
 
 # ------------------------------------------------------------------------------

weechat.spec

@@ -17,7 +17,7 @@
 #
 
 %define name weechat
-%define version 0.2.6.2
+%define version 0.2.6.3
 %define release 1
 
 Name:      %{name}
@@ -67,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/%{name}/weechat_quickstart*
 
 %changelog
+* Sat Jun 13 2009 FlashCode <flashcode@flashtux.org> 0.2.6.3-1
+- Released version 0.2.6.3
 * Sat Apr 18 2009 FlashCode <flashcode@flashtux.org> 0.2.6.2-1
 - Released version 0.2.6.2
 * Sat Mar 14 2009 FlashCode <flashcode@flashtux.org> 0.2.6.1-1