File unshield-zlib_test.patch of Package unshield
diff -upr ../unshield-0.6-orig//m4/check_zlib.m4 ./m4/check_zlib.m4
--- ../unshield-0.6-orig//m4/check_zlib.m4 2004-03-15 13:37:23.000000000 +0000
+++ ./m4/check_zlib.m4 2009-12-04 11:23:08.695956978 +0000
@@ -31,13 +31,13 @@ AC_ARG_WITH(zlib,
[ --with-zlib=DIR root directory path of zlib installation [defaults to
/usr/local or /usr if not found in /usr/local]
--without-zlib to disable zlib usage completely],
-[if test "$withval" != no ; then
- AC_MSG_RESULT(yes)
+[if test "$withval" != "no" ; then
+ AC_MSG_RESULT([yes])
ZLIB_HOME="$withval"
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi], [
-AC_MSG_RESULT(yes)
+AC_MSG_RESULT([yes])
ZLIB_HOME=/usr/local
if test ! -f "${ZLIB_HOME}/include/zlib.h"
then
@@ -50,8 +50,8 @@ fi
#
if test -n "${ZLIB_HOME}"
then
- ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$LDFLAGS
+ ZLIB_OLD_LDFLAGS="$LDFLAGS"
+ ZLIB_OLD_CPPFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
AC_LANG_SAVE
@@ -65,17 +65,17 @@ then
# If both library and header were found, use them
#
AC_CHECK_LIB(z, inflateEnd)
- AC_MSG_CHECKING(zlib in ${ZLIB_HOME})
- AC_MSG_RESULT(ok)
+ AC_MSG_CHECKING([zlib in ${ZLIB_HOME}])
+ AC_MSG_RESULT([ok])
else
#
# If either header or library was not found, revert and bomb
#
- AC_MSG_CHECKING(zlib in ${ZLIB_HOME})
+ AC_MSG_CHECKING([zlib in ${ZLIB_HOME}])
LDFLAGS="$ZLIB_OLD_LDFLAGS"
CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
- AC_MSG_RESULT(failed)
- AC_MSG_ERROR(either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib])
fi
fi
diff -upr ../unshield-0.6-orig//Makefile.am ./Makefile.am
--- ../unshield-0.6-orig//Makefile.am 2008-02-15 16:36:33.000000000 +0000
+++ ./Makefile.am 2009-12-04 11:23:08.686814472 +0000
@@ -2,6 +2,7 @@
@SET_MAKE@
## don't complain about missing AUTHORS, NEWS, ChangeLog, etc
+ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.4
pcfiles = libunshield.pc