Make nodev the default, but don't enforce it for all mounts.
[util-vserver.git] / configure.ac
index 23fdf1f..8077a96 100644 (file)
@@ -56,6 +56,11 @@ ENSC_PATHPROG(NOHUP,     nohup)
 ENSC_PATHPROG(RMMOD,     rmmod)
 ENSC_PATHPROG(VCONFIG,   vconfig,, [See http://www.candelatech.com/~greear/vlan.html; usually this tool is shipped in the 'vconfig' or 'vlan' package of your distribution])
 ENSC_PATHPROG(WGET,      wget)
+ENSC_PATHPROG(FILE,      file,    [file])
+ENSC_PATHPROG(GZIP,      gzip,    [gzip])
+ENSC_PATHPROG(BZIP2,     bzip2,   [bzip2])
+ENSC_PATHPROG(CPIO,      cpio,    [cpio])
+ENSC_PATHPROG(RESTORE,   restore, [restore])
 
 ENSC_PATHPROG(DOXYGEN,   doxygen,  [:])
 ENSC_PATHPROG(XSLTP,     xsltp,    [:])
@@ -64,7 +69,10 @@ ENSC_PATHPROG(XSLTPROC,  xsltproc, [:])
 
 AM_CONDITIONAL(HAVE_XSLTP,    test "$XSLTP"    != ':')
 AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != ':')
-       
+
+if test x"$prefix" = x/; then
+       prefix=
+fi     
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
 ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
@@ -136,6 +144,7 @@ dnl
 case $host_cpu in
        (i*86|athlon)   min_diet_ver=0.25;;
        (ia64|hppa*)    min_diet_ver=0.29;;
+       (sparc*)        min_diet_ver=0.30;;
        (*)             min_diet_ver=0.28;;
 esac
 
@@ -174,7 +183,7 @@ dnl ##########################
 
 
 ENSC_UV_VROOTDIR(vserverdir)
-ENSC_CHANGELOG([trunk])
+ENSC_CHANGELOG
 
 
 dnl ##########################
@@ -229,33 +238,35 @@ IFS=,;
 for i in $enable_apis; do
        case "$i" in
                (compat)        AC_DEFINE(VC_ENABLE_API_COMPAT,   1)
-                               enable_api_oldproc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
                (legacy)        AC_DEFINE(VC_ENABLE_API_LEGACY,   1)
-                               enable_api_old_proc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
                (v11)           AC_DEFINE(VC_ENABLE_API_V11,      1)
-                               enable_api_oldproc=1
-                               enable_api_olduts=1
+                               enable_api_oldproc=${enable_api_oldproc:-1}
+                               enable_api_olduts=${enable_api_olduts:-1}
                                ;;
                (fscompat)      AC_DEFINE(VC_ENABLE_API_FSCOMPAT, 1);;
                (v13obs)        AC_DEFINE(VC_ENABLE_API_V13OBS,   1)
                                AC_DEFINE(VC_ENABLE_API_V13,      1);;
                (v13)           AC_DEFINE(VC_ENABLE_API_V13,      1);;
                (net)           AC_DEFINE(VC_ENABLE_API_NET,      1);;
+               (oldproc)       enable_api_oldproc=2;;
+               (olduts)        enable_api_olduts=2;;
                (*)             AC_MSG_ERROR(['$i' is not a supported API]);;
        esac
 done
 IFS=$old_IFS
 if test x"$enable_api_oldproc" != x; then
        AC_DEFINE(VC_ENABLE_API_OLDPROC, 1)
-       enable_apis="$enable_apis,oldproc"
+       test x"$enable_api_oldproc" != x2 && enable_apis="$enable_apis,oldproc"
 fi
 if test x"$enable_api_olduts" != x; then
        AC_DEFINE(VC_ENABLE_API_OLDUTS, 1)
-       enable_apis="$enable_apis,olduts"
+       test x"$enable_api_olduts" != x2 && enable_apis="$enable_apis,olduts"
 fi
 AC_MSG_RESULT([$enable_apis])
 dnl
@@ -274,6 +285,14 @@ AC_CHECK_TYPES(nid_t,,,[#include <sys/types.h>])
 
 AC_CHECK_HEADERS([sys/capability.h])
 
+dnl vlogin might need -lutil
+if test x"$ensc_have_dietlibc" = xno; then
+       AC_CHECK_FUNC([openpty],, [AC_CHECK_LIB([util], [openpty],, [AC_MSG_ERROR([
+****
+**** openpty could not be found
+****])])])
+fi
+
 
 dnl ########################
 dnl