Release 3-2-0 with tag: REL_mrw-c++-3-2-0
This commit is contained in:
37
configure.in
37
configure.in
@@ -13,11 +13,11 @@
|
||||
|
||||
# init
|
||||
AC_INIT([mrw/mrw.hpp.in])
|
||||
AC_CANONICAL_SYSTEM
|
||||
PACKAGENAME=mrw-c++
|
||||
m4_define(x_major, 2)
|
||||
m4_define(x_minor, 3)
|
||||
m4_define(x_major, 3)
|
||||
m4_define(x_minor, 2)
|
||||
m4_define(x_least, 1)
|
||||
AM_INIT_AUTOMAKE(@PACKAGENAME@, @MAJOR@.@MINOR@.@LEAST@, [marc@waeckerlin.org])
|
||||
|
||||
# copy M4 to shell
|
||||
MAJOR=x_major
|
||||
@@ -27,6 +27,8 @@ AC_SUBST(MAJOR)
|
||||
AC_SUBST(MINOR)
|
||||
AC_SUBST(LEAST)
|
||||
|
||||
AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
|
||||
|
||||
# libtool versioning
|
||||
LIB_MAJOR=m4_eval(x_major+x_minor)
|
||||
LIB_MINOR=x_least
|
||||
@@ -62,9 +64,17 @@ AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__])
|
||||
# libraries
|
||||
AC_CHECK_HEADER(log4cxx/logger.h, [have_log4cxx=yes])
|
||||
AC_CHECK_HEADER(ltdl.h, [have_ltdl=yes])
|
||||
AC_CHECK_HEADER(regex.h, [have_regex=yes])
|
||||
AC_CHECK_HEADERS(unistd.h fcntl.h, [have_exec=yes])
|
||||
AC_CHECK_HEADER(dirent.h, [have_dir=yes])
|
||||
|
||||
# Arguments
|
||||
AM_MAINTAINER_MODE
|
||||
AC_ARG_ENABLE(valgrind,
|
||||
AS_HELP_STRING([--enable-valgrind],
|
||||
[runs all checks with valgrind enabled]),
|
||||
[have_valgrind="$enableval"], [have_valgrind="no"])
|
||||
AM_CONDITIONAL(HAVE_VALGRIND, test "$have_valgrind" = "yes")
|
||||
AC_ARG_ENABLE(threads,
|
||||
[ --disable-threads disable multithreading],
|
||||
[with_threads="$enableval"], [with_threads="yes"])
|
||||
@@ -85,6 +95,18 @@ 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(dir,
|
||||
[ --disable-dir disable POSIX directory access],
|
||||
[have_dir="$enableval"])
|
||||
AM_CONDITIONAL(HAVE_DIR, test "$have_dir" = "yes")
|
||||
AC_ARG_ENABLE(exec,
|
||||
[ --disable-exec disable UNIX fork and execute with pipes],
|
||||
[have_exec="$enableval"])
|
||||
AM_CONDITIONAL(HAVE_EXEC, test "$have_exec" = "yes")
|
||||
AC_ARG_ENABLE(regexp,
|
||||
[ --disable-regexp disable use of regular expressions],
|
||||
[have_regex="$enableval"])
|
||||
AM_CONDITIONAL(HAVE_REGEXP, test "$have_regex" = "yes")
|
||||
AC_ARG_ENABLE(log4cxx,
|
||||
[ --disable-log4cxx disable use of log4cxx library in automated
|
||||
stack trace],
|
||||
@@ -197,6 +219,15 @@ if test "$with_threads" = "no"; then
|
||||
AC_MSG_WARN([Multithreading support is disabled!
|
||||
- use --enable-threads to enable it
|
||||
- actually, there's only support for automated function trace]); fi
|
||||
if test "$have_dir" != "yes"; then
|
||||
AC_MSG_WARN([POSIX directory access is disabled!
|
||||
- you need a UNIX/Posix environment if you want to use it]); fi
|
||||
if test "$have_exec" != "yes"; then
|
||||
AC_MSG_WARN([UNIX fork/exec with pipes will not be used!
|
||||
- you need a UNIX/Posix environment if you want to use it]); fi
|
||||
if test "$have_regex" != "yes"; then
|
||||
AC_MSG_WARN([GNU regular expression library will not be used!
|
||||
- if you want it, install it]); fi
|
||||
if test "$have_log4cxx" != "yes"; then
|
||||
AC_MSG_WARN([Library log4cxx will not be used!
|
||||
- if you want it, download it from:
|
||||
|
||||
Reference in New Issue
Block a user