← Back to branch summary

~ubuntu-branches/debian/squeeze/sword/squeeze

« back to all changes in this revision

Viewing changes to bindings/swig/package/zlib.m4

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Marsden, Jonathan Marsden, Dmitrijs Ledkovs, Closed Bugs
  • Date: 2009-05-30 11:55:55 UTC
  • mfrom: (1.3.1 upstream) (6.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090530115555-r427zsn3amivdpfu
Tags: 1.6.0+dfsg-1
http://bugs.debian.org/507960
https://launchpad.net/bugs/320558
http://bugs.debian.org/513448
https://launchpad.net/bugs/322638
https://launchpad.net/bugs/305172
[ Jonathan Marsden ]
* New upstream release. (Closes: #507960) (LP: #320558)
* debian/patches/02_libver.diff:
  - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
* debian/patches/series:
  - Remove 10_diatheke.diff -- included in upstream source.
* debian/patches/:
  - Remove several old unused .diff files.
  - Add 11_regex_only_when_needed.diff to conditionally include regex lib.
  - Add 12_fix_compiler_warnings.diff to remove all compiler warnings.
  - Add 13_fix_osis2mod_compression_default.diff from upstream svn.
  - Add 14_closing_section_not_chapter.diff from upstream svn.
* debian/libsword7.*: 
  - Rename to libsword8.*
  - Change libsword7 to libsword8 within files.
* debian/rules: 
  - SONAME bump to 8.
  - Set library version check to >= 1.6
* debian/control:
  - Change libsword7 to libsword8.
  - Add libsword7 to Conflicts.
  - Fix case of sword to SWORD in package descriptions.
  - Bump Standards-Version to 3.8.1 (no changes needed).
  - Fix section for libsword-dbg to avoid lintian warning.
* debian/rules:
  - Add DFSG get-orig-source target.
* debian/copyright:
  - Fix various mistakes in initial attempt to document copyrights.

[ Dmitrijs Ledkovs ]
* debian/rules: Added utils.mk to use missing-files target and call it on
  each build.
* debian/libsword-dev.install: Added libsword.la, previously missing.
* debian/libsword7.install: Added missing libicu translit files.
* debian/control:
  - Updated all uses of SWORD version to 1.6
  - Added libsword-dbg package
* debian/watch: Fixed a small mistake which was resulting in extra "."
  in final version name.
* debian/rules: simplified manpage processing.
* debian/libsword8.lintian-overrides: added override for module
  installation directory.
* debian/copyright: Updated with information about everyfile.
  Closes: #513448 LP: #322638
* debian/diatheke.examples: moved examples here from the diatheke.install
* debian/rules:
  - enabled shell script based testsuite
  - added commented out cppunit testsuite
* debian/patches/40_missing_includes.diff: 
  - added several missing stdio.h includes to prevent FTBFS of testsuite.

[ Closed Bugs ]
* FTBFS on intrepid (LP: #305172)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bindings/swig/package/zlib.m4
 
1
##   -*- autoconf -*-
 
2
 
 
3
 
 
4
AC_DEFUN(AC_FIND_ZLIB,
 
5
[
 
6
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
 
7
AC_MSG_CHECKING([for libz])
 
8
AC_CACHE_VAL(ac_cv_lib_z,
 
9
[
 
10
AC_LANG_C
 
11
kde_save_LIBS="$LIBS"
 
12
LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
 
13
kde_save_CFLAGS="$CFLAGS"
 
14
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
 
15
AC_TRY_LINK(dnl
 
16
[
 
17
#include<zlib.h>
 
18
],
 
19
            [return (zlibVersion() == ZLIB_VERSION); ],
 
20
            eval "ac_cv_lib_z='-lz'",
 
21
            eval "ac_cv_lib_z=no")
 
22
LIBS="$kde_save_LIBS"
 
23
CFLAGS="$kde_save_CFLAGS"
 
24
])dnl
 
25
if test ! "$ac_cv_lib_z" = no; then
 
26
  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
 
27
  LIBZ="$ac_cv_lib_z"
 
28
  AC_SUBST(LIBZ)
 
29
  AC_MSG_RESULT($ac_cv_lib_z)
 
30
else
 
31
  AC_MSG_ERROR(not found. Check your installation and look into config.log)
 
32
  LIBZ=""
 
33
  AC_SUBST(LIBZ)
 
34
fi
 
35
])
 
36
 
 
37
AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
 
38
[
 
39
AC_MSG_CHECKING(for extra includes)
 
40
AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
 
41
                          adds non standard include paths],
 
42
  kde_use_extra_includes="$withval",
 
43
  kde_use_extra_includes=NONE
 
44
)
 
45
kde_extra_includes=
 
46
if test -n "$kde_use_extra_includes" && \
 
47
   test "$kde_use_extra_includes" != "NONE"; then
 
48
 
 
49
   ac_save_ifs=$IFS
 
50
   IFS=':'
 
51
   for dir in $kde_use_extra_includes; do
 
52
     kde_extra_includes="$kde_extra_includes $dir"
 
53
     USER_INCLUDES="$USER_INCLUDES -I$dir"
 
54
   done
 
55
   IFS=$ac_save_ifs
 
56
   kde_use_extra_includes="added"
 
57
else
 
58
   kde_use_extra_includes="no"
 
59
fi
 
60
AC_SUBST(USER_INCLUDES)
 
61
 
 
62
AC_MSG_RESULT($kde_use_extra_includes)
 
63
 
 
64
kde_extra_libs=
 
65
AC_MSG_CHECKING(for extra libs)
 
66
AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
 
67
  kde_use_extra_libs=$withval,
 
68
  kde_use_extra_libs=NONE
 
69
)
 
70
if test -n "$kde_use_extra_libs" && \
 
71
   test "$kde_use_extra_libs" != "NONE"; then
 
72
 
 
73
   ac_save_ifs=$IFS
 
74
   IFS=':'
 
75
   for dir in $kde_use_extra_libs; do
 
76
     kde_extra_libs="$kde_extra_libs $dir"
 
77
     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
 
78
     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
 
79
   done
 
80
   IFS=$ac_save_ifs
 
81
   kde_use_extra_libs="added"
 
82
else
 
83
   kde_use_extra_libs="no"
 
84
fi
 
85
 
 
86
AC_SUBST(USER_LDFLAGS)
 
87
 
 
88
AC_MSG_RESULT($kde_use_extra_libs)
 
89
 
 
90
])
 
91
 
 
92
dnl ------------------------------------------------------------------------
 
93
dnl Find a file (or one of more files in a list of dirs)
 
94
dnl ------------------------------------------------------------------------
 
95
dnl
 
96
AC_DEFUN(AC_FIND_FILE,
 
97
[
 
98
$3=NO
 
99
for i in $2;
 
100
do
 
101
  for j in $1;
 
102
  do
 
103
    echo "configure: __oline__: $i/$j" >&AC_FD_CC
 
104
    if test -r "$i/$j"; then
 
105
      echo "taking that" >&AC_FD_CC
 
106
      $3=$i
 
107
      break 2
 
108
    fi
 
109
  done
 
110
done
 
111
])