← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Mark Atwood
  • Date: 2011-10-08 04:50:51 UTC
  • mfrom: (2430.1.1 rf)
  • Revision ID: me@mark.atwood.name-20111008045051-6ha1qiy7k2a9c3jv
Tags: 2011.10.27
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
20
20
AC_PREREQ(2.59)dnl              Minimum Autoconf version required.
21
21
dnl Version from the AC_INIT call below is overridden later
22
22
dnl So don't update it here
23
 
AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle],[drizzle7],[http://drizzle.org/])
 
23
AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle])
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
 
26
AC_CONFIG_MACRO_DIR([m4])
 
27
LT_INIT
26
28
 
27
29
PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
28
30
 
56
58
#                         changed
57
59
AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)
58
60
 
 
61
libdrizzleincludedir='${includedir}/libdrizzle-2.0'
 
62
libdrizzleinstalldir='${libdrizzleincludedir}/libdrizzle'
 
63
AC_SUBST(libdrizzleinstalldir)
 
64
AC_SUBST(libdrizzleincludedir)
 
65
 
 
66
oldlibdrizzleincludedir='${includedir}/libdrizzle-1.0'
 
67
oldlibdrizzleinstalldir='${oldlibdrizzleincludedir}/libdrizzle'
 
68
AC_SUBST(oldlibdrizzleinstalldir)
 
69
AC_SUBST(oldlibdrizzleincludedir)
 
70
 
59
71
# libdrizzle versioning when linked with GNU ld.
60
72
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
61
73
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
145
157
PANDORA_HAVE_LIBSQLITE3
146
158
 
147
159
 
 
160
 
148
161
#########################################################################
149
162
 
150
163
 
170
183
 tests/Makefile dnl
171
184
 drizzled/plugin/version.h dnl
172
185
 support-files/drizzle7.pc dnl
173
 
 support-files/libdrizzle.pc dnl
174
186
 support-files/libdrizzle-1.0.pc dnl
175
187
 support-files/libdrizzle-2.0.pc dnl
176
188
 support-files/smf/install.sh dnl
228
240
 
229
241
dnl libtoolize scans configure.ac  and needs to see some text
230
242
m4_define([LIBTOOLIZE_AC_INIT], [])
231
 
m4_define([UNUSED_MACRO], [
232
 
  LT_INIT
233
 
  AC_CONFIG_MACRO_DIR([m4])
234
 
])