Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 298100 | Differences between
and this patch

Collapse All | Expand All

(-)microdc2-0.15.6.orig/configure.ac (-21 / +37 lines)
Lines 43-69 OLD_LIBS="$LIBS" Link Here
43
LIBS="$LIBS $READLINE_LIBS"
43
LIBS="$LIBS $READLINE_LIBS"
44
AC_CHECK_FUNC(_rl_mark_modified_lines, [AC_DEFINE([HAVE__RL_MARK_MODIFIED_LINES])])
44
AC_CHECK_FUNC(_rl_mark_modified_lines, [AC_DEFINE([HAVE__RL_MARK_MODIFIED_LINES])])
45
LIBS="$OLD_LIBS"
45
LIBS="$OLD_LIBS"
46
AH_TEMPLATE([HAVE_LIBXML2], [Define if libxml2 is installed])
46
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.6.16, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
47
#AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option for xmlSave- functions])
47
AM_CONDITIONAL(HAVE_LIBXML2, test "x$HAVE_LIBXML2" = "xyes")
48
AC_PATH_PROG(XML_CONFIG, xml2-config)
48
##AH_TEMPLATE([HAVE_LIBXML2], [Define if libxml2 is installed])
49
AC_PATH_PROG(TR, tr)
49
##AH_TEMPLATE([XML_SAVE_FORMAT], [1], [Define if libxml2 has no such option for xmlSave- functions])
50
if test -n "$XML_CONFIG" && test -n "$TR"; then
50
#AC_PATH_PROG(XML_CONFIG, xml2-config)
51
  LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
51
#AC_PATH_PROG(TR, tr)
52
  if test $LIBXML2_VERSION -eq 2616; then
52
#if test -n "$XML_CONFIG" && test -n "$TR"; then
53
    AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such option defined in the library headers])
53
#  LIBXML2_VERSION=`$XML_CONFIG --version | $TR -d "."`
54
  fi
54
#  if test $LIBXML2_VERSION -eq 2616; then
55
  if test $LIBXML2_VERSION -ge 2616; then
55
#    AC_DEFINE([XML_SAVE_FORMAT], [1], [The libxml2 version 2.6.16 has no such option defined in the library headers])
56
    AC_DEFINE([HAVE_LIBXML2])
56
#  fi
57
    LIBXML2_LIBS="`$XML_CONFIG --libs`"
57
#  if test $LIBXML2_VERSION -ge 2616; then
58
    LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
58
#    AC_DEFINE([HAVE_LIBXML2])
59
    AC_SUBST(LIBXML2_LIBS)
59
#    LIBXML2_LIBS="`$XML_CONFIG --libs`"
60
    AC_SUBST(LIBXML2_CFLAGS)
60
#    LIBXML2_CFLAGS="`$XML_CONFIG --cflags`"
61
#    LIBS="$LIBS $LIBXML2_LIBS"
61
#    AC_SUBST(LIBXML2_LIBS)
62
#    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
62
#    AC_SUBST(LIBXML2_CFLAGS)
63
  else
63
##    LIBS="$LIBS $LIBXML2_LIBS"
64
    AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to support XML filelists])
64
##    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
65
  fi
65
#  else
66
fi
66
#    AC_MSG_WARN([XML libxml2 library version 2.6.16 or later is required to support XML filelists])
67
#  fi
68
#fi
67
69
68
# Checks for header files
70
# Checks for header files
69
71
Lines 72-77 AC_SYS_LARGEFILE Link Here
72
AC_CHECK_TYPES([comparison_fn_t])
74
AC_CHECK_TYPES([comparison_fn_t])
73
AC_CHECK_MEMBERS(struct sigaction.sa_restorer,,,[#include <signal.h>])
75
AC_CHECK_MEMBERS(struct sigaction.sa_restorer,,,[#include <signal.h>])
74
76
77
  AC_CHECK_LIB(bz2, BZ2_bzCompress, HAVE_BZ2=yes, HAVE_BZ2=no,)
78
  if test "x$HAVE_BZ2" = "xyes"; then
79
    AC_CHECK_HEADER(bzlib.h, :, HAVE_BZ2=no)
80
    if test "x$HAVE_BZ2" = "xyes"; then
81
      BZ2_LIBS="-lbz2"
82
    fi
83
  fi
84
  AC_SUBST(HAVE_BZ2)
85
  AC_SUBST(BZ2_LIBS)
86
87
if test "x$HAVE_BZ2" = "xno"; then
88
  AC_ERROR([libbz2 is required])
89
fi
90
75
# Checks for library functions
91
# Checks for library functions
76
92
77
# Output generation
93
# Output generation
(-)microdc2-0.15.6.orig/src/Makefile.am (-2 / +2 lines)
Lines 1-4 Link Here
1
SUBDIRS = common bzip2 tth
1
SUBDIRS = common tth
2
2
3
AM_CFLAGS = \
3
AM_CFLAGS = \
4
  -Wall \
4
  -Wall \
Lines 43-54 tthsum_SOURCES = \ Link Here
43
43
44
microdc2_LDADD = \
44
microdc2_LDADD = \
45
  common/libcommon.a \
45
  common/libcommon.a \
46
  bzip2/libbzip2.a \
47
  tth/libtth.a \
46
  tth/libtth.a \
48
  ../lib/libgnu.a \
47
  ../lib/libgnu.a \
49
  $(READLINE_LIBS) \
48
  $(READLINE_LIBS) \
50
  $(LIBINTL) \
49
  $(LIBINTL) \
51
  $(LIBICONV) \
50
  $(LIBICONV) \
51
  $(BZ2_LIBS) \
52
  $(LIBXML2_LIBS)
52
  $(LIBXML2_LIBS)
53
53
54
54
(-)microdc2-0.15.6.orig/src/xml_flist.c (-1 / +1 lines)
Lines 9-15 Link Here
9
#include <libxml/xmlwriter.h>
9
#include <libxml/xmlwriter.h>
10
#include <libxml/xmlsave.h>
10
#include <libxml/xmlsave.h>
11
11
12
#include "bzip2/bzlib.h"
12
#include <bzlib.h>
13
13
14
#include <inttypes.h>		/* ? */
14
#include <inttypes.h>		/* ? */
15
#include "iconvme.h"
15
#include "iconvme.h"

Return to bug 298100