diff -uNr nutcracker-0.2.4.orig/Makefile.am nutcracker-0.2.4/Makefile.am --- nutcracker-0.2.4.orig/Makefile.am 2013-09-11 10:11:19.869975912 -0400 +++ nutcracker-0.2.4/Makefile.am 2013-09-11 10:11:36.709975757 -0400 @@ -2,6 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = contrib src +SUBDIRS = src EXTRA_DIST = README.md NOTICE LICENSE ChangeLog conf scripts notes diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am --- nutcracker-0.2.4.orig/src/Makefile.am 2013-09-11 10:16:16.449973187 -0400 +++ nutcracker-0.2.4/src/Makefile.am 2013-09-11 10:16:44.019972934 -0400 @@ -3,7 +3,6 @@ AM_CPPFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit AM_CPPFLAGS += -I $(top_srcdir)/src/proto -AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.1.4/include AM_CFLAGS = -Wall -Wshadow AM_CFLAGS += -Wpointer-arith @@ -43,4 +42,3 @@ nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a -nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a diff -uNr nutcracker-0.2.4.orig/configure.ac nutcracker-0.2.4/configure.ac --- nutcracker-0.2.4.orig/configure.ac 2013-09-11 10:23:27.879969223 -0400 +++ nutcracker-0.2.4/configure.ac 2013-09-11 10:24:28.729968664 -0400 @@ -138,11 +138,7 @@ [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])]) AC_MSG_RESULT($disable_stats) -# Untar the yaml-0.1.4 in contrib/ before config.status is rerun -AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.1.4.tar.gz -C contrib]) - -# Call yaml-0.1.4 ./configure recursively -AC_CONFIG_SUBDIRS([contrib/yaml-0.1.4]) +PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1]) # Define Makefiles AC_CONFIG_FILES([Makefile diff -uNr nutcracker-0.2.4.orig/src/Makefile.am nutcracker-0.2.4/src/Makefile.am --- nutcracker-0.2.4.orig/src/Makefile.am 2013-09-11 10:23:27.879969223 -0400 +++ nutcracker-0.2.4/src/Makefile.am 2013-09-11 10:26:16.549967674 -0400 @@ -11,8 +11,9 @@ AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value AM_CFLAGS += -Wconversion -Wsign-compare AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations +AM_CFLAGS += $(YAML_CFLAGS) -AM_LDFLAGS = -lm -lpthread -rdynamic +AM_LDFLAGS = -lm -lpthread -rdynamic $(YAML_LIBS) SUBDIRS = hashkit proto @@ -40,5 +41,5 @@ nc_queue.h \ nc.c -nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a +nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a