← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2010-10-19 21:58:26 UTC
  • mfrom: (1861.3.7 ld-version-script)
  • mto: This revision was merged to the branch mainline in revision 1863.
  • Revision ID: mordred@inaugust.com-20101019215826-ofh15co6vp47vndb
Merge Monty - Fixed the valgrind errors, made it so that haildb works in trunk with no extra magic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
26
26
 
27
27
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, version-from-vc, skip-visibility)
28
28
 
29
 
LIBDRIZZLE_LIBRARY_VERSION=0:8:0
 
29
LIBDRIZZLE_LIBRARY_VERSION=1:0:0
30
30
#                          | | |
31
31
#                   +------+ | +---+
32
32
#                   |        |     |
43
43
 
44
44
# libdrizzle versioning when linked with GNU ld.
45
45
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
46
 
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libdrizzle/libdrizzle.ver"
 
46
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
47
47
  ])
48
48
AC_SUBST(LD_VERSION_SCRIPT)
49
49
 
50
 
 
51
50
dnl Set the default datadir location to /usr/local/var/drizzle. If a
52
51
dnl localstatedir is explicitly given, just use that.
53
52
AS_IF([test "x${localstatedir}" = 'x${prefix}/var'],[
135
134
dnl AM_CONDITIONAL([BUILD_GCC_PCH],[test "$GCC" = "yes"])
136
135
AM_CONDITIONAL([BUILD_GCC_PCH],[test "no" = "yes"])
137
136
 
 
137
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
 
138
  LDFLAGS="${LDFLAGS} ${LD_VERSION_SCRIPT}"
 
139
  ])
 
140
 
 
141
 
138
142
AC_CONFIG_FILES(Makefile dnl
139
143
 tests/Makefile dnl
140
144
 drizzled/plugin/version.h dnl