mirror of
https://github.com/troglobit/finit.git
synced 2026-10-02 05:52:48 +07:00
Call libite configure script if local libite is used
The new libite uses autotools to build, and since we use it as a GIT submodule we have to call its autogen.sh before we call the configure script, from within the Finit configure script. We may have to move to use autotools even for Finit ... Also, make sure to only call clean/distclean on libite if the local version is selected at configure time. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
@@ -144,13 +144,17 @@ uninstall: uninstall-exec uninstall-data uninstall-dev
|
||||
|
||||
clean:
|
||||
+$(MAKE) -C plugins $@
|
||||
ifndef LIBITE
|
||||
+$(MAKE) -C libite $@
|
||||
endif
|
||||
+$(MAKE) -C libuev $@
|
||||
-@$(RM) $(OBJS) $(DEPS) $(EXEC) 2>/dev/null
|
||||
|
||||
distclean: clean
|
||||
+$(MAKE) -C plugins $@
|
||||
ifndef LIBITE
|
||||
+$(MAKE) -C libite $@
|
||||
endif
|
||||
+$(MAKE) -C libuev $@
|
||||
-@$(RM) $(JUNK) config.mk config.h unittest *.o *.html 2>/dev/null
|
||||
|
||||
|
||||
@@ -325,7 +325,6 @@ done
|
||||
|
||||
# If no arguments given to configure script, use defaults
|
||||
defaults
|
||||
result
|
||||
|
||||
##############################################################################
|
||||
echo "# Generated by finit configure script." > config.mk
|
||||
@@ -449,3 +448,16 @@ echo "#define RUNLEVEL $runlevel" >> config.h
|
||||
|
||||
echo >> config.h
|
||||
echo "#endif /* FINIT_CONFIG_H_ */" >> config.h
|
||||
|
||||
# Call configure in local libite if --with-libite is not selected
|
||||
if [ x"$libite" = x"" ]; then
|
||||
set -e
|
||||
cd libite
|
||||
test -e Makefile && make distclean >/dev/null
|
||||
./autogen.sh
|
||||
./configure
|
||||
set +e
|
||||
fi
|
||||
|
||||
# Show resulting config
|
||||
result
|
||||
|
||||
Reference in New Issue
Block a user