From aceacf93df373fe4811e03db709b6a3a53db55a2 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 28 Mar 2006 04:35:02 +0000 Subject: [PATCH] * configure.in: Supply comment template in AC_DEFINE calls git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17789 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/ChangeLog | 4 ++++ src/appl/bsd/ChangeLog | 4 ++++ src/appl/bsd/configure.in | 16 ++++++++-------- src/appl/configure.in | 2 +- src/appl/gssftp/ChangeLog | 4 ++++ src/appl/gssftp/configure.in | 8 ++++---- src/appl/telnet/ChangeLog | 4 ++++ src/appl/telnet/configure.in | 18 +++++++++--------- 8 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog index 277410447..e35d18626 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,7 @@ +2006-03-27 Ken Raeburn + + * configure.in: Supply comment template in AC_DEFINE calls. + 2005-08-20 Ken Raeburn * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 18da6c869..23bdabee7 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,7 @@ +2006-03-27 Ken Raeburn + + * configure.in: Supply comment template in AC_DEFINE calls. + 2005-08-20 Ken Raeburn * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 244adf9cd..9a425edb9 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -7,7 +7,7 @@ AC_ARG_WITH([afs], --with-afs=AFSDIR use preinstalled AFS library tree], ,with_afs=no)dnl if test $with_afs != no; then - AC_DEFINE(SETPAG) + AC_DEFINE(SETPAG,1,[Define if setpag should be used]) LOGINLIBS="$LOGINLIBS -L$with_afs/lib -L$with_afs/lib/afs -lauth -lsys -lrx -llwp" fi AC_PROG_INSTALL @@ -36,7 +36,7 @@ case $krb5_cv_host in ;; alpha*-dec-osf*) AC_CHECK_LIB(security,setluid, - AC_DEFINE(HAVE_SETLUID) + AC_DEFINE(HAVE_SETLUID,1,[Define if setluid is supplied by the OSF/1 security library]) LOGINLIBS="$LOGINLIBS -lsecurity" ) ;; @@ -87,7 +87,7 @@ CHECK_SIGNALS CHECK_SETJMP CHECK_DIRENT CHECK_WAIT_TYPE -AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS))]) +AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS,1,[Define if POSIX-compatible termios interface is found]))]) CHECK_UTMP KRB5_GETSOCKNAME_ARGS dnl @@ -116,7 +116,7 @@ AC_CACHE_VAL(krb5_cv_has_streams, krb5_cv_has_streams=yes, krb5_cv_has_streams=no)]) AC_MSG_RESULT($krb5_cv_has_streams) if test $krb5_cv_has_streams = yes; then -AC_DEFINE(HAVE_STREAMS) +AC_DEFINE(HAVE_STREAMS,1,[Define if the OS uses streams]) fi dnl dnl @@ -128,7 +128,7 @@ AC_CACHE_VAL(krb5_cv_f_setown, krb5_cv_f_setown=yes,krb5_cv_f_setown=no)]) AC_MSG_RESULT($krb5_cv_f_setown) if test $krb5_cv_f_setown = yes; then -AC_DEFINE(HAVE_SETOWN) +AC_DEFINE(HAVE_SETOWN,1,[Define if F_SETOWN is available]) fi dnl dnl @@ -143,7 +143,7 @@ SETENVSRC=setenv.c SETENVOBJ=setenv.o AC_SUBST([SETENVSRC]) AC_SUBST([SETENVOBJ]) -AC_DEFINE([NEED_SETENV]) +AC_DEFINE([NEED_SETENV],1,[Define if setenv needs to be defined]) fi dnl dnl @@ -157,7 +157,7 @@ AC_CACHE_VAL(krb5_cv_setpgrp_args, krb5_cv_setpgrp_args=two, krb5_cv_setpgrp_args=void)]) AC_MSG_RESULT($krb5_cv_setpgrp_args) if test $krb5_cv_setpgrp_args = two; then -AC_DEFINE(SETPGRP_TWOARG) +AC_DEFINE(SETPGRP_TWOARG,1,[Define if setpgrp takes two arguments]) fi dnl dnl @@ -171,7 +171,7 @@ AC_CACHE_VAL(krb5_cv_shadow_pwd, krb5_cv_shadow_pwd=yes, krb5_cv_shadow_pwd=no)]) AC_MSG_RESULT($krb5_cv_shadow_pwd) if test $krb5_cv_shadow_pwd = yes; then -AC_DEFINE(HAVE_SHADOW) +AC_DEFINE(HAVE_SHADOW,1,[Define if shadow password interface is available]) fi dnl dnl diff --git a/src/appl/configure.in b/src/appl/configure.in index e6114f287..8b96bff50 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -10,7 +10,7 @@ dnl dnl Kludge for simple server --- FIXME is this the best way to do this? dnl if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then - AC_DEFINE(BROKEN_STREAMS_SOCKETS) + AC_DEFINE(BROKEN_STREAMS_SOCKETS,1,[Define if socket can't be bound to 0.0.0.0]) fi dnl dnl diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog index 002f457a5..05833a0d2 100644 --- a/src/appl/gssftp/ChangeLog +++ b/src/appl/gssftp/ChangeLog @@ -1,3 +1,7 @@ +2006-03-27 Ken Raeburn + + * configure.in: Supply comment template in AC_DEFINE calls. + 2005-08-20 Ken Raeburn * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in index 6d86d77b8..e5f9f648a 100644 --- a/src/appl/gssftp/configure.in +++ b/src/appl/gssftp/configure.in @@ -13,7 +13,7 @@ AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) AC_HEADER_STDARG -AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS))]) +AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS,1,[Define if POSIX termios interface found]))]) AC_CHECK_HEADERS(unistd.h stdlib.h string.h sys/select.h sys/sockio.h paths.h) CHECK_UTMP DECLARE_SYS_ERRLIST @@ -35,7 +35,7 @@ SETENVSRC='$(srcdir)/../../bsd/setenv.c' SETENVOBJ=setenv.o AC_SUBST([SETENVSRC]) AC_SUBST([SETENVOBJ]) -AC_DEFINE([NEED_SETENV]) +AC_DEFINE([NEED_SETENV],1,[Define if setenv needs to be defined]) fi dnl dnl @@ -50,12 +50,12 @@ AC_CACHE_VAL(krb5_cv_shadow_pwd, krb5_cv_shadow_pwd=yes, krb5_cv_shadow_pwd=no)]) AC_MSG_RESULT($krb5_cv_shadow_pwd) if test $krb5_cv_shadow_pwd = yes; then -AC_DEFINE(HAVE_SHADOW) +AC_DEFINE(HAVE_SHADOW,1,[Define if shadow password interface found]) fi case $krb5_cv_host in alpha*-dec-osf*) AC_CHECK_LIB(security,setluid, - AC_DEFINE(HAVE_SETLUID) + AC_DEFINE(HAVE_SETLUID,1,[Define if setluid provided in OSF/1 security library]) FTPD_LIBS="$FTPD_LIBS -lsecurity" ) ;; diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog index 6a90a87c8..e188050a6 100644 --- a/src/appl/telnet/ChangeLog +++ b/src/appl/telnet/ChangeLog @@ -1,3 +1,7 @@ +2006-03-27 Ken Raeburn + + * configure.in: Supply comment template in AC_DEFINE calls. + 2006-03-15 Ken Raeburn * configure.in: If tgetent can't be found, error out. diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 78d54a3d6..04173afc4 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -13,7 +13,7 @@ if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \ SETENVOBJ=setenv.o AC_SUBST([SETENVSRC]) AC_SUBST([SETENVOBJ]) - AC_DEFINE([NEED_SETENV]) + AC_DEFINE([NEED_SETENV],1,[Define if setenv needs to be defined]) fi dnl KRB5_NEED_PROTO([#include ],setenv) @@ -22,7 +22,7 @@ if test "$KRB4_LIB" = ''; then AC_MSG_RESULT(No Kerberos 4 authentication) else AC_MSG_RESULT(Kerberos 4 authentication enabled) - AC_DEFINE(KRB4) + AC_DEFINE(KRB4,1,[Define if krb4 authentication is enabled]) fi KRB5_BUILD_LIBRARY_STATIC KRB5_BUILD_LIBOBJS @@ -50,7 +50,7 @@ AC_CHECK_HEADERS(term.h,,,dnl #endif ]) dnl -AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) +AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP,1,[Define if termcap library is available]) LIBS="$LIBS -ltermcap") AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") @@ -58,9 +58,9 @@ AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", AC_CHECK_FUNC(tgetent, , [AC_MSG_ERROR([Could not find tgetent; are you missing a curses/ncurses library?])]) KRB5_AC_INET6 AC_CHECK_FUNCS(setupterm) -AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) +AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO,1,[Define if termio should be used]) ac_termio=1) if test -z "$ac_termio"; then -AC_CHECK_HEADER(termio.h,AC_DEFINE(SYSV_TERMIO),ac_sysv_termio=1) +AC_CHECK_HEADER(termio.h,AC_DEFINE(SYSV_TERMIO,1,[Define if SysV termio interface is found]),ac_sysv_termio=1) if test -z "$ac_sysv_termio"; then AC_MSG_CHECKING([for cc_t in termio.h]) AC_CACHE_VAL(krb_cv_type_cc_t, @@ -68,7 +68,7 @@ if test -z "$ac_sysv_termio"; then [cc_t foo;],krb_cv_type_cc_t=yes,krb_cv_type_cc_t=no)]) AC_MSG_RESULT($krb_cv_type_cc_t) if test $krb_cv_type_cc_t = no; then - AC_DEFINE(NO_CC_T) + AC_DEFINE(NO_CC_T,1,[Define if termio.h does not define type cc_t]) fi fi fi @@ -125,7 +125,7 @@ AC_CACHE_CHECK([if speed_t is defined], krb5_cv_type_speed_t, #endif ],[speed_t termspeed],krb5_cv_type_speed_t=yes, krb5_cv_type_speed_t=no)]) if test $krb5_cv_type_speed_t = no; then - AC_DEFINE(speed_t, int) + AC_DEFINE(speed_t, int, [Define if system termios interface doesn't define speed_t]) fi; dnl dnl @@ -151,7 +151,7 @@ case $krb5_cv_host in ;; esac if test -z "$broken_streams" -a "$ac_cv_header_sys_stream_h" = yes; then - AC_CHECK_FUNC(grantpt,AC_DEFINE(STREAMSPTY)) + AC_CHECK_FUNC(grantpt,AC_DEFINE(STREAMSPTY,1,[Define if streams pty interface should be used])) fi AC_MSG_CHECKING([if setpgrp takes two arguments]) dnl @@ -161,7 +161,7 @@ AC_CACHE_VAL(krb5_cv_sys_setpgrp_two, krb5_cv_sys_setpgrp_two=yes,krb5_cv_sys_setpgrp_two=no)]) AC_MSG_RESULT($krb5_cv_sys_setpgrp_two) if test $krb5_cv_sys_setpgrp_two = yes; then - AC_DEFINE(SETPGRP_TWOARG) + AC_DEFINE(SETPGRP_TWOARG,1,[Define if setpgrp takes two arguments]) fi dnl KRB5_NEED_PROTO([#include ],unsetenv,1) -- 2.26.2