← Back to branch summary

~olafvdspek/drizzle/outfile

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Olaf van der Spek
  • Date: 2011-11-09 10:10:15 UTC
  • mfrom: (2436.1.20 drizzle)
  • Revision ID: olafvdspek@gmail.com-20111109101015-io008ttxsv297emd
Merge trunk

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])
 
23
AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle],[drizzle7],[http://drizzle.org/])
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
26
 
AC_CONFIG_MACRO_DIR([m4])
27
 
LT_INIT
28
26
 
29
27
PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
30
28
 
58
56
#                         changed
59
57
AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)
60
58
 
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
 
 
71
59
# libdrizzle versioning when linked with GNU ld.
72
60
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
73
61
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
155
143
PANDORA_DRIZZLE_BUILD
156
144
PANDORA_HAVE_BOOST_TEST
157
145
PANDORA_HAVE_LIBSQLITE3
158
 
PANDORA_HAVE_LIBV8
159
146
 
160
147
 
161
148
#########################################################################
183
170
 tests/Makefile dnl
184
171
 drizzled/plugin/version.h dnl
185
172
 support-files/drizzle7.pc dnl
 
173
 support-files/libdrizzle.pc dnl
186
174
 support-files/libdrizzle-1.0.pc dnl
187
175
 support-files/libdrizzle-2.0.pc dnl
188
176
 support-files/smf/install.sh dnl
240
228
 
241
229
dnl libtoolize scans configure.ac  and needs to see some text
242
230
m4_define([LIBTOOLIZE_AC_INIT], [])
 
231
m4_define([UNUSED_MACRO], [
 
232
  LT_INIT
 
233
  AC_CONFIG_MACRO_DIR([m4])
 
234
])