← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/include.am

  • Committer: Lee Bieber
  • Date: 2010-12-13 20:50:56 UTC
  • mfrom: (1993.2.3 build)
  • Revision ID: kalebral@gmail.com-20101213205056-rkzi5ve3hc0mpnws
Merge Andrew - fix bug 686773: TableFunction::Generator::push() needs assert
Merge Stewart - ON DUPLICATE KEY UPDATE support for HailDB
Merge Monty - fix bug 688819: drizzle fails to build from source in natty 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/include.am
472
472
                                $(LDADD) \
473
473
                                $(LIBUUID) \
474
474
                                $(LIBDL_LIBS) \
475
 
                                $(LIBPCRE) \
 
475
                                $(LTLIBPCRE) \
476
476
                                $(LTLIBPROTOBUF) \
477
477
                                $(LIBTBB) \
478
478
                                $(BOOST_LIBS) \