blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
configure.in
View File

@ -29,6 +29,16 @@ AC_PROG_CC
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AM_PROG_LIBTOOL 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 # Gettext
ALL_LINGUAS="fr es cs" ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT AM_GNU_GETTEXT
@ -300,8 +310,10 @@ if test "x$enable_gnutls" = "xyes" ; then
*** ftp://ftp.gnutls.org/pub/gnutls/ *** ftp://ftp.gnutls.org/pub/gnutls/
*** WeeChat will be built without GnuTLS support.]])) *** WeeChat will be built without GnuTLS support.]]))
if test "x$found_gnutls" = "xyes" ; then if test "x$found_gnutls" = "xyes" ; then
GNUTLS_LIBS="-lgnutls" GNUTLS_CFLAGS=`libgnutls-config --cflags`
AC_SUBST(GNUTLS_LIBS) GNUTLS_LFLAGS=`libgnutls-config --libs`
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LFLAGS)
AC_DEFINE(HAVE_GNUTLS) AC_DEFINE(HAVE_GNUTLS)
else else
enable_gnutls="no" enable_gnutls="no"
@ -312,22 +324,6 @@ fi
# general vars # 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 if test "x$enable_perl_nothread" = "xyes" ; then
AC_DEFINE(PERL_NOTHREAD) AC_DEFINE(PERL_NOTHREAD)
fi fi
@ -365,9 +361,17 @@ if test "x$debug" = "x2" ; then
AC_DEFINE(DEBUG) AC_DEFINE(DEBUG)
fi fi
# for FreeBSD case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
LIBS="$LIBS $INTLLIBS" LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS" CFLAGS="$CFLAGS $CPPFLAGS"
;;
*)
;;
esac
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# output Makefiles # output Makefiles

2
src/common/Makefile.am
View File

@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 noinst_LIBRARIES = lib_weechat_main.a

2
src/gui/curses/Makefile.am
View File

@ -24,7 +24,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
../../irc/lib_weechat_irc.a \ ../../irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \ $(PLUGINS_LIBS) \
$(NCURSES_LIBS) \ $(NCURSES_LIBS) \
$(GNUTLS_LIBS) $(GNUTLS_LFLAGS)
weechat_curses_SOURCES = gui-display.c \ weechat_curses_SOURCES = gui-display.c \
gui-input.c gui-input.c

1
src/gui/wxwidgets/Makefile.am
View File

@ -22,7 +22,6 @@ bin_PROGRAMS = weechat-wxwidgets
weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \ weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \ ../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \ ../../irc/lib_weechat_irc.a \
$(WXWIDGETS_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_wxwidgets_SOURCES = gui-display.c \ weechat_wxwidgets_SOURCES = gui-display.c \

2
src/irc/Makefile.am
View File

@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 noinst_LIBRARIES = lib_weechat_irc.a

42
weechat/configure.in
View File

@ -29,6 +29,16 @@ AC_PROG_CC
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AM_PROG_LIBTOOL 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 # Gettext
ALL_LINGUAS="fr es cs" ALL_LINGUAS="fr es cs"
AM_GNU_GETTEXT AM_GNU_GETTEXT
@ -300,8 +310,10 @@ if test "x$enable_gnutls" = "xyes" ; then
*** ftp://ftp.gnutls.org/pub/gnutls/ *** ftp://ftp.gnutls.org/pub/gnutls/
*** WeeChat will be built without GnuTLS support.]])) *** WeeChat will be built without GnuTLS support.]]))
if test "x$found_gnutls" = "xyes" ; then if test "x$found_gnutls" = "xyes" ; then
GNUTLS_LIBS="-lgnutls" GNUTLS_CFLAGS=`libgnutls-config --cflags`
AC_SUBST(GNUTLS_LIBS) GNUTLS_LFLAGS=`libgnutls-config --libs`
AC_SUBST(GNUTLS_CFLAGS)
AC_SUBST(GNUTLS_LFLAGS)
AC_DEFINE(HAVE_GNUTLS) AC_DEFINE(HAVE_GNUTLS)
else else
enable_gnutls="no" enable_gnutls="no"
@ -312,22 +324,6 @@ fi
# general vars # 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 if test "x$enable_perl_nothread" = "xyes" ; then
AC_DEFINE(PERL_NOTHREAD) AC_DEFINE(PERL_NOTHREAD)
fi fi
@ -365,9 +361,17 @@ if test "x$debug" = "x2" ; then
AC_DEFINE(DEBUG) AC_DEFINE(DEBUG)
fi fi
# for FreeBSD case "$host_os" in
freebsd*)
if test "x$enable_perl" = "xyes" -o "x$enable_python" = "xyes" ; then
CFLAGS="$CFLAGS -pthread"
fi
LIBS="$LIBS $INTLLIBS" LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS" CFLAGS="$CFLAGS $CPPFLAGS"
;;
*)
;;
esac
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# output Makefiles # output Makefiles

2
weechat/src/common/Makefile.am
View File

@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 noinst_LIBRARIES = lib_weechat_main.a

2
weechat/src/gui/curses/Makefile.am
View File

@ -24,7 +24,7 @@ weechat_curses_LDADD = ../gui-common.o ../gui-keyboard.o \
../../irc/lib_weechat_irc.a \ ../../irc/lib_weechat_irc.a \
$(PLUGINS_LIBS) \ $(PLUGINS_LIBS) \
$(NCURSES_LIBS) \ $(NCURSES_LIBS) \
$(GNUTLS_LIBS) $(GNUTLS_LFLAGS)
weechat_curses_SOURCES = gui-display.c \ weechat_curses_SOURCES = gui-display.c \
gui-input.c gui-input.c

1
weechat/src/gui/wxwidgets/Makefile.am
View File

@ -22,7 +22,6 @@ bin_PROGRAMS = weechat-wxwidgets
weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \ weechat_wxwidgets_LDADD = ../lib_weechat_gui_common.a \
../../common/lib_weechat_main.a \ ../../common/lib_weechat_main.a \
../../irc/lib_weechat_irc.a \ ../../irc/lib_weechat_irc.a \
$(WXWIDGETS_LIBS) \
../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS)
weechat_wxwidgets_SOURCES = gui-display.c \ weechat_wxwidgets_SOURCES = gui-display.c \

2
weechat/src/irc/Makefile.am
View File

@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 noinst_LIBRARIES = lib_weechat_irc.a