← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2011-03-22 18:39:54 UTC
  • mto: (2246.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2247.
  • Revision ID: mordred@inaugust.com-20110322183954-fz8ciuywjz2llbyo
Split libdrizzle into 1.0 and 2.0. Applied the C++ changes to 2.0 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
26
26
 
27
27
PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
28
28
 
29
 
LIBDRIZZLE_LIBRARY_VERSION=2:0:1
 
29
LIBDRIZZLE_LIBRARY_VERSION=3:0:0
30
30
#                          | | |
31
31
#                   +------+ | +---+
32
32
#                   |        |     |
40
40
#                   +- increment if interfaces have been added, removed or
41
41
#                      changed
42
42
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
 
43
OLDLIBDRIZZLE_LIBRARY_VERSION=2:0:1
 
44
#                             | | |
 
45
#                      +------+ | +---+
 
46
#                      |        |     |
 
47
#                   current:revision:age
 
48
#                      |        |     |
 
49
#                      |        |     +- increment if interfaces have been added
 
50
#                      |        |        set to zero if interfaces have been
 
51
#                      |        |        removed or changed
 
52
#                      |        +- increment if source code has changed
 
53
#                      |           set to zero if current is incremented
 
54
#                      +- increment if interfaces have been added, removed or
 
55
#                         changed
 
56
AC_SUBST(OLDLIBDRIZZLE_LIBRARY_VERSION)
43
57
 
44
 
libdrizzleincludedir='${includedir}/libdrizzle-1.0'
 
58
libdrizzleincludedir='${includedir}/libdrizzle-2.0'
 
59
libdrizzleinstalldir='${libdrizzleincludedir}/libdrizzle'
 
60
AC_SUBST(libdrizzleinstalldir)
45
61
AC_SUBST(libdrizzleincludedir)
46
62
 
 
63
oldlibdrizzleincludedir='${includedir}/libdrizzle-1.0'
 
64
oldlibdrizzleinstalldir='${oldlibdrizzleincludedir}/libdrizzle'
 
65
AC_SUBST(oldlibdrizzleinstalldir)
 
66
AC_SUBST(oldlibdrizzleincludedir)
 
67
 
47
68
# libdrizzle versioning when linked with GNU ld.
48
69
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
49
70
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
58
79
 
59
80
AC_ARG_WITH([server],
60
81
    [AS_HELP_STRING([--without-server],
61
 
      [Don not build the drizzled server.])],
 
82
      [Do not build the drizzled server.])],
62
83
    [ pandora_cv_skip_requires="$withval" ]
63
84
    [ pandora_cv_skip_requires=no ])
64
85
 
160
181
 drizzled/plugin/version.h dnl
161
182
 support-files/drizzle7.pc dnl
162
183
 support-files/libdrizzle-1.0.pc dnl
 
184
 support-files/libdrizzle-2.0.pc dnl
163
185
 support-files/smf/install.sh dnl
164
186
 support-files/smf/drizzle.xml dnl
165
187
 support-files/smf/drizzle)