Release 3-2-3 with tag: REL_mrw-c++-3-2-3
This commit is contained in:
11
configure.in
11
configure.in
@@ -17,7 +17,7 @@ AC_CANONICAL_SYSTEM
|
||||
PACKAGENAME=mrw-c++
|
||||
m4_define(x_major, 3)
|
||||
m4_define(x_minor, 2)
|
||||
m4_define(x_least, 3)
|
||||
m4_define(x_least, 4)
|
||||
|
||||
# copy M4 to shell
|
||||
MAJOR=x_major
|
||||
@@ -95,6 +95,11 @@ AC_ARG_ENABLE(dot,
|
||||
[ --disable-dot disable dot graphic tools for documentation],
|
||||
[have_dot="$enableval"])
|
||||
test "$enableval" = "yes" && HAVE_DOT="YES" || HAVE_DOT="NO";
|
||||
AC_ARG_ENABLE(doxygen,
|
||||
[ --disable-doxygen disable build of documentation],
|
||||
[have_doxygen="$enableval"])
|
||||
test "$enableval" = "yes" && HAVE_DOXYGEN="YES" || HAVE_DOXYGEN="NO";
|
||||
AM_CONDITIONAL(HAVE_DOXYGEN, test "$enableval" = "yes")
|
||||
AC_ARG_ENABLE(dir,
|
||||
[ --disable-dir disable POSIX directory access],
|
||||
[have_dir="$enableval"])
|
||||
@@ -186,6 +191,7 @@ AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
|
||||
|
||||
# export macros
|
||||
AC_SUBST(HAVE_DOT)
|
||||
AC_SUBST(HAVE_DOXYGEN)
|
||||
AC_SUBST(THREADS)
|
||||
AC_SUBST(PACKAGENAME)
|
||||
AC_SUBST(AM_CXXFLAGS)
|
||||
@@ -206,6 +212,9 @@ if test "$have_dot" = "no"; then
|
||||
AC_MSG_WARN([Missing program dot!
|
||||
- when you rebild documentation with make doc, there are no generated images
|
||||
- there are precompiled derived files in the distribution]); fi
|
||||
if test "$have_doxygen" = "no"; then
|
||||
AC_MSG_WARN([Disabled doxygen!
|
||||
- documentation will not be built]); fi
|
||||
if test "$have_cppunit" = "no"; then
|
||||
AC_MSG_WARN([Missing cppunit development library!
|
||||
- you cannot check the library using "make check"
|
||||
|
||||
Reference in New Issue
Block a user