diff options
| author |  Greg Hudson <ghudson@mit.edu> | 1997-09-24 20:15:19 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 1997-09-24 20:15:19 +0000 |
| commit | fb7ebbceeeb7a77f0edc50ba0d28309042eb8859 (patch) | |
| tree | 23655987f46944797b46992ce0c3a9e434e43532 | |
| parent | b7b8219bf7b4b67598827f4740a8caa1a2700ba9 (diff) | |
Stop generating zephyr.h from configure; it's always the same now.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | h/zephyr/zephyr.h (renamed from h/zephyr/zephyr.h.in) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index fa78ac7..283aa7d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,7 +41,8 @@ install: ${ENSUREDIR} ${DESTDIR}${mandir}/man8 755 ${INSTALL} -m 644 ${srcdir}/h/zephyr/mit-copyright.h \ ${DESTDIR}${includedir}/zephyr - ${INSTALL} -m 644 h/zephyr/zephyr.h ${DESTDIR}${includedir}/zephyr + ${INSTALL} -m 644 ${srcdir}/h/zephyr/zephyr.h \ + ${DESTDIR}${includedir}/zephyr ${INSTALL} -m 644 h/zephyr/zephyr_err.h ${DESTDIR}${includedir}/zephyr for i in ${SUBDIRS}; do (cd $$i; ${MAKE} $@) || exit 1; done @@ -2972,7 +2972,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - KRB4_LIBS="-lkrb4 -ldes425 -lcom_err" + KRB4_LIBS="-lkrb4 -lkrb5 -ldes425 -lcrypto -lcom_err" else echo "$ac_t""no" 1>&6 { echo "configure: error: Kerberos 4 libraries not found" 1>&2; exit 1; } @@ -3516,7 +3516,7 @@ trap 'rm -fr `echo "Makefile clients/Makefile clients/syslogd/Makefile clients/zpopnotify/Makefile clients/zshutdown_notify/Makefile clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile libdyn/Makefile server/Makefile zhm/Makefile zwgc/Makefile - clients/xzwrite/XZwrite zwgc/zephyr.vars h/config.h h/zephyr/zephyr.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + clients/xzwrite/XZwrite zwgc/zephyr.vars h/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -3711,7 +3711,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <<EOF - CONFIG_HEADERS="h/config.h h/zephyr/zephyr.h" + CONFIG_HEADERS="h/config.h" EOF cat >> $CONFIG_STATUS <<\EOF fi diff --git a/configure.in b/configure.in index 905fff5..61a1b41 100644 --- a/configure.in +++ b/configure.in @@ -99,7 +99,7 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS(putenv re_comp strchr memcpy memmove waitpid getlogin) AC_CHECK_FUNCS(strerror random lrand48 gethostid krb_get_err_text krb_log) -AC_CONFIG_HEADER(h/config.h h/zephyr/zephyr.h) +AC_CONFIG_HEADER(h/config.h) AC_OUTPUT(Makefile clients/Makefile clients/syslogd/Makefile clients/xzwrite/Makefile clients/zaway/Makefile clients/zctl/Makefile clients/zleave/Makefile clients/zlocate/Makefile diff --git a/h/zephyr/zephyr.h.in b/h/zephyr/zephyr.h index 156650a..156650a 100644 --- a/h/zephyr/zephyr.h.in +++ b/h/zephyr/zephyr.h |