44de25c719
- Update to version 0.1.2 * This release adds RFC 5854 Metalink 4.0 support * adds dynamic attribute of the origin element in Metalink - libmetalink-autotools.patch : multiple pet peeves in autotools. OBS-URL: https://build.opensuse.org/request/show/142162 OBS-URL: https://build.opensuse.org/package/show/network:utilities/libmetalink?expand=0&rev=7
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -21,8 +21,6 @@
|
|
# THE SOFTWARE.
|
|
AC_PREREQ(2.61)
|
|
AC_INIT([libmetalink], [0.1.2], [t-tujikawa@users.sourceforge.net])
|
|
-LT_PREREQ([2.2.6])
|
|
-LT_INIT()
|
|
|
|
dnl See versioning rule:
|
|
dnl http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
|
@@ -63,7 +61,10 @@ AC_ARG_ENABLE([gcc-visibility],
|
|
[gcc_visibility=$withval], [gcc_visibility=no])
|
|
|
|
# Checks for programs
|
|
-AC_PROG_CC
|
|
+AC_PROG_CC_STDC
|
|
+AC_USE_SYSTEM_EXTENSIONS
|
|
+AC_SYS_LARGEFILE
|
|
+LT_INIT([disable-static pic-only])
|
|
AC_PROG_INSTALL
|
|
|
|
# Package version
|
|
@@ -81,13 +82,6 @@ if test "x$with_libexpat" = "xyes"; then
|
|
AM_PATH_LIBEXPAT
|
|
fi
|
|
|
|
-if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then
|
|
- AM_PATH_XML2([2.6.24], [have_libxml2=yes])
|
|
- if test "x$have_libxml2" = "xyes"; then
|
|
- AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.])
|
|
- fi
|
|
-fi
|
|
-
|
|
# cunit
|
|
PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no])
|
|
# If pkg-config does not find cunit, check it using AC_CHECK_LIB. We
|
|
--- lib/libexpat_metalink_parser.c.orig
|
|
+++ lib/libexpat_metalink_parser.c
|
|
@@ -130,7 +130,7 @@ METALINK_PUBLIC
|
|
metalink_parse_file(const char* filename, metalink_t** res)
|
|
{
|
|
metalink_error_t r;
|
|
- FILE *docfp = fopen(filename, "rb");
|
|
+ FILE *docfp = fopen(filename, "rbe");
|
|
if(docfp == NULL)
|
|
return METALINK_ERR_CANNOT_OPEN_FILE;
|
|
r = metalink_parse_fp(docfp, res);
|
|
--- lib/Makefile.am.orig
|
|
+++ lib/Makefile.am
|
|
@@ -1,8 +1,8 @@
|
|
SUBDIRS = includes
|
|
|
|
AM_CFLAGS = -Wall
|
|
-AM_CPPFLAGS = -I$(srcdir)/includes -I$(builddir)/includes \
|
|
- @XML_CPPFLAGS@ @EXPAT_CFLAGS@ \
|
|
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(srcdir)/includes -I$(builddir)/includes \
|
|
+ @EXPAT_CFLAGS@ \
|
|
@DEFS@
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
@@ -60,4 +60,4 @@ endif
|
|
libmetalink_la_SOURCES = $(HFILES) $(OBJECTS)
|
|
libmetalink_la_LDFLAGS = -no-undefined \
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
|
- @XML_LIBS@ @EXPAT_LIBS@
|
|
+ @EXPAT_LIBS@
|
|
--- test/Makefile.am.orig
|
|
+++ test/Makefile.am
|
|
@@ -11,7 +11,7 @@ metalinktest_SOURCES = \
|
|
metalinktest_LDADD = ${top_builddir}/lib/libmetalink.la
|
|
metalinktest_LDFLAGS = -static @CUNIT_LIBS@
|
|
|
|
-AM_CFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \
|
|
+AM_CFLAGS = -include $(top_builddir)/config.h -I${top_srcdir}/lib -I${top_srcdir}/lib/includes \
|
|
-I${top_builddir}/lib/includes \
|
|
-DLIBMETALINK_TEST_DIR=\"$(top_srcdir)/test/\" @CUNIT_CFLAGS@
|
|
TESTS = metalinktest
|