← 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-08-12 20:27:32 UTC
  • mto: (1720.1.5 build)
  • mto: This revision was merged to the branch mainline in revision 1722.
  • Revision ID: mordred@inaugust.com-20100812202732-9kzchbkvkyki4n3u
Merged libdrizzle directly into tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
24
24
AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
25
25
AC_CONFIG_AUX_DIR([config])
26
26
 
27
 
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, skip-visibility, version-from-vc)
 
27
PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, force-gcc42, version-from-vc, skip-visibility)
 
28
 
 
29
LIBDRIZZLE_LIBRARY_VERSION=0:8:0
 
30
#                          | | |
 
31
#                   +------+ | +---+
 
32
#                   |        |     |
 
33
#                current:revision:age
 
34
#                   |        |     |
 
35
#                   |        |     +- increment if interfaces have been
 
36
added
 
37
#                   |        |        set to zero if interfaces have been
 
38
#                   |        |        removed or changed
 
39
#                   |        +- increment if source code has changed
 
40
#                   |           set to zero if current is incremented
 
41
#                   +- increment if interfaces have been added, removed or
 
42
#                      changed
 
43
AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
 
44
 
 
45
# libdrizzle versioning when linked with GNU ld.
 
46
AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
 
47
  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libdrizzle/libdrizzle.ver"
 
48
  ])
 
49
AC_SUBST(LD_VERSION_SCRIPT)
 
50
 
28
51
 
29
52
dnl Set the default datadir location to /usr/local/var/drizzle. If a
30
53
dnl localstatedir is explicitly given, just use that.
50
73
AC_LANG_PUSH(C++)
51
74
PANDORA_REQUIRE_PTHREAD
52
75
PANDORA_REQUIRE_LIBUUID
53
 
PANDORA_REQUIRE_LIBDRIZZLE
54
76
PANDORA_REQUIRE_LIBZ
55
77
PANDORA_REQUIRE_LIBPCRE
56
78
PANDORA_REQUIRE_LIBREADLINE
64
86
          [Define indicating we are building and not consuming drizzle.])
65
87
 
66
88
PANDORA_HAVE_LIBGTEST
 
89
PANDORA_HAVE_LIBSQLITE3
 
90
 
 
91
AC_CHECK_FUNC(inet_ntoa, [], [AC_CHECK_LIB(nsl, inet_ntoa)])
 
92
 
67
93
 
68
94
AC_ARG_WITH([server-suffix],
69
95
    [AS_HELP_STRING([--with-server-suffix],
115
141
 po/Makefile.in dnl
116
142
 tests/Makefile dnl
117
143
 drizzled/plugin/version.h dnl
 
144
 support-files/libdrizzle.pc dnl
118
145
 support-files/drizzle.server support-files/drizzle-log-rotate
119
146
 support-files/smf/install.sh dnl
120
147
 support-files/drizzle.spec dnl