| 1 | |
| 2 | |
| 3 | @@ -2,7 +2,7 @@
|
| 4 |
|
| 5 | ACLOCAL_AMFLAGS = -I m4
|
| 6 |
|
| 7 | -SUBDIRS = contrib src
|
| 8 | +SUBDIRS = src
|
| 9 |
|
| 10 | dist_man_MANS = man/nutcracker.8
|
| 11 |
|
| 12 | |
| 13 | |
| 14 | @@ -75,6 +75,14 @@
|
| 15 | # Checks for libraries
|
| 16 | AC_CHECK_LIB([m], [pow])
|
| 17 | AC_CHECK_LIB([pthread], [pthread_create])
|
| 18 | +AC_CHECK_LIB([yaml], [yaml_get_version_string],,LIBYAML="no")
|
| 19 | +if test "$LIBYAML" = "no"; then
|
| 20 | + echo
|
| 21 | + echo " Error: libyaml library not found."
|
| 22 | + echo " Run apk add yaml-dev"
|
| 23 | + echo
|
| 24 | + exit 1
|
| 25 | +fi
|
| 26 |
|
| 27 | # Checks for library functions
|
| 28 | AC_FUNC_FORK
|
| 29 | @@ -197,15 +205,8 @@
|
| 30 | [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
|
| 31 | AC_MSG_RESULT($disable_stats)
|
| 32 |
|
| 33 | -# Untar the yaml-0.2.5 in contrib/ before config.status is rerun
|
| 34 | -AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.2.5.tar.gz -C contrib])
|
| 35 | -
|
| 36 | -# Call yaml-0.2.5 ./configure recursively
|
| 37 | -AC_CONFIG_SUBDIRS([contrib/yaml-0.2.5])
|
| 38 | -
|
| 39 | # Define Makefiles
|
| 40 | AC_CONFIG_FILES([Makefile
|
| 41 | - contrib/Makefile
|
| 42 | src/Makefile
|
| 43 | src/hashkit/Makefile
|
| 44 | src/proto/Makefile
|
| 45 | |
| 46 | |
| 47 | @@ -22,7 +22,7 @@
|
| 48 | AM_CFLAGS += -Wno-format-zero-length
|
| 49 |
|
| 50 | AM_LDFLAGS =
|
| 51 | -AM_LDFLAGS += -lm -lpthread -rdynamic
|
| 52 | +AM_LDFLAGS += -lm -lpthread -lyaml -rdynamic
|
| 53 | if OS_SOLARIS
|
| 54 | AM_LDFLAGS += -lnsl -lsocket
|
| 55 | endif
|
| 56 | @@ -58,7 +58,6 @@
|
| 57 | nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
|
| 58 | nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
|
| 59 | nutcracker_LDADD += $(top_builddir)/src/event/libevent.a
|
| 60 | -nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.2.5/src/.libs/libyaml.a
|
| 61 |
|
| 62 | TESTS = test_all
|
| 63 | bin_PROGRAMS = test_all
|
| 64 | @@ -86,4 +85,3 @@
|
| 65 | test_all_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
|
| 66 | test_all_LDADD += $(top_builddir)/src/proto/libproto.a
|
| 67 | test_all_LDADD += $(top_builddir)/src/event/libevent.a
|
| 68 | -test_all_LDADD += $(top_builddir)/contrib/yaml-0.2.5/src/.libs/libyaml.a
|