From 5e8b47f187bcb26b187694b915177abe431c683b Mon Sep 17 00:00:00 2001 From: Julien Louis Date: Wed, 22 Jun 2005 18:50:24 +0000 Subject: [PATCH] * Add --disable-gnutls option to turn off gnutls support * Remove wxwidgets checks when --enable-wxwidgets arg is not given --- configure.in | 16 +++++++++++++--- weechat/configure.in | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 107dd5cb5..f9425a634 100644 --- a/configure.in +++ b/configure.in @@ -36,9 +36,6 @@ AM_GNU_GETTEXT # Checks for libraries. AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) -AM_OPTIONS_WXCONFIG -AM_PATH_WXCONFIG(2.3.4, wxWin=1) - # Checks for header files. 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]) @@ -77,6 +74,7 @@ AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (defaul AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=$enableval,enable_qt=no) AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=$enableval,enable_perl=no) AC_ARG_ENABLE(python, [ --enable-python Turn on Python plugins (default=no)],enable_python=$enableval,enable_python=no) +AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=yes)], enable_gnutls=no,enable_gnutls=yes) AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) enable_plugins="no" @@ -102,6 +100,9 @@ if test "x$enable_ncurses" = "xyes" ; then fi if test "x$enable_wxwidgets" = "xyes" ; then + AM_OPTIONS_WXCONFIG + AM_PATH_WXCONFIG(2.3.4, wxWin=1) + if test "$wxWin" != 1; then AC_MSG_ERROR([ *** wxWindows must be installed on your system @@ -228,6 +229,14 @@ fi AC_SUBST(PLUGINS_LIBS) +if test "x$enable_gnutls" = "xyes" ; then + AM_PATH_LIBGNUTLS( 1.0.0,, AC_MSG_ERROR([[ + *** + *** libgnutls was not found. You may want to get it from + *** ftp://ftp.gnutls.org/pub/gnutls/ + ]])) +fi + CFLAGS=`echo $CFLAGS | sed s/-g//g` if test "x$CFLAGS" = "x" ; then CFLAGS="-O2" @@ -300,6 +309,7 @@ echo Build with Plugin support..... : $enable_plugins echo Build with Perl support....... : $enable_perl echo Build with Python support..... : $enable_python echo Build with Ruby support....... : $enable_ruby +echo Build with GNUtls support..... : $enable_gnutls echo echo Compile with debug info....... : $msg_debug_compiler echo Print debugging messages...... : $msg_debug_verbose diff --git a/weechat/configure.in b/weechat/configure.in index 107dd5cb5..f9425a634 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -36,9 +36,6 @@ AM_GNU_GETTEXT # Checks for libraries. AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) -AM_OPTIONS_WXCONFIG -AM_PATH_WXCONFIG(2.3.4, wxWin=1) - # Checks for header files. 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]) @@ -77,6 +74,7 @@ AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (defaul AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=$enableval,enable_qt=no) AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=$enableval,enable_perl=no) AC_ARG_ENABLE(python, [ --enable-python Turn on Python plugins (default=no)],enable_python=$enableval,enable_python=no) +AC_ARG_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=yes)], enable_gnutls=no,enable_gnutls=yes) AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) enable_plugins="no" @@ -102,6 +100,9 @@ if test "x$enable_ncurses" = "xyes" ; then fi if test "x$enable_wxwidgets" = "xyes" ; then + AM_OPTIONS_WXCONFIG + AM_PATH_WXCONFIG(2.3.4, wxWin=1) + if test "$wxWin" != 1; then AC_MSG_ERROR([ *** wxWindows must be installed on your system @@ -228,6 +229,14 @@ fi AC_SUBST(PLUGINS_LIBS) +if test "x$enable_gnutls" = "xyes" ; then + AM_PATH_LIBGNUTLS( 1.0.0,, AC_MSG_ERROR([[ + *** + *** libgnutls was not found. You may want to get it from + *** ftp://ftp.gnutls.org/pub/gnutls/ + ]])) +fi + CFLAGS=`echo $CFLAGS | sed s/-g//g` if test "x$CFLAGS" = "x" ; then CFLAGS="-O2" @@ -300,6 +309,7 @@ echo Build with Plugin support..... : $enable_plugins echo Build with Perl support....... : $enable_perl echo Build with Python support..... : $enable_python echo Build with Ruby support....... : $enable_ruby +echo Build with GNUtls support..... : $enable_gnutls echo echo Compile with debug info....... : $msg_debug_compiler echo Print debugging messages...... : $msg_debug_verbose