← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bindings/configure.ac

  • 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/configure.ac
 
1
# ---------------------------------------------------------------------
 
2
# Initialisation
 
3
# ---------------------------------------------------------------------
 
4
 
 
5
# Version change: Change line 8 only !
 
6
# Change it immediately after a release
 
7
 
 
8
AC_INIT(swordbindings, 1.5.9, sword-bugs@crosswire.org)
 
9
AC_CONFIG_SRCDIR([flatapi.cpp])
 
10
AC_PREREQ(2.52)
 
11
AC_REVISION($Revision$)
 
12
 
 
13
AC_CANONICAL_TARGET
 
14
AM_INIT_AUTOMAKE
 
15
 
 
16
#AM_CONFIG_HEADER(include/config.h)
 
17
 
 
18
 
 
19
# ---------------------------------------------------------------------
 
20
# Check Programs
 
21
# ---------------------------------------------------------------------
 
22
AC_LANG(C++)
 
23
AC_PROG_CC
 
24
AC_PROG_CXX
 
25
AC_PROG_INSTALL
 
26
AC_LIBTOOL_WIN32_DLL
 
27
AC_PROG_LIBTOOL
 
28
 
 
29
AC_C_BIGENDIAN
 
30
 
 
31
# ---------------------------------------------------------------------
 
32
# Java
 
33
# ---------------------------------------------------------------------
 
34
AC_CHECK_CLASSPATH
 
35
AC_PROG_JAVAC
 
36
AC_PROG_JAVA
 
37
AC_PROG_JAR
 
38
 
 
39
# ---------------------------------------------------------------------
 
40
# With options
 
41
# ---------------------------------------------------------------------
 
42
AC_ARG_WITH(tomcathome,
 
43
        AC_HELP_STRING([--with-tomcathome],
 
44
    [tomcat home directory (default=[/usr/local/tomcat])]),,
 
45
    with_tomcathome=[/usr/local/tomcat])
 
46
 
 
47
 
 
48
# ---------------------------------------------------------------------
 
49
# Enable options
 
50
# ---------------------------------------------------------------------
 
51
AC_ARG_ENABLE(corba,
 
52
        AC_HELP_STRING([--enable-corba],[build swordorbserver (default=no)]),,enable_corba=no)
 
53
 
 
54
AM_MAINTAINER_MODE
 
55
 
 
56
# ---------------------------------------------------------------------
 
57
# Check libraries
 
58
# ---------------------------------------------------------------------
 
59
 
 
60
# ---------------------------------------------------------------------
 
61
# Find pkg-config
 
62
# ---------------------------------------------------------------------
 
63
use_pkgconfig=yes
 
64
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
65
if test x$PKG_CONFIG = xno ; then
 
66
  AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
 
67
  AC_MSG_ERROR([not using pkg-config])
 
68
  use_pkgconfig=no
 
69
fi
 
70
 
 
71
if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
 
72
  :
 
73
else
 
74
  AC_MSG_WARN([*** pkg-config too old; version 0.14 or better required.])
 
75
  AC_MSG_ERROR([not using pkg-config])
 
76
  use_pkgconfig=no
 
77
fi
 
78
 
 
79
# ---------------------------------------------------------------------
 
80
# Find sword
 
81
# ---------------------------------------------------------------------
 
82
SWORD_CFLAGS=
 
83
SWORD_LIBS=
 
84
if test x$use_pkgconfig = xyes ; then
 
85
  SWORD_LIBS=`$PKG_CONFIG --libs sword`
 
86
  SWORD_CFLAGS=`$PKG_CONFIG --cflags sword`
 
87
fi
 
88
 
 
89
# ---------------------------------------------------------------------
 
90
# Tomcat install directories
 
91
# ---------------------------------------------------------------------
 
92
TOMCAT_HOME=$with_tomcathome
 
93
 
 
94
# ---------------------------------------------------------------------
 
95
# Find orbit-config
 
96
# ---------------------------------------------------------------------
 
97
ORBIT_LIBS=
 
98
ORBIT_CFLAGS=
 
99
if test x$enable_corba = xyes ; then
 
100
  if test x$use_pkgconfig = xyes ; then
 
101
    ORBIT_LIBS+=`$PKG_CONFIG --libs ORBit-2.0-cpp`
 
102
    ORBIT_CFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0`
 
103
    ORBIT_CXXFLAGS+=`$PKG_CONFIG --cflags ORBit-2.0-cpp`
 
104
  fi
 
105
fi
 
106
 
 
107
# ---------------------------------------------------------------------
 
108
# Substitute variables into makefiles
 
109
# ---------------------------------------------------------------------
 
110
AC_SUBST(SWORD_LIBS)
 
111
AC_SUBST(SWORD_CFLAGS)
 
112
AC_SUBST(ORBIT_LIBS)
 
113
AC_SUBST(ORBIT_CFLAGS)
 
114
AC_SUBST(ORBIT_CXXFLAGS)
 
115
AC_SUBST(TOMCAT_HOME)
 
116
 
 
117
# ---------------------------------------------------------------------
 
118
# Conditional variables
 
119
# ---------------------------------------------------------------------
 
120
AM_CONDITIONAL(CORBA, test x$enable_corba = xyes)
 
121
 
 
122
# ---------------------------------------------------------------------
 
123
# Final output
 
124
# ---------------------------------------------------------------------
 
125
AC_CONFIG_FILES(Makefile corba/Makefile corba/orbitcpp/Makefile corba/java/Makefile)
 
126
AC_OUTPUT
 
127