~drizzle-trunk/drizzle/development

Merging Monty's code, I did remove error on compile though (since it does
not currently work because of sql_plugin.cc)

added added

removed removed

# This file is public domain and comes with NO WARRANTY of any kind

AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/vio -I$(top_srcdir)/mysys -I$(top_builddir)/sql-common

if BUILD_DBUG

d_dbug = $(top_builddir)/dbug/libdbuglt.la

endif

AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/vio -I$(top_srcdir)/mysys

MYSQLDATAdir = $(localstatedir)

MYSQLSHAREdir = $(pkgdatadir)

pkglib_LTLIBRARIES = libdrizzle.la

libdrizzle_la_SOURCES = libdrizzle.c client.c net_serv.c get_password.c

libdrizzle_la_LIBADD = ${sql_cmn_objects} ${sqlobjects} \

${top_builddir}/mysys/libmysyslt.la \

${top_builddir}/strings/libmystringslt.la \

$(d_dbug) \

libsqlcommon.la \

${top_builddir}/vio/libviolt.la

libdrizzle_la_LIBADD = ${sql_cmn_objects} ${sqlobjects} \

${top_builddir}/mysys/libmysyslt.la \

${top_builddir}/strings/libmystringslt.la \

libsqlcommon.la \

${top_builddir}/vio/libviolt.la

libdrizzle_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@

noinst_LTLIBRARIES = libsqlcommon.la