pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-24 20:06:38 +02:00
Code Activity

fix detection of libgnutls

Browse Source
This commit is contained in:
Emmanuel Bouthenot
2005-10-29 17:56:50 +00:00
parent 5551542566
commit dec92aeba6
10 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+26 -22
View File
@@ -29,6 +29,16 @@ AC_PROG_CC
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
# Add some flags for some OS
case "$host_os" in
freebsd* | openbsd*)
CFLAGS="$CFLAGS -I/usr/local/include"
LFLAGS="$LFLAGS -L/usr/local/lib"
;;
*)
;;
esac
# Gettext
ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT
@@ -300,9 +310,11 @@ if test "x$enable_gnutls" = "xyes" ; then
*** ftp://ftp.gnutls.org/pub/gnutls/
*** WeeChat will be built without GnuTLS support.]]))
if test "x$found_gnutls" = "xyes" ; then
GNUTLS_LIBS="-lgnutls"
AC_SUBST(GNUTLS_LIBS)
AC_DEFINE(HAVE_GNUTLS)
GNUTLS_CFLAGS=`libgnutls-config --cflags`
GNUTLS_LFLAGS=`libgnutls-config --libs`
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LFLAGS)
AC_DEFINE(HAVE_GNUTLS)
else
enable_gnutls="no"
fi
@@ -312,22 +324,6 @@ fi
# general vars
# ------------------------------------------------------------------------------
case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
openbsd*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
*)
;;
esac
if test "x$enable_perl_nothread" = "xyes" ; then
AC_DEFINE(PERL_NOTHREAD)
fi
@@ -365,9 +361,17 @@ if test "x$debug" = "x2" ; then
AC_DEFINE(DEBUG)
fi
# for FreeBSD
LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS"
case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS"
;;
*)
;;
esac
# ------------------------------------------------------------------------------
# output Makefiles
src/common/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)
noinst_LIBRARIES = lib_weechat_main.a
src/gui/curses/Makefile.am
+1 -1
View File
@@ -24,7 +24,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
../../irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \
$(NCURSES_LIBS) \
$(GNUTLS_LIBS)
$(GNUTLS_LFLAGS)
weechat_curses_SOURCES = gui-display.c \
gui-input.c
src/gui/wxwidgets/Makefile.am
-1
View File
@@ -22,7 +22,6 @@ bin_PROGRAMS = weechat-wxwidgets
weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
$(WXWIDGETS_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_wxwidgets_SOURCES = gui-display.c \
src/irc/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)
noinst_LIBRARIES = lib_weechat_irc.a
weechat/configure.in
+26 -22
View File
@@ -29,6 +29,16 @@ AC_PROG_CC
AC_PROG_MAKE_SET
AM_PROG_LIBTOOL
# Add some flags for some OS
case "$host_os" in
freebsd* | openbsd*)
CFLAGS="$CFLAGS -I/usr/local/include"
LFLAGS="$LFLAGS -L/usr/local/lib"
;;
*)
;;
esac
# Gettext
ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT
@@ -300,9 +310,11 @@ if test "x$enable_gnutls" = "xyes" ; then
*** ftp://ftp.gnutls.org/pub/gnutls/
*** WeeChat will be built without GnuTLS support.]]))
if test "x$found_gnutls" = "xyes" ; then
GNUTLS_LIBS="-lgnutls"
AC_SUBST(GNUTLS_LIBS)
AC_DEFINE(HAVE_GNUTLS)
GNUTLS_CFLAGS=`libgnutls-config --cflags`
GNUTLS_LFLAGS=`libgnutls-config --libs`
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LFLAGS)
AC_DEFINE(HAVE_GNUTLS)
else
enable_gnutls="no"
fi
@@ -312,22 +324,6 @@ fi
# general vars
# ------------------------------------------------------------------------------
case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
openbsd*)
CFLAGS="$CFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
*)
;;
esac
if test "x$enable_perl_nothread" = "xyes" ; then
AC_DEFINE(PERL_NOTHREAD)
fi
@@ -365,9 +361,17 @@ if test "x$debug" = "x2" ; then
AC_DEFINE(DEBUG)
fi
# for FreeBSD
LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS"
case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS"
;;
*)
;;
esac
# ------------------------------------------------------------------------------
# output Makefiles
weechat/src/common/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)
noinst_LIBRARIES = lib_weechat_main.a
weechat/src/gui/curses/Makefile.am
+1 -1
View File
@@ -24,7 +24,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
../../irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \
$(NCURSES_LIBS) \
$(GNUTLS_LIBS)
$(GNUTLS_LFLAGS)
weechat_curses_SOURCES = gui-display.c \
gui-input.c
weechat/src/gui/wxwidgets/Makefile.am
-1
View File
@@ -22,7 +22,6 @@ bin_PROGRAMS = weechat-wxwidgets
weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \
$(WXWIDGETS_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_wxwidgets_SOURCES = gui-display.c \
weechat/src/irc/Makefile.am
+1 -1
View File
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GNUTLS_CFLAGS)
noinst_LIBRARIES = lib_weechat_irc.a