ENSC_DIETLIBC_SANITYCHECK(): added
[util-vserver.git] / util-vserver / configure.ac
index aa87e7d..eefef85 100644 (file)
@@ -24,11 +24,11 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.30.190, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.30.196, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([gnits dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([1.9 gnits dist-bzip2 subdir-objects])
 AM_MAINTAINER_MODE
 
 AC_SUBST(GPG_KEY, "0x7AE5D4B5922F7AF9!")
@@ -44,29 +44,23 @@ AM_PROG_CC_C_O
 ENSC_CXXCOMPILER
 ENSC_C99COMPILER
 
-check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-AC_PATH_PROGS(AWK,     [awk],     [awk],         [ $check_paths ])
-AC_PATH_PROGS(GREP,    [grep],    [grep],        [ $check_paths ])
-AC_PATH_PROGS(IP,      [ip],      [ip],          [ $check_paths ])
-AC_PATH_PROGS(MOUNT,   [mount],   [/bin/mount],  [ $check_paths ])
-AC_PATH_PROGS(UMOUNT,  [umount],  [/bin/umount], [ $check_paths ])
-AC_PATH_PROGS(NICE,    [nice],    [nice],        [ $check_paths ])
-AC_PATH_PROGS(VCONFIG, [vconfig], [vconfig],     [ $check_paths ])
-AC_PATH_PROGS(WC,      [wc],      [wc],          [ $check_paths ])
-AC_PATH_PROGS(PS,      [ps],      [/bin/ps],     [ $check_paths ])
-AC_PATH_PROGS(MODPROBE, [modprobe], [/sbin/modprobe], [ $check_paths ])
-AC_PATH_PROGS(RMMOD,    [rmmod],    [/sbin/rmmod],    [ $check_paths ])
-AC_PATH_PROGS(NAMEIF,   [nameif],   [/sbin/nameif],   [ $check_paths ])
-AC_PATH_PROGS(IPTABLES, [iptables], [/sbin/iptables], [ $check_paths ])
-AC_PATH_PROGS(ENV,      [env],      [/usr/bin/env])
-AC_PATH_PROGS(SED,      [sed],      [sed])
-AC_PATH_PROGS(CMP,      [cmp],      [cmp])
-AC_PATH_PROGS(WGET,     [wget],     [wget])
-AC_PATH_PROGS(DOXYGEN,  [doxygen],  [:])
-AC_PATH_PROGS(TAR,      [tar])
-AC_PATH_PROGS(XSLTP,    [xsltp])
-
-AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP")
+ENSC_SET_SEARCHPATH([$PATH:/sbin:/usr/sbin:/usr/local/sbin])
+ENSC_PATHPROG_STANDARD_TOOLS
+
+ENSC_PATHPROG(IP,        ip)
+ENSC_PATHPROG(IPTABLES,  iptables)
+ENSC_PATHPROG(MODPROBE,  modprobe)
+ENSC_PATHPROG(NAMEIF,    nameif)
+ENSC_PATHPROG(RMMOD,     rmmod)
+ENSC_PATHPROG(VCONFIG,   vconfig)
+ENSC_PATHPROG(WGET,      wget)
+
+ENSC_PATHPROG(DOXYGEN,   doxygen,  [:])
+ENSC_PATHPROG(XSLTP,     xsltp,    [:])
+ENSC_PATHPROG(XSLTPROC,  xsltproc, [:])
+
+
+AM_CONDITIONAL(HAVE_XSLTP, test "$XSLTP" != ':')
        
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
@@ -195,10 +189,12 @@ fi
 ensc_cxx_affected=" (affected: vbuild, vcheck)"
 ensc_c99_affected=" (affected: vunify, vcopy)"
 ensc_diet_msg=" (you have been warned)"
+ensc_diet_version_msg=" ($ensc_version_dietlibc)"
 ensc_diet_compat_msg=" (using -lcompat)"
 test x"$ensc_cv_cxx_cxxcompiler"    = xno || ensc_cxx_affected=
 test x"$ensc_cv_c99_c99compiler"    = xno || ensc_c99_affected=
 test x"$ensc_have_dietlibc"         = xno || ensc_diet_msg=
+test x"$ensc_version_dietlibc"     != x   || ensc_diet_version_msg=
 test x"$ensc_have_dietlibc$ensc_cv_c_dietlibc_compat" = xyesyes || ensc_diet_compat_msg=
 
 AH_BOTTOM([#include "compat.h"])
@@ -211,7 +207,7 @@ Features:
                    CFLAGS: '$CFLAGS'
                  CXXFLAGS: '$CXXFLAGS'
                build/host: $build/$host
-             Use dietlibc: $ensc_have_dietlibc$ensc_diet_msg$ensc_diet_compat_msg
+             Use dietlibc: $ensc_have_dietlibc$ensc_diet_version_msg$ensc_diet_msg$ensc_diet_compat_msg
        Build C++ programs: $ensc_cv_cxx_cxxcompiler$ensc_cxx_affected
        Build C99 programs: $ensc_cv_c99_c99compiler$ensc_c99_affected
            Available APIs: $enable_apis