Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
5ff51f28
Commit
5ff51f28
authored
Nov 23, 2016
by
Tomek Mrugalski
🛰
Browse files
[master] Merge branch 'trac5027' (premium support)
parents
7173ec3c
b8a797df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
5ff51f28
...
...
@@ -2,7 +2,8 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
# ^^^^^^^^ This has to be the first line and cannot come later in this
# Makefile.am due to some bork in some versions of autotools.
SUBDIRS
=
compatcheck tools doc
.
ext src m4macros
SUBDIRS
=
compatcheck tools doc
.
ext src m4macros @PREMIUM_DIR@
USE_LCOV
=
@USE_LCOV@
LCOV
=
@LCOV@
GENHTML
=
@GENHTML@
...
...
configure.ac
View file @
5ff51f28
...
...
@@ -72,6 +72,14 @@ AC_ARG_ENABLE([debug],
AM_CONDITIONAL([DEBUG_ENABLED], [test x$debug_enabled = xyes])
AM_COND_IF([DEBUG_ENABLED], [AC_DEFINE([ENABLE_DEBUG], [1], [Enable low-performing debugging facilities?])])
PREMIUM_DIR=
if test -d "${srcdir}/premium"; then
PREMIUM_DIR=premium
AC_CONFIG_SUBDIRS([premium])
fi
AC_SUBST(PREMIUM_DIR)
# Libtool configuration
#
...
...
@@ -1635,6 +1643,21 @@ AC_CONFIG_FILES([compatcheck/Makefile
chmod +x tools/path_replacer.sh
])
AM_CONDITIONAL(PREMIUM, test -d "$srcdir/premium/src")
AC_MSG_CHECKING([if premium package is available])
if test -d "$srcdir/premium/src"; then
# Define it in the config.h, so C++ code could use it.
AC_DEFINE([PREMIUM], [1], [Kea-premium package found])
# Export it here, so code in configure could use it.
PREMIUM=1
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AC_OUTPUT
dnl Print the results
...
...
@@ -1656,6 +1679,17 @@ Package:
Extended version:${EXTENDED_VERSION}
OS Family: ${OS_TYPE}
Using GNU sed: ${GNU_SED}
END
if test "$PREMIUM" != ""; then
cat >> config.report << END
Premium package: yes
END
else
cat >> config.report << END
Premium package: no
END
fi
cat >> config.report << END
C++ Compiler:
CXX: ${CXX}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment