tests: Fix cmd config file path

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index b9cda09..f3ccfe0 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -79,6 +79,10 @@ AC_ARG_ENABLE([pam],
     [AS_HELP_STRING([--disable-pam], [disable PAM support])],
     ,
     [enable_pam="yes"])
+AC_ARG_ENABLE([gtx],
+    AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools]))
+AC_ARG_ENABLE([uss],
+    AS_HELP_STRING([--disable-uss], [disable uss bulk creation tool]))
 AC_ARG_ENABLE([namei-fileserver],
     [AS_HELP_STRING([--enable-namei-fileserver],
         [force compilation of namei fileserver in preference to inode
@@ -374,7 +378,10 @@ case $system in
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
                AC_PATH_PROG(SOLARISCC, [cc], ,
-                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin])
+                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin:/opt/solarisstudio12.3/bin:/opt/solstudio12.2/bin:/opt/sunstudio12.1/bin])
+               if test "x$SOLARISCC" = "x" ; then
+                   AC_MSG_FAILURE(Could not find the solaris cc program.  Please define the environment variable SOLARISCC to specify the path.)
+               fi
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
@@ -837,6 +844,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 #include <linux/page-flags.h>],
                                     [struct page *_page;
                                       int bchecked = PageFsMisc(_page);])
+                AC_CHECK_LINUX_FUNC([clear_inode],
+                                    [#include <linux/fs.h>],
+                                    [clear_inode(NULL);])
                 AC_CHECK_LINUX_FUNC([current_kernel_time],
                                     [#include <linux/time.h>],
                                     [struct timespec s;
@@ -951,6 +961,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_D_COUNT_IS_INT
                 LINUX_IOP_MKDIR_TAKES_UMODE_T
                 LINUX_IOP_CREATE_TAKES_UMODE_T
+                LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1364,16 +1375,16 @@ dnl see what struct stat has for timestamps
 AC_CHECK_MEMBERS([struct stat.st_ctimespec, struct stat.st_ctimensec])
 
 dnl check for curses-lib
-save_LIBS=$LIBS
-AC_CHECK_LIB( [ncurses], [setupterm],
-[LIB_curses=-lncurses],
-    [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses],
-        [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])
-    ])
-])
-LIBS=$save_LIBS
-AC_SUBST(LIB_curses)
-
+AS_IF([test "x$enable_gtx" != "xno"],
+      [save_LIBS=$LIBS
+      AC_CHECK_LIB( [ncurses], [setupterm],
+      [LIB_curses=-lncurses],
+        [AC_CHECK_LIB([Hcurses], [setupterm], [LIB_curses=-lHcurses],
+          [AC_CHECK_LIB([curses], [setupterm], [LIB_curses=-lcurses])])
+      ])
+      LIBS=$save_LIBS
+      AC_SUBST(LIB_curses)])
+       
 OPENAFS_TEST_PACKAGE(libintl,[#include <libintl.h>],[-lintl],,,INTL)
 
 dnl Don't build PAM on IRIX; the interface doesn't work for us.
@@ -1398,6 +1409,13 @@ else
 fi
 AC_SUBST(BUILD_LOGIN)
 
+if test "$enable_uss" = yes; then
+       BUILD_USS="yes"
+else
+       BUILD_USS="no"
+fi
+AC_SUBST(BUILD_USS)
+
 AC_CHECK_FUNCS([ \
        arc4random \
        fcntl \
@@ -1408,7 +1426,6 @@ AC_CHECK_FUNCS([ \
        geteuid \
        getgid \
        getuid \
-       getprogname \
        getrlimit \
        issetugid \
        mkstemp \
@@ -1422,13 +1439,13 @@ AC_CHECK_FUNCS([ \
        regerror \
        regexec \
        setitimer \
-       setprogname \
        setvbuf \
        sigaction \
        strcasestr \
        strerror \
        sysconf \
        sysctl \
+       tdestroy \
        timegm \
 ])
 
@@ -1481,6 +1498,7 @@ AC_REPLACE_FUNCS([ \
        localtime_r \
        mkstemp \
        setenv \
+       setprogname \
        strcasecmp \
        strlcat \
        strnlen \