Remove --enable-timelord; always compile timelord.

diff --git a/configure.in b/configure.in
index 4163e472804f80c3e51e27fd62115c4c49dda108..a9edbe345f5116869cd08b5a96199ca86733041b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.185 2003-06-08 15:17:56 srittau Exp $
+dnl $Id: configure.in,v 1.186 2003-06-08 15:21:40 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -384,16 +384,6 @@ AC_ARG_ENABLE(netbsd,
        AC_MSG_RESULT([enabling NetBSD-style rc.d support])
 )
 
-dnl ----- timelord compilation (disabled by default)
-AC_MSG_CHECKING([whether timelord should be compiled])
-compile_timelord=no
-AC_ARG_ENABLE(timelord,
-       [  --enable-timelord       enable compilation of timelord server],
-       [compile_timelord="$enableval"],
-       [compile_timelord="no"]
-)
-AC_MSG_RESULT([$compile_timelord])
-
 dnl ----- a2boot compilation (disabled by default)
 AC_MSG_CHECKING([whether a2boot should be compiled])
 compile_a2boot=no
@@ -664,7 +654,6 @@ AC_SUBST(CFLAGS)
 AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
-AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
 AM_CONDITIONAL(COMPILE_A2BOOT, test x$compile_a2boot = xyes)
 AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 633257c3df66f778a1cfc7ea6a554ace9a27ab45..a7fe893233a407a1d909ccb237ae236b53ed8b64 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,10 +1,5 @@
 # Makefile.am for contrib/
-
-if COMPILE_TIMELORD
-TIMELORD = timelord
-else
-TIMELORD =
-endif
+# $Id: Makefile.am,v 1.8 2003-06-08 15:21:40 srittau Exp $
 
 if COMPILE_A2BOOT
 A2BOOT = a2boot
@@ -12,6 +7,6 @@ else
 A2BOOT =
 endif
 
-SUBDIRS = macusers nu printing shell_utils ${TIMELORD} ${A2BOOT}
+SUBDIRS = macusers nu printing shell_utils timelord ${A2BOOT}
 
 EXTRA_DIST = ICDumpSuffixMap