use ENSC_UV_VROOTDIR to set 'vserverdir'
[util-vserver.git] / util-vserver / configure.ac
index 1587dd0..16c58ab 100644 (file)
@@ -24,7 +24,7 @@ dnl distribution terms that you use for the rest of that program.
 dnl  
 
 AC_PREREQ(2.57)
-AC_INIT(util-vserver, 0.23.191, enrico.scholz@informatik.tu-chemnitz.de)
+AC_INIT(util-vserver, 0.23.196, enrico.scholz@informatik.tu-chemnitz.de)
 AC_CONFIG_SRCDIR([src/capchroot.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -39,7 +39,9 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
+dnl AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
+ENSC_CXXCOMPILER
 
 check_paths=$PATH:/sbin:/usr/sbin:/usr/local/sbin
 AC_PATH_PROGS(AWK,     [awk],     [awk],         [ $check_paths ])
@@ -58,62 +60,37 @@ AC_CHECK_PROGS(RCS2LOG, [rcs2log])
 AM_CONDITIONAL(HAVE_RCS2LOG,  [test x"$RCS2LOG" != x])
 
 ENSC_CHECK_CC_FLAG([-std=c99 -Wall -pedantic -W])
-
-AC_MSG_CHECKING([whether to enable dietlibc])
-AC_ARG_ENABLE([dietlibc],
-             [AC_HELP_STRING([--disable-dietlibc],
-                             [do not use dietlibc (default: use dietlibc)])],
-             [case "$withval" in
-                 yes)  use_dietlibc=forced;;
-                 no)   use_dietlibc=forced_no;;
-                 *)    AC_MSG_ERROR(['$withval' is not a valid value for --enable-dietlibc]);;
-              esac],
-             [: ${DIET:=diet}
-              which "$DIET" >/dev/null 2>/dev/null && use_dietlibc=detected || use_dietlibc=detected_no])
-
-case x"$use_dietlibc" in
-    xdetected)
-       AM_CONDITIONAL(USE_DIETLIBC, true)
-       AC_MSG_RESULT([yes (autodetected)])
-       ;;
-    xforced)
-       AM_CONDITIONAL(USE_DIETLIBC, true)
-       AC_MSG_RESULT([yes (forced)])
-       ;;
-    xdetected_no)
-       AM_CONDITIONAL(USE_DIETLIBC, false)
-       AC_MSG_RESULT([no (detected)])
-       ;;
-    xforced_no)
-       AM_CONDITIONAL(USE_DIETLIBC, false)
-       AC_MSG_RESULT([no (forced)])
-       ;;
-    *)
-       AC_MSG_ERROR([internal error, use_dietlibc was "$use_dietlibc"])
-       ;;
-esac
+ENSC_CHECK_CXX_FLAG([-ansi   -Wall -pedantic -W -fmessage-length=0])
+
+ENSC_FPIC_SYSCALL
+
+
+AC_MSG_CHECKING([whether to enable debug-code in library])
+AC_ARG_ENABLE([lib-debug],
+             [AC_HELP_STRING([--enable-lib-debug],
+                              [enable additional debug code in library (default: no)])],
+              [case "$enableval" in
+                 yes)  use_lib_debug=1;;
+                  no)   use_lib_debug=;;
+                  *)    AC_MSG_ERROR(['$enableval' is not a valid value for '--enable-lib-debug']);;
+               esac],
+              [ use_lib_debug= ])
+
+if test x"$use_lib_debug" = x; then
+       AC_SUBST(LIB_DEBUG_CPPFLAGS, [-DNDEBUG])
+       AC_MSG_RESULT(no)
+else
+       AC_SUBST(LIB_DEBUG_CPPFLAGS, [])
+       AC_MSG_RESULT(yes)
+fi
 
 AC_ARG_VAR(CC, [The C compiler])
-AC_MSG_CHECKING([for linux kernel headers])
-AC_ARG_WITH([kerneldir],
-           [AC_HELP_STRING([--with-kerneldir=DIR],
-                            [assume top-kernelsources in DIR (default: /lib/modules/<current>/build)])],
-            [case "$withval" in
-               yes|no) AC_MSG_ERROR(['$withval' is not a valid value for kerneldir]);;
-               *)      kerneldir=$withval;;
-            esac],
-           [kerneldir=
-            for i in /lib/modules/$(uname -r)/build /usr/src/linux /usr; do
-               test -e $i/include/linux/version.h && { kerneldir=$i; break; }
-            done])
-
-test "$kerneldir" -a -e $i/include/linux/version.h || {
-       AC_MSG_ERROR([Can not find kernelsources])
-}
-
-kernelincludedir=$kerneldir/include
-AC_SUBST(kernelincludedir)
-AC_MSG_RESULT($kernelincludedir/linux)
+
+ENSC_INITRDDIR(initrddir)
+ENSC_RELEASE(RELEASE_CPPFLAGS)
+ENSC_ENABLE_DIETLIBC(USE_DIETLIBC)
+ENSC_KERNEL_HEADERS(kernelincludedir)
+ENSC_UV_VROOTDIR(vserverdir)
 
 AC_MSG_CHECKING([for supported APIs])
 AC_ARG_ENABLE([apis],