From cd5d55ef510564b9a41fea6fac7514bfd614d685 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Fri, 5 Feb 2016 21:43:04 +0100 Subject: [PATCH] Call libuev configure script if local libuev is used Same as for libite, libuev has also changed to autotools, so call its autogen.sh and configure script in cascade from our own. Aslo add safeguards to clean/distclean targets so we do not attempt to enter the libuev subdirectory if it's not configured. Signed-off-by: Joachim Nilsson --- Makefile | 4 ++++ configure | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Makefile b/Makefile index 9799798c..03ddb924 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,9 @@ clean: ifndef LIBITE +$(MAKE) -C libite $@ endif +ifndef LIBUEV +$(MAKE) -C libuev $@ +endif -@$(RM) $(OBJS) $(DEPS) $(EXEC) 2>/dev/null distclean: clean @@ -155,7 +157,9 @@ distclean: clean ifndef LIBITE +$(MAKE) -C libite $@ endif +ifndef LIBUEV +$(MAKE) -C libuev $@ +endif -@$(RM) $(JUNK) config.mk config.h unittest *.o *.html 2>/dev/null check: diff --git a/configure b/configure index 0fa86654..03f257a7 100755 --- a/configure +++ b/configure @@ -456,6 +456,18 @@ if [ x"$libite" = x"" ]; then test -e Makefile && make distclean >/dev/null ./autogen.sh ./configure + cd - + set +e +fi + +# Call configure in local libuev if --with-libuev is not selected +if [ x"$libuev" = x"" ]; then + set -e + cd libuev + test -e Makefile && make distclean >/dev/null + ./autogen.sh + ./configure + cd - set +e fi