- updated to 2.3.2

[packages/aMule.git] / aMule-ac.patch

diff --git a/aMule-ac.patch b/aMule-ac.patch
index d24a77315ba04d6ad6a5db503b54084f0ae5deca..e365c9870db8ff22c87e9c93345dfc4779a5becb 100644 (file)
--- a/aMule-ac.patch
+++ b/aMule-ac.patch
@@ -1,16 +1,10 @@
-diff -Nur aMule-2.3.1-orig/m4/libpng.m4 aMule-2.3.1/m4/libpng.m4
---- aMule-2.3.1-orig/m4/libpng.m4      2011-10-08 21:05:07.000000000 +0200
-+++ aMule-2.3.1/m4/libpng.m4   2012-02-05 14:08:00.000000000 +0100
-@@ -95,9 +95,9 @@
-                       SAVED_LDFLAGS=$LDFLAGS
-                       SAVED_LIBS=$LIBS
+--- aMule-2.3.2/m4/nls.m4.orig 2016-09-16 09:55:06.000000000 +0200
++++ aMule-2.3.2/m4/nls.m4      2017-06-07 15:45:13.860893406 +0200
+@@ -85,7 +85,6 @@
+       AM_GNU_GETTEXT([no-libtool], [need-ngettext])
+       AS_IF([test $USE_INCLUDED_LIBINTL = yes], [INCINTL=-I\${top_builddir}/intl])
  
--                      CFLAGS+=" $LIBPNG_CFLAGS"
--                      LDFLAGS+=" $LIBPNG_LDFLAGS"
--                      LIBS+=" $LIBPNG_LIBS"
-+                      CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
-+                      LDFLAGS="$LDFLAGS $LIBPNG_LDFLAGS"
-+                      LIBS="$LIBS $LIBPNG_LIBS"
+-      AS_IF([test x$USE_NLS = xyes], [MULE_CHECK_AUTOPOINT(, [USE_NLS=no])])
+       AS_IF([test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes], [MULE_WARNING([You need to install GNU gettext/gettext-tools to compile aMule with i18n support.])])
  
-                       AC_LINK_IFELSE([
-                               AC_LANG_PROGRAM([[
+       AS_IF([test ${USE_NLS:-no} = yes], [