CONFIGURE_ARGS+= \
--with-debug=0 \
- --with-libgnutls-prefix=$(STAGING_DIR)/usr \
--without-doc-xsl-prefix \
--with-libiconv-prefix="$(ICONV_PREFIX)" \
--without-libintl-prefix \
-Index: weechat-0.2.5/configure
-===================================================================
---- weechat-0.2.5.orig/configure 2007-06-30 17:15:36.000000000 +0200
-+++ weechat-0.2.5/configure 2007-06-30 17:15:36.000000000 +0200
-@@ -29349,8 +29349,7 @@
+--- a/configure
++++ b/configure
+@@ -29625,8 +29625,7 @@ echo $ECHO_N "checking for iconv usabili
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29407,7 +29406,6 @@
+@@ -29683,7 +29682,6 @@ echo "${ECHO_T}no" >&6; }
echo "${ECHO_T}yes" >&6; }
fi
fi
if test "x$iconv_found" = "xno" ; then
{ { echo "$as_me:$LINENO: error:
*** Iconv headers and/or libraries couldn't be found in your system.
-@@ -29416,8 +29414,7 @@
+@@ -29692,8 +29690,7 @@ if test "x$iconv_found" = "xno" ; then
echo "$as_me: error:
*** Iconv headers and/or libraries couldn't be found in your system.
*** Try to install them with your software package manager.
fi
# ------------------------------------------------------------------------------
+--- a/configure.in
++++ b/configure.in
+@@ -208,22 +208,8 @@ if test "x$ac_found_iconv_header" = "xye
+ if test "x$ac_found_iconv_lib" = "xyes" ; then
+ ICONV_LFLAGS="-liconv"
+ LIBS="$LIBS $ICONV_LFLAGS"
++ iconv_found="yes"
+ fi
+- AC_MSG_CHECKING(for iconv usability in programs)
+- AC_TRY_RUN([
+- #include <iconv.h>
+- int main(int argc, char **argv) {
+- iconv_t conv = iconv_open("ISO8859-1", "UTF-8");
+- if (conv != (iconv_t) -1) {
+- return 0;
+- }
+- return 1;
+- }],iconv_found="yes")
+- if test "x$iconv_found" = "xno" ; then
+- AC_MSG_RESULT(no)
+- else
+- AC_MSG_RESULT(yes)
+- fi
+ fi
+
+ if test "x$iconv_found" = "xno" ; then
-diff -urN weechat-0.2.6/configure weechat-0.2.6.new/configure
---- weechat-0.2.6/configure 2007-09-05 16:16:21.000000000 +0200
-+++ weechat-0.2.6.new/configure 2008-01-20 16:29:38.000000000 +0100
-@@ -30180,14 +30180,6 @@
+--- a/configure
++++ b/configure
+@@ -30177,14 +30177,6 @@ fi
test -n "$LUACONFIG" && break
done
--- /dev/null
+--- a/configure.in
++++ b/configure.in
+@@ -176,21 +176,7 @@ fi
+ # WXWIDGETS_LIBS=""
+ #fi
+
+-if test "x$enable_gtk" = "xyes" ; then
+- AM_PATH_GTK_2_0(2.4.0, LIBGTK_FOUND=1, LIBGTK_FOUND=0)
+- if test "$LIBGTK_FOUND" = "0" ; then
+- AC_MSG_WARN([
+-*** Gtk library not found!
+-*** WeeChat will be built without Gtk support.])
+- enable_gtk="no"
+- not_found="$not_found gtk"
+- else
+- GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
+- GTK_LIBS=`pkg-config --libs gtk+-2.0`
+- AC_SUBST(GTK_CFLAGS)
+- AC_SUBST(GTK_LIBS)
+- fi
+-fi
++enable_gtk="no"
+
+ # ------------------------------------------------------------------------------
+ # iconv
+@@ -586,20 +572,11 @@ fi
+ # ------------------------------------------------------------------------------
+
+ if test "x$enable_gnutls" = "xyes" ; then
+- 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_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"
+- not_found="$not_found gnutls"
+- fi
++ GNUTLS_CFLAGS=`pkg-config --cflags gnutls`
++ GNUTLS_LFLAGS=`pkg-config --libs gnutls`
++ AC_SUBST(GNUTLS_CFLAGS)
++ AC_SUBST(GNUTLS_LFLAGS)
++ AC_DEFINE(HAVE_GNUTLS)
+ fi
+
+ # ------------------------------------------------------------------------------