r4259@bucket (orig r249): kcr | 2008-01-20 15:59:10 -0500

 drop xzwrite and z{mail,pop}notify

git-svn-id: svn://svn.1ts.org/debian/trunk@321 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/zephyr/configure b/zephyr/configure
index 94cc8073d4569ed4cd8fdc83211b0bc126812d7b..efc8d4245bb996d8303b584e8e6a50b8925c3a3c 100755 (executable)
--- a/zephyr/configure
+++ b/zephyr/configure
@@ -21471,7 +21471,6 @@ done
 
 
 if test "$no_x" != "yes"; then
-       XCLIENTS=xzwrite
        ZWGC_LIBX11=-lX11
 fi
 
@@ -26178,7 +26177,7 @@ echo "${ECHO_T}$ac_cv_have_krb5_creds_keyblock_enctype" >&6; }
 
 ac_config_headers="$ac_config_headers h/config.h"
 
-ac_config_files="$ac_config_files Makefile clients/Makefile clients/xzwrite/Makefile clients/zaway/Makefile clients/zctl/Makefile clients/zleave/Makefile clients/zlocate/Makefile clients/zmailnotify/Makefile clients/znol/Makefile clients/zpopnotify/Makefile clients/zshutdown_notify/Makefile clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile libdyn/Makefile server/Makefile zhm/Makefile zwgc/Makefile"
+ac_config_files="$ac_config_files Makefile clients/Makefile clients/zaway/Makefile clients/zctl/Makefile clients/zleave/Makefile clients/zlocate/Makefile clients/znol/Makefile clients/zshutdown_notify/Makefile clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile libdyn/Makefile server/Makefile zhm/Makefile zwgc/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -26736,14 +26735,11 @@ do
     "h/config.h") CONFIG_HEADERS="$CONFIG_HEADERS h/config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "clients/Makefile") CONFIG_FILES="$CONFIG_FILES clients/Makefile" ;;
-    "clients/xzwrite/Makefile") CONFIG_FILES="$CONFIG_FILES clients/xzwrite/Makefile" ;;
     "clients/zaway/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zaway/Makefile" ;;
     "clients/zctl/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zctl/Makefile" ;;
     "clients/zleave/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zleave/Makefile" ;;
     "clients/zlocate/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zlocate/Makefile" ;;
-    "clients/zmailnotify/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zmailnotify/Makefile" ;;
     "clients/znol/Makefile") CONFIG_FILES="$CONFIG_FILES clients/znol/Makefile" ;;
-    "clients/zpopnotify/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zpopnotify/Makefile" ;;
     "clients/zshutdown_notify/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zshutdown_notify/Makefile" ;;
     "clients/zstat/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zstat/Makefile" ;;
     "clients/zwrite/Makefile") CONFIG_FILES="$CONFIG_FILES clients/zwrite/Makefile" ;;

diff --git a/zephyr/configure.in b/zephyr/configure.in
index 7985dae80d74f307b219e2890b497c5be6acb3ea..fc16ee77ddd7774e94003a48e9fc975d81f25372 100644 (file)
--- a/zephyr/configure.in
+++ b/zephyr/configure.in
@@ -40,7 +40,6 @@ AC_CHECK_HEADERS(sys/filio.h sys/ioctl.h sys/time.h sys/file.h sys/utsname.h)
 AC_CHECK_HEADERS(sys/select.h sys/msgbuf.h sys/cdefs.h krb5_err.h)
 
 if test "$no_x" != "yes"; then
-       XCLIENTS=xzwrite
        ZWGC_LIBX11=-lX11
 fi
 AC_SUBST(XCLIENTS)
@@ -156,10 +155,9 @@ fi
 AC_MSG_RESULT($ac_cv_have_krb5_creds_keyblock_enctype)
 
 AC_CONFIG_HEADER(h/config.h)
-AC_OUTPUT(Makefile clients/Makefile clients/xzwrite/Makefile
-         clients/zaway/Makefile clients/zctl/Makefile
-         clients/zleave/Makefile clients/zlocate/Makefile
-         clients/zmailnotify/Makefile clients/znol/Makefile
-         clients/zpopnotify/Makefile clients/zshutdown_notify/Makefile
-         clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile
-         libdyn/Makefile server/Makefile zhm/Makefile zwgc/Makefile)
+AC_OUTPUT(Makefile clients/Makefile clients/zaway/Makefile
+          clients/zctl/Makefile clients/zleave/Makefile
+          clients/zlocate/Makefile clients/znol/Makefile
+          clients/zshutdown_notify/Makefile clients/zstat/Makefile
+          clients/zwrite/Makefile lib/Makefile libdyn/Makefile
+          server/Makefile zhm/Makefile zwgc/Makefile)