core: fix compilation under OpenBSD 5.0 (lib utf8 not needed any more) (bug #34727)

ChangeLog

@@ -7,6 +7,8 @@ v0.3.7-dev, 2011-11-12
 Version 0.3.7 (under dev!)
 --------------------------
 
+* core: fix compilation under OpenBSD 5.0 (lib utf8 not needed any more)
+  (bug #34727)
 * core: add new option weechat.completion.base_word_until_cursor: allow
   completion in middle of words (enabled by default) (task #9771)
 * core: add option "jump_last_buffer_displayed" for command /input

configure.in

@@ -70,11 +70,6 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/types.h unistd.h pwd.h errno.h regex.h wchar.h sys/file.h])
 
-if echo "$host_os" | grep "^openbsd" 1>/dev/null 2>&1 ; then
-   AC_CHECK_HEADER(utf8/wchar.h, LDFLAGS="$LDFLAGS -lutf8", [AC_MSG_ERROR([
-*** on OpenBSD systems, package libutf8 must be installed to compile WeeChat])])
-fi
-
 # Checks for typedefs, structures, and compiler characteristics
 AC_HEADER_TIME
 AC_STRUCT_TM

src/CMakeLists.txt

@@ -40,9 +40,6 @@ CHECK_INCLUDE_FILES("pwd.h" HAVE_PWD_H)
 CHECK_INCLUDE_FILES("errno.h" HAVE_ERRNO_H)
 CHECK_INCLUDE_FILES("wchar.h" HAVE_WCHAR_H)
 CHECK_INCLUDE_FILES("langinfo.h" HAVE_LANGINFO_CODESET)
-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-  CHECK_INCLUDE_FILES("utf8/wchar.h" HAVE_UTF8_WCHAR_H)
-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
 
 CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME)
 CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME)

src/core/wee-string.c

@@ -32,12 +32,7 @@
 #include <ctype.h>
 #include <wctype.h>
 #include <regex.h>
-
-#if defined(__OpenBSD__)
-#include <utf8/wchar.h>
-#else
 #include <wchar.h>
-#endif
 
 #ifdef HAVE_ICONV
 #include <iconv.h>

src/core/wee-utf8.h

@@ -24,11 +24,7 @@
 #define __USE_XOPEN
 #endif
 
-#if defined(__OpenBSD__)
-#include <utf8/wchar.h>
-#else
 #include <wchar.h>
-#endif
 
 extern int local_utf8;
 

src/gui/curses/CMakeLists.txt

@@ -51,10 +51,6 @@ IF(NCURSES_FOUND)
   LIST(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
 ENDIF(NCURSES_FOUND)
 
-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-  LIST(APPEND EXTRA_LIBS "utf8")
-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-
 IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
   IF(HAVE_BACKTRACE)
     LIST(APPEND EXTRA_LIBS "execinfo")