build: minor build improvements
Add --enable switch for documentation build, build documentation by default and add a few more configure tests. Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
adc06cfd50
commit
37b5f1105f
|
@ -6,7 +6,7 @@ YACC = @YACC@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
DOXYGEN = doxygen
|
DOXYGEN = @DOXYGEN@
|
||||||
|
|
||||||
PACKAGE_STRING = @PACKAGE_STRING@
|
PACKAGE_STRING = @PACKAGE_STRING@
|
||||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
SUBDIRS += include
|
SUBDIRS += include
|
||||||
SUBDIRS += src
|
SUBDIRS += src
|
||||||
SUBDIRS += example
|
SUBDIRS += example
|
||||||
|
SUBDIRS += doc
|
||||||
docs:
|
|
||||||
make SUBDIRS=doc
|
|
||||||
|
|
||||||
include Makefile.rules
|
include Makefile.rules
|
||||||
|
|
12
configure.ac
12
configure.ac
|
@ -14,7 +14,7 @@ AC_DEFINE([_GNU_SOURCE], [], [Enable various GNU extensions])
|
||||||
AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros])
|
AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros])
|
||||||
|
|
||||||
AC_ARG_ENABLE([debug],
|
AC_ARG_ENABLE([debug],
|
||||||
AS_HELP_STRING([--enable-debug], [Enable debugging]),
|
AS_HELP_STRING([--enable-debug], [enable debugging [yes]]),
|
||||||
[CONFIG_DEBUG="$(echo $enableval | cut -b1)"],
|
[CONFIG_DEBUG="$(echo $enableval | cut -b1)"],
|
||||||
[CONFIG_DEBUG="y"])
|
[CONFIG_DEBUG="y"])
|
||||||
AC_SUBST([CONFIG_DEBUG])
|
AC_SUBST([CONFIG_DEBUG])
|
||||||
|
@ -24,6 +24,13 @@ AC_PROG_CC
|
||||||
AC_PROG_MKDIR_P
|
AC_PROG_MKDIR_P
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
AC_PROG_LN_S
|
AC_PROG_LN_S
|
||||||
|
AC_PROG_SED
|
||||||
|
|
||||||
|
AC_ARG_ENABLE([doc],
|
||||||
|
AS_HELP_STRING([--enable-doc], [build documentation [no]]),
|
||||||
|
AC_CHECK_PROG(DOXYGEN, doxygen, doxygen),
|
||||||
|
AC_MSG_NOTICE([Documentation build disabled])
|
||||||
|
DOXYGEN=/bin/true)
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
AC_CHECK_LIB([nl], [nl_socket_alloc], ,
|
AC_CHECK_LIB([nl], [nl_socket_alloc], ,
|
||||||
|
@ -63,8 +70,11 @@ AC_SUBST(EVENT_CFLAGS)
|
||||||
AC_HEADER_STDBOOL
|
AC_HEADER_STDBOOL
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
AC_C_INLINE
|
AC_C_INLINE
|
||||||
|
AC_C_TYPEOF
|
||||||
|
|
||||||
AC_TYPE_OFF_T
|
AC_TYPE_OFF_T
|
||||||
AC_TYPE_SIZE_T
|
AC_TYPE_SIZE_T
|
||||||
|
AC_TYPE_SSIZE_T
|
||||||
AC_TYPE_UID_T
|
AC_TYPE_UID_T
|
||||||
AC_TYPE_INT8_T
|
AC_TYPE_INT8_T
|
||||||
AC_TYPE_INT16_T
|
AC_TYPE_INT16_T
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
all: doxygen
|
all: doxygen
|
||||||
|
|
||||||
doxygen:
|
doxygen:
|
||||||
$(DOXYGEN) $(SUBDIR)Doxyfile
|
if test -n "$(DOXYGEN)"; then \
|
||||||
|
$(DOXYGEN) $(SUBDIR)Doxyfile; \
|
||||||
|
else \
|
||||||
|
echo "Doxygen not found, can not build documentation"; \
|
||||||
|
fi
|
||||||
|
|
Reference in New Issue