diff options
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | weechat/configure.in | 16 |
2 files changed, 20 insertions, 12 deletions
diff --git a/configure.in b/configure.in index b69a0d040..01cb01c30 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (defau 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_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=auto)],enable_gnutls=$enableval,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" @@ -232,14 +232,18 @@ 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/ - ]])) + found_gnutls="no" + AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[ +*** libgnutls was not found. You may want to get it from +*** 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) + else + enable_gnutls="no" + fi fi CFLAGS=`echo $CFLAGS | sed s/-g//g` diff --git a/weechat/configure.in b/weechat/configure.in index b69a0d040..01cb01c30 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -75,7 +75,7 @@ AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (defau 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_ENABLE(gnutls, [ --disable-gnutls Turn off gnutls support (default=auto)],enable_gnutls=$enableval,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" @@ -232,14 +232,18 @@ 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/ - ]])) + found_gnutls="no" + AM_PATH_LIBGNUTLS( 1.0.0, found_gnutls=yes, AC_MSG_WARN([[ +*** libgnutls was not found. You may want to get it from +*** 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) + else + enable_gnutls="no" + fi fi CFLAGS=`echo $CFLAGS | sed s/-g//g` |