blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some compile erros on OpenBSD and NetBSD

Browse Source
This commit is contained in:
Emmanuel Bouthenot 2006-05-20 18:48:13 +00:00
parent ec9da8cc85
commit 545fa4c332
4 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.in
View File

@ -56,7 +56,12 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
# Checks for header files # Checks for header files
AC_HEADER_STDC 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]) 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 # Checks for typedefs, structures, and compiler characteristics
AC_HEADER_TIME AC_HEADER_TIME
@ -552,7 +557,7 @@ fi
LIBS="$LIBS $INTLLIBS" LIBS="$LIBS $INTLLIBS"
case "$host_os" in case "$host_os" in
freebsd* | netbsd*) freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread" CFLAGS="$CFLAGS -pthread"
fi fi
@ -563,6 +568,14 @@ openbsd*)
CFLAGS="$CFLAGS -pthread" CFLAGS="$CFLAGS -pthread"
fi fi
;; ;;
netbsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
CFLAGS="$CFLAGS $CPPFLAGS"
# bad hack
LDFLAGS="$LDFLAGS -liconv"
;;
gnu*) gnu*)
if test "x$enable_plugins" = "xyes" ; then if test "x$enable_plugins" = "xyes" ; then
LDFLAGS="$LDFLAGS -lpthread" LDFLAGS="$LDFLAGS -lpthread"

5
src/common/utf8.c
View File

@ -27,7 +27,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define __USE_XOPEN #define __USE_XOPEN
#if defined(__OpenBSD__)
#include <utf8/wchar.h>
#else
#include <wchar.h> #include <wchar.h>
#endif
#include "weechat.h" #include "weechat.h"
#include "utf8.h" #include "utf8.h"

17
weechat/configure.in
View File

@ -56,7 +56,12 @@ AC_CHECK_LIB(ncursesw, initscr, LIBNCURSESW_FOUND=1, LIBNCURSESW_FOUND=0)
# Checks for header files # Checks for header files
AC_HEADER_STDC 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]) 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 # Checks for typedefs, structures, and compiler characteristics
AC_HEADER_TIME AC_HEADER_TIME
@ -552,7 +557,7 @@ fi
LIBS="$LIBS $INTLLIBS" LIBS="$LIBS $INTLLIBS"
case "$host_os" in case "$host_os" in
freebsd* | netbsd*) freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread" CFLAGS="$CFLAGS -pthread"
fi fi
@ -563,6 +568,14 @@ openbsd*)
CFLAGS="$CFLAGS -pthread" CFLAGS="$CFLAGS -pthread"
fi fi
;; ;;
netbsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
CFLAGS="$CFLAGS $CPPFLAGS"
# bad hack
LDFLAGS="$LDFLAGS -liconv"
;;
gnu*) gnu*)
if test "x$enable_plugins" = "xyes" ; then if test "x$enable_plugins" = "xyes" ; then
LDFLAGS="$LDFLAGS -lpthread" LDFLAGS="$LDFLAGS -lpthread"

5
weechat/src/common/utf8.c
View File

@ -27,7 +27,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define __USE_XOPEN #define __USE_XOPEN
#if defined(__OpenBSD__)
#include <utf8/wchar.h>
#else
#include <wchar.h> #include <wchar.h>
#endif
#include "weechat.h" #include "weechat.h"
#include "utf8.h" #include "utf8.h"