timelord compilation optional, disabled by default

diff --git a/ChangeLog b/ChangeLog
index aed65befcb6940a751519fac0b69a3f2ac505521..254e8fcec32154c9e1b2efff0b5af0b8576680d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2001-04-10  jeff b  <jeff@univrel.pr.uconn.edu>  
+
+       * configure.in, contrib/Makefile.am: made timelord compilation
+       optional, disabled by default
+
 2001-04-03  jeff b  <jeff@univrel.pr.uconn.edu>  
 
        * etc/afpd/file.c: merged patch from Soren Spies <sspies@apple.com>

diff --git a/configure.in b/configure.in
index f1ea9033d42a8c5016be802d675713a2ad8ab169..c48e824d9fcbf216d609a52ed79a4aee30f6ba7f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -141,8 +141,8 @@ AC_DEFINE(ADMIN_GRP, 1)
 AC_ARG_WITH(admin-group,
        [  --disable-admin-group  disable admin group],
         if test "$enableval" = "no"; then
-                       AC_DEFINE(ADMIN_GRP, 0)
-                       AC_MSG_RESULT([disabling administrative group support])
+               AC_DEFINE(ADMIN_GRP, 0)
+               AC_MSG_RESULT([disabling administrative group support])
         fi
  )
 
@@ -279,7 +279,7 @@ AC_ARG_WITH(shadow,
 )
 
 AC_ARG_ENABLE(shell-check,
-       [  --disable-shell-check   disable checking for a valid shell]
+       [  --disable-shell-check   disable checking for a valid shell],
        if test "$enableval" = "no"; then 
                AC_DEFINE(DISABLE_SHELLCHECK, 1)
                AC_MSG_RESULT([disabling valid shell check])
@@ -303,7 +303,7 @@ AC_ARG_WITH(tcp-wrappers,
 
 AC_ARG_ENABLE(redhat,
        [  --enable-redhat         use redhat-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=redhat
        fi
        AC_MSG_RESULT([enabling redhat-style sysv support])
@@ -311,7 +311,7 @@ AC_ARG_ENABLE(redhat,
 
 AC_ARG_ENABLE(suse,
        [  --enable-suse           use suse-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=suse
        fi
        AC_MSG_RESULT([enabling suse-style sysv support])
@@ -319,12 +319,22 @@ AC_ARG_ENABLE(suse,
 
 AC_ARG_ENABLE(cobalt,
        [  --enable-cobalt         use cobalt-style sysv configuration ],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                sysv_style=cobalt
        fi
        AC_MSG_RESULT([enabling cobalt-style sysv support])
 )
 
+dnl ----- timelord compilation (disabled by default)
+compile_timelord=no
+AC_ARG_ENABLE(timelord,
+       [  --enable-timelord       enable compilation of timelord server],
+       if test "$enableval" = "yes"; then
+               compile_timelord=yes
+       fi
+       AC_MSG_RESULT([enabling timelord compilation])
+)
+
 AC_ARG_WITH(uams-path,
        [  --with-uams-path=path   path to UAMs [default=$ac_default_prefix/etc/uams]],
        uams_path="$withval",
@@ -337,7 +347,7 @@ dnl --------------------------------------------------------------------------
 
 AC_ARG_ENABLE(fhs,
        [  --enable-fhs            use Filesystem Hierarchy Standard (FHS) compatibility],
-    if test "$enableval" = "yes"; then
+       if test "$enableval" = "yes"; then
                uams_path="/usr/lib/netatalk"
                config_dir="/etc/netatalk"
                use_pam_so=yes
@@ -536,7 +546,7 @@ AC_ARG_WITH(ssl-dir,
        [  --with-ssl-dir=PATH     specify path to openssl installation (must contain
                           lib and include dirs) ],
        [
-               if test "x$withval" != "$xno"; then
+               if test "x$withval" != "xno"; then
                        tryssldir=$withval
                fi
        ]
@@ -585,6 +595,7 @@ AC_SUBST(LIBS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDSHAREDFLAGS)
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
+AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
 AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d204b763e3eb7b8dbd5e0fff4d3ec8ccfa1ffe6d..9daa32f5ebe067dfe15c47a78325cb0a3362436a 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,5 +1,11 @@
 # Makefile.am for contrib/
 
-SUBDIRS = nu printing shell_utils timelord
+if COMPILE_TIMELORD
+TIMELORD = timelord
+else
+TIMELORD =
+endif
+
+SUBDIRS = nu printing shell_utils ${TIMELORD}
 
 EXTRA_DIST = ICDumpSuffixMap