redland-link.patch

   1 --- redland-1.0.6/librdf/Makefile.am.orig       2007-02-18 01:41:28.000000000 +0100
   2 +++ redland-1.0.6/librdf/Makefile.am    2007-05-12 00:52:39.835338606 +0200
   3 @@ -120,7 +120,7 @@
   4
   5  librdf_la_LIBADD = \
   6  @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \
   7 -@LIBRDF_INTERNAL_LIBS@
   8 +@LIBRDF_INTERNAL_LIBS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
   9
  10  librdf_la_DEPENDENCIES = \
  11  @DIGEST_OBJS@ @HASH_OBJS@ \
  12 @@ -183,7 +183,7 @@
  13  AM_CPPFLAGS=@LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ @LIBRDF_EXTERNAL_CPPFLAGS@
  14  AM_CFLAGS=@LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ @LIBRDF_EXTERNAL_CPPFLAGS@ $(MEM)
  15  STANDARD_CFLAGS=@STANDARD_CFLAGS@ $(MEM)
  16 -AM_LDFLAGS=@LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
  17 +AM_LDFLAGS=@LIBRDF_LDFLAGS@
  18
  19  AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
  20
  21 --- redland-1.0.5/configure.ac.orig     2006-10-23 05:18:47.000000000 +0200
  22 +++ redland-1.0.5/configure.ac  2007-02-03 16:29:30.057696634 +0100
  23 @@ -237,7 +237,7 @@
  24      fi
  25
  26      # Sigh!  And this still might not be good enough.
  27 -    for bdbc_version in 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do
  28 +    for bdbc_version in 4.5 4.4 4.3 4.2 4.1 4.0 4 3.3 3.2 3.1 3 2; do
  29        bdbc_major=`echo $bdbc_version | sed -e 's/^\(.\).*$/\1/'`;
  30        bdbc_version2=`echo $bdbc_version | sed -e 's/^\(.\).\(.\)$/\1\2/'`
  31
  32 @@ -275,7 +275,7 @@
  33    AC_MSG_RESULT($bdb_include_dir)
  34
  35    if test "$bdb_prefix" != no; then
  36 -    nLDFLAGS=$LDFLAGS
  37 +    nLDFLAGS=
  38      nCPPFLAGS=
  39
  40      if test "$bdb_lib_dir" != /usr/lib; then
  41 @@ -395,6 +395,7 @@
  42      if test "$have_libdb" = yes; then
  43        bdb_available="Version $bdb_version (library $bdb_dbname in $bdb_lib_dir)"
  44        LIBRDF_LIBS="$LIBRDF_LIBS $nLDFLAGS -l$bdb_dbname"
  45 +      LIBRDF_EXTERNAL_LIBS="$LIBRDF_EXTERNAL_LIBS $nLDFLAGS -l$bdb_dbname"
  46        LIBRDF_CPPFLAGS="$LIBRDF_CPPFLAGS $nCPPFLAGS"
  47      fi
  48
  49 --- redland-1.0.6/redland-config.in.orig        2007-05-02 07:17:27.000000000 +0200
  50 +++ redland-1.0.6/redland-config.in     2007-05-12 00:53:52.531481323 +0200
  51 @@ -133,7 +133,7 @@
  52  fi
  53
  54  if test "$echo_private_libs" = "yes"; then
  55 -  echo @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@
  56 +  echo @LIBRDF_EXTERNAL_LIBS@
  57  fi
  58
  59  if test "$echo_swig" = "yes"; then