← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/Makefile.am

  • Committer: Monty Taylor
  • Date: 2009-01-09 03:49:43 UTC
  • mto: (779.1.2 devel)
  • mto: This revision was merged to the branch mainline in revision 784.
  • Revision ID: mordred@inaugust.com-20090109034943-fosmpehpzt04xggt
Added new pthread m4 file. Changing lib checks to use AC_LIB_HAVE_LINKFLAGS

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/Makefile.am
23
23
bin_SCRIPTS =   drizzledumpslow \
24
24
                drizzled_safe 
25
25
 
26
 
AM_CPPFLAGS = ${GLOBAL_CPPFLAGS} ${EVENT_CFLAGS} ${PROTOBUF_CFLAGS}
27
 
 
28
26
DTRACE = @DTRACE@
29
27
 
30
28
DTRACEFLAGS = @DTRACEFLAGS@
356
354
LDADD = $(top_builddir)/libdrizzle/libdrizzle.la \
357
355
        $(top_builddir)/mysys/libmysys.la \
358
356
        $(top_builddir)/mystrings/libmystrings.la \
359
 
        $(Z_LIBS) $(LIBINTL)
 
357
        $(LTLIBZ)
360
358
 
361
359
drizzled_LDADD = ${noinst_LTLIBRARIES} \
362
360
                 $(top_builddir)/libdrizzle/libdrizzle.la \
363
361
                 $(top_builddir)/drizzled/serialize/libserialize.la \
364
 
                 $(libevent_libs) \
365
362
                 @mysql_plugin_libs@ \
366
 
                 -lprotobuf \
367
363
                 $(LDADD) \
368
364
                 $(CXXLDFLAGS) \
369
 
                 $(LIBDL_LIBS) $(EVENT_LIBS) $(PROTOBUF_LIBS) \
 
365
                 $(LIBDL_LIBS) $(LTLIBEVENT) $(LTLIBPROTOBUF) \
370
366
                 $(DRIZZLED_PLUGIN_DEP_LIBS)
371
367
drizzled_DEPENDENCIES = @mysql_plugin_libs@ ${noinst_LTLIBRARIES}
372
368