diff options
82 files changed, 558 insertions, 396 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 96ad954..30178a1 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1,21 +1,77 @@ dnl dnl +dnl arrange to stuff file in substitution +dnl +dnl AC_STUFF_FILE_PRE() +define(AC_STUFF_FILE_PRE, +[AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl +1r $1 +AC_DIVERT_POP()dnl +]) +dnl AC_STUFF_FILE_POST() +define(AC_STUFF_FILE_POST, +[AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl +[$]r $1 +AC_DIVERT_POP()dnl +]) +dnl +dnl look for the top of the tree +dnl +AC_DEFUN(AC_CONFIG_FRAGMENTS_DEFAULT, +[AC_CONFIG_FRAGMENTS(. .. ../.. ../../.. ../../../.. ../../../../.. ../../../../../..)])dnl +dnl +dnl search them looking for the directory named config. +dnl Crude, but it works. +dnl +AC_DEFUN(AC_CONFIG_FRAGMENTS, +[ac_config_fragdir= +for ac_dir in $1; do + if test -d $srcdir/$ac_dir/config; then + ac_reltopdir=$ac_dir + ac_topdir=$srcdir/$ac_reltopdir + ac_config_fragdir=$ac_reltopdir/config + break + fi +done +if test -z "$ac_config_fragdir"; then + AC_MSG_ERROR([can not find config/ directory in $1]) +else + AC_CONFIG_AUX_DIR($ac_config_fragdir) +fi + ac_tmpin="$srcdir/${ac_config_fragdir}/pre.in" + if test -r $ac_tmpin; then + ac_prepend=$ac_config_fragdir/pre.in + else + ac_prepend= + fi + ac_tmpin="$srcdir/${ac_config_fragdir}/post.in" + if test -r $ac_tmpin; then + ac_postpend=$ac_config_fragdir/post.in + else + ac_postpend= + fi +AC_PROVIDE([AC_CONFIG_FRAGMENTS_DEFAULT])dnl +]) +dnl +dnl +dnl set up buildtop stuff +dnl +define(AC_BUILDTOP,[.])dnl +define(AC_SET_BUILDTOP, +[AC_CONFIG_FRAGMENTS_DEFAULT()dnl +AC_SUBST(BUILDTOP)dnl +BUILDTOP=[$]ac_reltopdir +])dnl +dnl +dnl +dnl +dnl dnl How do we find other scripts needed for configuration? dnl Scripts like Cygnus configure, config.sub, config.guess are stored dnl together in one directory. For now, have the configure.in file dnl specify it explicitly with AC_CONFIG_AUX. We'll provide a half-way dnl acceptable default of ${srcdir}. dnl -define(AC_CONFIG_AUX,[ - if test -f $1/config.sub ; then - config_aux=$1 - else - config_aux=${srcdir}/$1 - fi - config_sub=${config_aux}/config.sub - config_guess=${config_aux}/config.guess -])dnl -dnl define(AC__CONFIG_AUX,[ if test "z${config_sub}" = "z" ; then config_sub=${srcdir}/config.sub @@ -26,112 +82,19 @@ define(AC__CONFIG_AUX,[ AC_PROVIDE([$0])dnl ])dnl dnl -dnl set up buildtop stuff -dnl -define(AC_BUILDTOP,[.])dnl -define(AC_SET_BUILDTOP, -[BUILDTOP=AC_TOPDIR -AC_SUBST(BUILDTOP)dnl -])dnl -dnl -dnl dnl Does configure need to be run in immediate subdirectories of this dnl directory? dnl -define(CONFIG_DIRS,[ -AC_REQUIRE([AC__CONFIG_AUX])dnl -changequote(<<<,>>>)dnl -SUBDIRS="$1" -if [ -z "${norecursion}" ] ; then - recurse_args= - recur_state= -# ok this stuff really belongs in ac_general.m4, but we'll live :-) - for arg in $configure_args; do - if test -z "$recur_state" ; then - eval unquoted_arg="$arg" - case "$unquoted_arg" in - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - recur_state="skip" - continue - ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - *) - recurse_args="$recurse_args $arg" - ;; - esac - else - recur_state= - fi - done - for configdir in $1 ; do - - if [ -d ${srcdir}/${configdir} ] ; then - eval echo Configuring ${configdir}... ${redirect} - case "${srcdir}" in - ".") ;; - *) - if [ ! -d ./${configdir} ] ; then - if mkdir ./${configdir} ; then - true - else - echo '***' "${progname}: could not make `pwd`/${configdir}" 1>&2 - exit 1 - fi - fi - ;; - esac - - POPDIR=`pwd` - cd ${configdir} - -### figure out what to do with srcdir - case "${srcdir}" in - ".") newsrcdir=${srcdir} ;; # no -srcdir option. We're building in place. - /*) # absolute path - newsrcdir=${srcdir}/${configdir} - srcdiroption="--srcdir=${newsrcdir}" - ;; - *) # otherwise relative - newsrcdir=../${srcdir}/${configdir} - srcdiroption="--srcdir=${newsrcdir}" - ;; - esac - -### check for guested configure, otherwise get Cygnus style configure -### script from ${config_aux} - if [ -f ${newsrcdir}/configure ] ; then - recprog=${newsrcdir}/configure - elif [ -f ${newsrcdir}/configure.in ] ; then - recprog=${config_aux}/configure - else - eval echo No configuration information in ${configdir} ${redirect} - recprog= - fi - -### The recursion line is here. - if [ ! -z "${recprog}" ] ; then - if eval ${config_shell} ${recprog} $recurse_args ${srcdiroption}; then - true - else - echo Configure in `pwd` failed, exiting. 1>&2 - exit 1 - fi - fi - - cd ${POPDIR} - fi - done -fi -changequote([,])dnl -AC_SUBST(SUBDIRS)dnl -])dnl +define(CONFIG_DIRS,[AC_CONFIG_SUBDIRS($1)])dnl +dnl dnl dnl append subdir rule -- MAKE_SUBDIRS("making",all) dnl +define(AC_DIVERSION_MAKEFILE,9)dnl things that get pushed on the makefile +dnl define(MAKE_SUBDIRS,[ +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl changequote(<<<,>>>)dnl -divert(9)dnl $2::<<< @case '${MFLAGS}' in *[ik]*) set +e ;; esac; \ @@ -141,23 +104,34 @@ $2::<<< $(MAKE) $(MFLAGS) CCOPTS="$(CCOPTS)" CC="$(CC)" \ CURRENT_DIR=$(CURRENT_DIR)$$i/ >>>$2<<<); \ done>>> -divert(0)dnl changequote([,])dnl +AC_DIVERT_POP()dnl ])dnl dnl -dnl take saved makefile stuff and put it in the Makeile +dnl take saved makefile stuff and put it in the Makefile dnl define(EXTRA_RULES,[ cat >> Makefile <<"SUBDIREOF" -undivert(9) +# [DIVERSION_MAKEFILE] contents +undivert(AC_DIVERSION_MAKEFILE) SUBDIREOF ])dnl dnl -dnl take saved makefile stuff and put it in the Makeile +dnl take saved makefile stuff and put it in the argument dnl define(EXTRA_RULES_IN,[ cat >> $1 <<"SUBDIREOF" -undivert(9) +# [DIVERSION_MAKEFILE] contents +undivert(AC_DIVERSION_MAKEFILE) +SUBDIREOF +])dnl +dnl +dnl take saved makefile stuff and put it in the argument +dnl +define(EXTRA_RULES_OUT,[ +cat > $1 <<"SUBDIREOF" +# [DIVERSION_MAKEFILE] contents +undivert(AC_DIVERSION_MAKEFILE) SUBDIREOF ])dnl dnl @@ -165,7 +139,7 @@ dnl drop in standard configure rebuild rules -- CONFIG_RULES dnl define(CONFIG_RULES,[ WITH_CC dnl -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl [ SHELL=/bin/sh @@ -176,7 +150,7 @@ config.status: $(srcdir)/configure configure: $(srcdir)/configure.in cd $(srcdir); autoconf ] -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl check for sys_errlist -- DECLARE_SYS_ERRLIST @@ -208,7 +182,7 @@ dnl drop in rules for building error tables -- ET_RULES dnl define(ET_RULES,[ AC_PROG_AWK dnl -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl [ SRCTOP=$(srcdir)/$(BUILDTOP) @@ -224,13 +198,13 @@ COMPILE_ET_C= $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=$@ $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=$][*.c $< ] -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl drop in rules for building command tables -- SS_RULES dnl define(SS_RULES,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl changequote({,})dnl { @@ -246,7 +220,7 @@ MAKE_COMMANDS= $(BUILDTOP)/util/ss/mk_cmds } changequote([,])dnl -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl check for <dirent.h> -- CHECK_DIRENT @@ -278,7 +252,7 @@ dnl dnl set $(KRB5ROOT) from --with-krb5-root=value -- WITH_KRB5ROOT dnl define(WITH_KRB5ROOT,[ -AC_WITH([krb5-root], +AC_ARG_WITH([krb5-root],[set path for Kerberos V5 config files], echo "krb5-root is $withval" KRB5ROOT=$withval, echo "krb5-root defaults to /krb5" @@ -288,7 +262,7 @@ dnl dnl set $(KRB4) from --with-krb4=value -- WITH_KRB4 dnl define(WITH_KRB4,[ -AC_WITH([krb4], +AC_ARG_WITH([krb4],[include Kerberos V4 support], echo "krb4 is $withval" KRB4=$withval, echo "no krb4 support; use --with-krb4=krb4dir" @@ -298,7 +272,7 @@ dnl dnl set $(CC) from --with-cc=value dnl define(WITH_CC,[ -AC_WITH([cc], +AC_ARG_WITH([cc],[select compiler to use], echo CC=$withval CC=$withval, if test -z "$CC" ; then CC=cc; fi @@ -308,7 +282,7 @@ dnl dnl set $(CCOPTS) from --with-ccopts=value dnl define(WITH_CCOPTS,[ -AC_WITH([ccopts], +AC_ARG_WITH([ccopts],[select compiler command line options], echo "CCOPTS is $withval" CCOPTS=$withval CFLAGS="$CFLAGS $withval", @@ -319,30 +293,31 @@ dnl Imake LinkFile rule, so they occur in the right place -- LinkFile(dst,src) dnl define(LinkFile,[ AC_LN_S +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl changequote({,})dnl -divert(9)dnl $1:: $2{ $(RM) $}{@ $(LN) $}{? $}{@ -}divert(0)dnl +} changequote([,])dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl explicit append text (for non-general things) -- AppendRule(txt) dnl define(AppendRule,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl $1 -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl create DONE file for lib/krb5 -- SubdirLibraryRule(list) define(SubdirLibraryRule,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl all:: DONE @@ -351,13 +326,13 @@ DONE:: $1 clean:: $(RM) DONE -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl copy header file into include dir -- CopyHeader(hfile,hdir) dnl define(CopyHeader,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl includes:: $1 @if test -d $2; then :; else (set -x; mkdir $2) fi @@ -369,13 +344,13 @@ includes:: $1 clean:: $(RM) $2/$1 -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl copy source header file into include dir -- CopySrcHeader(hfile,hdir) dnl define(CopySrcHeader,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl includes:: $1 @if test -d $2; then :; else mkdir $2; fi @@ -384,29 +359,29 @@ includes:: $1 (set -x; [$](RM) $2/$1; [$](CP) $(srcdir)/$1 $2/$1) \ fi -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl Krb5InstallHeaders(headers,destdir) define(Krb5InstallHeaders,[ -divert(9)dnl +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl install:: $1 @set -x; for f in $1 ; \ do [$](INSTALL_DATA) [$$]f $2/[$$]f ; \ done -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl dnl PepsyTarget(basename) dnl define(PepsyTarget,[ -divert(9) +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl .SUFFIXES: .py $1_defs.h $1_pre_defs.h $1-types.h $1_tables.c:: $1-asn.py @echo '***Ignore the warning message "Warning: Can'"'"'t find UNIV.ph failed"' [$](PEPSY) [$](PSYFLAGS) [$](srcdir)/$1-asn.py -divert(0)dnl +AC_DIVERT_POP()dnl ])dnl dnl define(UsePepsy,[ @@ -420,7 +395,7 @@ dnl dnl arbitrary DEFS -- ADD_DEF(value) dnl define(ADD_DEF,[ -DEFS="[$]DEFS "'$1' +CPPFLAGS="[$]CPPFLAGS "'$1' ])dnl dnl dnl local includes are used -- KRB_INCLUDE @@ -432,7 +407,7 @@ dnl dnl ISODE/pepsy includes are used -- ISODE_INCLUDE dnl define(ISODE_INCLUDE,[ -AC_ENABLE([isode], +AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs], ISODELIB='[$(TOPLIBD)/libisode.a]' ADD_DEF([-I${SRCTOP}/isode/h -I${BUILDTOP}/isode/h]),ISODELIB=)dnl AC_SUBST([ISODELIB])dnl @@ -463,84 +438,30 @@ AC_PROGRAM_CHECK(LEX, flex, flex, lex)dnl if test -z "$LEXLIB" then case "$LEX" in - flex*) AC_HAVE_LIBRARY(fl, LEXLIB="-lfl") ;; - *) AC_HAVE_LIBRARY(l, LEXLIB="-ll") ;; + flex*) AC_CHECK_LIB(fl,main, LEXLIB="-lfl") ;; + *) AC_CHECK_LIB(l,main, LEXLIB="-ll") ;; esac fi -AC_VERBOSE(setting LEXLIB to $LEXLIB) +AC_MSG_RESULT(setting LEXLIB to $LEXLIB) AC_SUBST(LEX)AC_SUBST(LEXLIB)])dnl dnl dnl dnl allow for compilation with isode (yuck!) dnl define(ISODE_DEFS, -[AC_ENABLE([isode],[ADD_DEF(-DKRB5_USE_ISODE)],)])dnl -undefine([AC_PROG_INSTALL])dnl -define(AC_PROG_INSTALL, -[# Make sure to not get the incompatible SysV /etc/install and -# /usr/sbin/install, which might be in PATH before a BSD-like install, -# or the SunOS /usr/etc/install directory, or the AIX /bin/install, -# or the AFS install, which mishandles nonexistent args, or -# /usr/ucb/install on SVR4, which tries to use the nonexistent group -# `staff', or /sbin/install on IRIX which has incompatible command-line -# syntax. Sigh. -# -# On most BSDish systems install is in /usr/bin, not /usr/ucb -# anyway. -# This turns out not to be true, so the mere pathname isn't an indication -# of whether the program works. What we really need is a set of tests for -# the install program to see if it actually works in all the required ways. -# -# Avoid using ./install, which might have been erroneously created -# by make from ./install.sh. -if test -z "${INSTALL}"; then - AC_CHECKING(for a BSD compatible install) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - case "$ac_dir" in - ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in installbsd scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. - : - else - INSTALL="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_ifs" -fi - -if test -z "$INSTALL"; then - # As a last resort, use the slow shell script. - for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../.. ${srcdir}/AC_TOPDIR/util/autoconf; do - if test -f $ac_dir/install.sh; then - INSTALL="$ac_dir/install.sh -c"; break - fi - done -fi -if test -z "$INSTALL"; then - AC_ERROR([can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.. ${srcdir}/AC_TOPDIR/util/autoconf]) -fi -AC_SUBST(INSTALL)dnl -AC_VERBOSE(setting INSTALL to $INSTALL) - -# Use test -z because SunOS4 sh mishandles ${INSTALL_PROGRAM-'${INSTALL}'}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -AC_SUBST(INSTALL_PROGRAM)dnl -AC_VERBOSE(setting INSTALL_PROGRAM to $INSTALL_PROGRAM) +[AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs], +[ADD_DEF(-DKRB5_USE_ISODE)],)])dnl +dnl +dnl make this one deeper... +dnl +dnl The default is `$srcdir' or `$srcdir/..' or `$srcdir/../..'. +dnl There's no need to call this macro explicitly; just AC_REQUIRE it. +AC_DEFUN(AC_CONFIG_AUX_DIR_DEFAULT, +[AC_CONFIG_AUX_DIRS($srcdir $srcdir/.. $srcdir/../.. $srcdir/../../.. $srcdir/../../../.. $srcdir/../../../../..)]) +dnl +dnl V5_OUTPUT_MAKEFILE +dnl +define(V5_AC_OUTPUT_MAKEFILE, +[AC_OUTPUT(pre.out:[$]ac_prepend Makefile.out:Makefile.in post.out:[$]ac_postpend,[EXTRA_RULES], cat pre.out Makefile.out post.out > Makefile)])dnl +dnl -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -AC_SUBST(INSTALL_DATA)dnl -AC_VERBOSE(setting INSTALL_DATA to $INSTALL_DATA) -])dnl diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in index 751fb0b..1921a98 100644 --- a/src/admin/aname/configure.in +++ b/src/admin/aname/configure.in @@ -3,11 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/configure.in b/src/admin/configure.in index 6c3098b..28f5995 100644 --- a/src/admin/configure.in +++ b/src/admin/configure.in @@ -1,11 +1,11 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP -AC_WITH([krb4],convert=convert,convert=) +AC_ARG_WITH([krb4],[include Kerberos V4 support],convert=convert,convert=) CONFIG_DIRS(create destroy edit stash aname $convert) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 1f544cb..30afbf7 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -3,12 +3,12 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB4 WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index c440a61..6e12929 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -4,10 +4,10 @@ CONFIG_RULES WITH_KRB5ROOT AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index deb3819..e606568 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -3,11 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index 0cbedea..79c9224 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -3,13 +3,13 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) AC_HAVE_FUNCS(getcwd) SS_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index 4d5cde7..030b0a9 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -3,11 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 569afa1..fbf70b6 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -5,17 +5,17 @@ ISODE_INCLUDE CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) dnl dbm libs for use of an_to_ln -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) dnl dnl AIX has them all; SCO might too LOGINLIBS= -AC_HAVE_LIBRARY(-lodm, - AC_HAVE_LIBRARY(-ls, - AC_HAVE_LIBRARY(-lcfg, +AC_CHECK_LIB(odm,main, + AC_CHECK_LIB(s,main, + AC_CHECK_LIB(cfg,main, LOGINLIBS="-lodm -ls -lcfg" ))) AC_SUBST(LOGINLIBS) @@ -72,7 +72,7 @@ AC_DEFINE(NO_UT_PID)) KRB_INCLUDE WITH_KRB5ROOT WITH_KRB4 -AC_WITH([krb4], +AC_ARG_WITH([krb4],[include Kerberos V4 support], ADD_DEF(-DKRB5_KRB4_COMPAT) K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a', echo "warning: no krb4 backwards compatibility support" @@ -93,4 +93,4 @@ AC_COMPILE_CHECK([number of arguments to setpgrp], AC_DEFINE(SETPGRP_TWOARG)) dnl ADD_DEF(-DKERBEROS) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/configure.in b/src/appl/configure.in index 8d591b5..eb1611e 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -6,4 +6,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in index 181bfb6..ffbfabd 100644 --- a/src/appl/gss-sample/configure.in +++ b/src/appl/gss-sample/configure.in @@ -2,11 +2,11 @@ AC_INIT(gss-client.c) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) AC_HAVE_HEADERS(unistd.h) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT AC_PROG_INSTALL -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in index 3c18be9..ea794f0 100644 --- a/src/appl/mailquery/configure.in +++ b/src/appl/mailquery/configure.in @@ -3,10 +3,10 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) AC_HAVE_HEADERS(unistd.h) WITH_KRB5ROOT AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR)) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in index 7d54192..70158ca 100644 --- a/src/appl/movemail/configure.in +++ b/src/appl/movemail/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES KRB_INCLUDE -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) AC_PROG_INSTALL CHECK_FCNTL WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in index 454e11a..7dec979 100644 --- a/src/appl/popper/configure.in +++ b/src/appl/popper/configure.in @@ -5,11 +5,11 @@ ISODE_INCLUDE AC_SET_BUILDTOP AC_PROG_INSTALL AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAS_VSPRINTF)) -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(BSD) -AC_HAVE_LIBRARY(ndbm) -AC_HAVE_LIBRARY(dbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(BSD,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) CHECK_WAIT_TYPE CHECK_FCNTL @@ -26,4 +26,4 @@ AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H)) KRB_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in index 5f1ad6f..9fa7895 100644 --- a/src/appl/sample/configure.in +++ b/src/appl/sample/configure.in @@ -6,4 +6,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index 3cfd79e..7060900 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index 5661c52..ac43cc1 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index a3f83ea..ac3f1c1 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in index 350af51..4290b2f 100644 --- a/src/appl/simple/configure.in +++ b/src/appl/simple/configure.in @@ -6,4 +6,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index e89f02c..8c63675 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 1d5e36a..9cbd99e 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -5,4 +5,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in index 141723e..8fd1cb5 100644 --- a/src/appl/telnet/libtelnet/configure.in +++ b/src/appl/telnet/libtelnet/configure.in @@ -12,4 +12,4 @@ AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) LIBOBJS="$LIBOBJS getent.o" KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in index c528b8d..3bd3af4 100644 --- a/src/appl/telnet/telnet/configure.in +++ b/src/appl/telnet/telnet/configure.in @@ -10,7 +10,7 @@ AC_VFORK KRB_INCLUDE ISODE_INCLUDE AC_HAVE_HEADERS(unistd.h sys/select.h) -AC_HAVE_LIBRARY(termcap,AC_DEFINE(TERMCAP) +AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) LIBS="$LIBS -ltermcap") AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) if test -z "$ac_termio"; then @@ -25,13 +25,13 @@ AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H)) AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS)) AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM)) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) AC_FUNC_CHECK(sigprocmask, AC_COMPILE_CHECK([sigset_t], [#include <signal.h>], [sigset_t x], AC_DEFINE(POSIX_SIGNALS))) -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in index 5a81cd3..aafd8a8 100644 --- a/src/appl/telnet/telnetd/configure.in +++ b/src/appl/telnet/telnetd/configure.in @@ -8,11 +8,11 @@ AC_SET_BUILDTOP AC_PROG_INSTALL KRB_INCLUDE ISODE_INCLUDE -AC_HAVE_LIBRARY(ndbm) -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(dbm) -AC_HAVE_LIBRARY(termcap,AC_DEFINE(TERMCAP) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(dbm,main) +AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) LIBS="$LIBS -ltermcap") AC_HEADER_CHECK(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) if test -z "$ac_termio"; then @@ -32,4 +32,4 @@ AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) AC_COMPILE_CHECK([number of arguments to setpgrp], [#include <unistd.h>],[setpgrp(0,0)], AC_DEFINE(SETPGRP_TWOARG)) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index a7d7f44..275eece 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/configure.in b/src/clients/configure.in index 5407095..ea8a1e9 100644 --- a/src/clients/configure.in +++ b/src/clients/configure.in @@ -6,4 +6,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in index fcd0bfa..045b4c8 100644 --- a/src/clients/kdestroy/configure.in +++ b/src/clients/kdestroy/configure.in @@ -6,4 +6,4 @@ CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index a071754..06b99a3 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in index ed45899..608b045 100644 --- a/src/clients/klist/configure.in +++ b/src/clients/klist/configure.in @@ -6,4 +6,4 @@ CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in index b286154..5bed1e5 100644 --- a/src/clients/ksu/configure.in +++ b/src/clients/ksu/configure.in @@ -3,12 +3,12 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(ndbm) -AC_HAVE_LIBRARY(dbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT CHECK_STDARG -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/config/install-sh b/src/config/install-sh new file mode 100644 index 0000000..31420ab --- /dev/null +++ b/src/config/install-sh @@ -0,0 +1,236 @@ +#!/bin/sh +# +# install - install a program, script, or datafile +# This comes from X11R5. +# +# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ +# +# This script is compatible with the BSD install script, but was written +# from scratch. +# + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +tranformbasename="" +transform_arg="" +instcmd="$mvprog" +chmodcmd="$chmodprog 0755" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" +dir_arg="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + -t=*) transformarg=`echo $1 | sed 's/-t=//'` + shift + continue;; + + -b=*) transformbasename=`echo $1 | sed 's/-b=//'` + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + # this colon is to work around a 386BSD /bin/sh bug + : + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +else + true +fi + +if [ x"$dir_arg" != x ]; then + dst=$src + src="" + + if [ -d $dst ]; then + instcmd=: + else + instcmd=mkdir + fi +else + +# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +# might cause directories to be created, which would be especially bad +# if $src (and thus $dsttmp) contains '*'. + + if [ -f $src -o -d $src ] + then + true + else + echo "install: $src does not exist" + exit 1 + fi + + if [ x"$dst" = x ] + then + echo "install: no destination specified" + exit 1 + else + true + fi + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + + if [ -d $dst ] + then + dst="$dst"/`basename $src` + else + true + fi +fi + +## this sed command emulates the dirname command +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + +# Make sure that the destination directory exists. +# this part is taken from Noah Friedman's mkinstalldirs script + +# Skip lots of stat calls in the usual case. +if [ ! -d "$dstdir" ]; then +defaultIFS=' +' +IFS="${IFS-${defaultIFS}}" + +oIFS="${IFS}" +# Some sh's can't handle IFS=/ for some reason. +IFS='%' +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS="${oIFS}" + +pathcomp='' + +while [ $# -ne 0 ] ; do + pathcomp="${pathcomp}${1}" + shift + + if [ ! -d "${pathcomp}" ] ; + then + $mkdirprog "${pathcomp}" + else + true + fi + + pathcomp="${pathcomp}/" +done +fi + +if [ x"$dir_arg" != x ] +then + $doit $instcmd $dst && + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +else + +# If we're going to rename the final executable, determine the name now. + + if [ x"$transformarg" = x ] + then + dstfile=`basename $dst` + else + dstfile=`basename $dst $transformbasename | + sed $transformarg`$transformbasename + fi + +# don't allow the sed command to completely eliminate the filename + + if [ x"$dstfile" = x ] + then + dstfile=`basename $dst` + else + true + fi + +# Make a temp file name in the proper directory. + + dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && + +# and set any options; do chmod last to preserve setuid bits + +# If any of these fail, we abort the whole thing. If we want to +# ignore errors from any of these, just make sure not to ignore +# errors from the above "$doit $instcmd $src $dsttmp" command. + + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && + +# Now rename the file to the real destination. + + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile + +fi && + + +exit 0 diff --git a/src/config/pre.in b/src/config/pre.in index 50896f6..aee7a04 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -5,7 +5,8 @@ BUILDTOP = @BUILDTOP@ srcdir = @srcdir@ VPATH = @srcdir@ -DEFS = @DEFS@ +CPPFLAGS = @CPPFLAGS@ +DEFS = @DEFS@ $(CPPFLAGS) CC = @CC@ CCOPTS = @CCOPTS@ LIBS = @LIBS@ @@ -46,7 +47,7 @@ LEXLIB = @LEXLIB@ YACC = @YACC@ SRCTOP = $(srcdir)/$(BUILDTOP) -SUBDIRS = @SUBDIRS@ +SUBDIRS = @subdirs@ TOPLIBD = $(BUILDTOP)/lib diff --git a/src/configure.in b/src/configure.in index b2809ab..a7ffd5f 100644 --- a/src/configure.in +++ b/src/configure.in @@ -3,10 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP WITH_KRB5ROOT -AC_ENABLE([isode],isode=isode,) +AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs], isode=isode,) CONFIG_DIRS(util include $isode lib kdc admin kadmin slave clients appl tests) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) MAKE_SUBDIRS("checking",check) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +dnl dnl AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/include/configure.in b/src/include/configure.in index 075bec7..4fc675d 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -5,4 +5,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/include/kerberosIV/configure.in b/src/include/kerberosIV/configure.in index 648d3e0..9c2cb0e 100644 --- a/src/include/kerberosIV/configure.in +++ b/src/include/kerberosIV/configure.in @@ -2,4 +2,4 @@ AC_INIT(configure.in) AC_SET_BUILDTOP CONFIG_RULES WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index 0d3ac7d..de14b3c 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -83,10 +83,10 @@ AC_HAVE_HEADERS(sys/time.h) AC_HEADER_CHECK(netinet/in.h,AC_DEFINE(KRB5_USE_INET)) AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) AC_FUNC_CHECK([dbm_open], , AC_DEFINE(ODBM)) WITH_CCOPTS WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/compat/configure.in b/src/isode/compat/configure.in index 55ac24f..7c8d29c 100644 --- a/src/isode/compat/configure.in +++ b/src/isode/compat/configure.in @@ -3,4 +3,4 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_REPLACE_FUNCS(strdup) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/configure.in b/src/isode/configure.in index 16ba2ef..2d0ac64 100644 --- a/src/isode/configure.in +++ b/src/isode/configure.in @@ -5,4 +5,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) WITH_CCOPTS CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/h/configure.in b/src/isode/h/configure.in index a34ab3b..c3b44a5 100644 --- a/src/isode/h/configure.in +++ b/src/isode/h/configure.in @@ -2,4 +2,4 @@ AC_INIT(configure.in) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in index 27949d1..c3d5142 100644 --- a/src/isode/pepsy/configure.in +++ b/src/isode/pepsy/configure.in @@ -5,4 +5,4 @@ AC_SET_BUILDTOP AC_PROG_LEX AC_YYTEXT_POINTER HAVE_YYLINENO -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/psap/configure.in b/src/isode/psap/configure.in index aa380a9..b8e69b3 100644 --- a/src/isode/psap/configure.in +++ b/src/isode/psap/configure.in @@ -2,6 +2,6 @@ AC_INIT(configure.in) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(socket) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(socket,main) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/isode/support/configure.in b/src/isode/support/configure.in index a34ab3b..c3b44a5 100644 --- a/src/isode/support/configure.in +++ b/src/isode/support/configure.in @@ -2,4 +2,4 @@ AC_INIT(configure.in) WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/client/configure.in b/src/kadmin/client/configure.in index 6d4fa28..e4c57b3 100644 --- a/src/kadmin/client/configure.in +++ b/src/kadmin/client/configure.in @@ -3,10 +3,10 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) ET_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index 35e3b5f..f9ae2bb 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -1,11 +1,11 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP -AC_WITH([krb4],v4server=v4server,v4server=) +AC_ARG_WITH([krb4],[include Kerberos V4 support],v4server=v4server,v4server=) CONFIG_DIRS(client kpasswd server $v4server) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) CONFIG_RULES WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index 9ac066b..31cf2b8 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -3,8 +3,8 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) AC_HAVE_HEADERS(unistd.h) AC_COMPILE_CHECK([ut_pid in struct utmp], [#include <utmp.h>], @@ -26,4 +26,4 @@ ET_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/kdc/configure.in b/src/kdc/configure.in index e840ce2..91ccb18 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -4,21 +4,21 @@ CONFIG_RULES ISODE_DEFS AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) ET_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB4 WITH_KRB5ROOT -AC_WITH([krb4], +AC_ARG_WITH([krb4],[include Kerberos V4 support], ADD_DEF(-DKRB4) ADD_DEF(-DBACKWARD_COMPAT) K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a $(KRB4)/lib/libdes.a', echo "warning: no krb4 support will be built in kdc" K4LIB=) AC_SUBST(K4LIB) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/configure.in b/src/lib/configure.in index baeb286..328fe21 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -15,4 +15,4 @@ LinkFile(libgssapi_krb5.a, gssapi/libgssapi_krb5.a) AppendRule([all:: libkrb5.a libcrypto.a]) AppendRule([all:: libgssapi_krb5.a]) WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index ff28db2..e4cc975 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -13,4 +13,4 @@ MAKE_SUBDIRS("checking",check) AppendRule([all:: libcrypto.a]) KRB_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/crc32/configure.in b/src/lib/crypto/crc32/configure.in index 52832f2..f5e1ec7 100644 --- a/src/lib/crypto/crc32/configure.in +++ b/src/lib/crypto/crc32/configure.in @@ -4,4 +4,4 @@ AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in index 3442881..7a45f40 100644 --- a/src/lib/crypto/des/configure.in +++ b/src/lib/crypto/des/configure.in @@ -2,9 +2,9 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) SubdirLibraryRule([${OBJS}]) KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in index 52832f2..f5e1ec7 100644 --- a/src/lib/crypto/md4/configure.in +++ b/src/lib/crypto/md4/configure.in @@ -4,4 +4,4 @@ AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in index 52832f2..f5e1ec7 100644 --- a/src/lib/crypto/md5/configure.in +++ b/src/lib/crypto/md5/configure.in @@ -4,4 +4,4 @@ AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/os/configure.in b/src/lib/crypto/os/configure.in index dc3860e..4ce58eb 100644 --- a/src/lib/crypto/os/configure.in +++ b/src/lib/crypto/os/configure.in @@ -7,4 +7,4 @@ KRB_INCLUDE AC_LN_S AC_REPLACE_FUNCS(memmove) AC_HAVE_FUNCS(srand48 srand srandom getpid) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index e36bba0..a37d536 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -9,4 +9,4 @@ AC_PROG_INSTALL AppendRule([all:: libdes425.a]) KRB_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index 4f1adba..108c924 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -11,4 +11,4 @@ MAKE_SUBDIRS("cleaning",clean) AppendRule([all:: libgssapi_krb5.a]) WITH_CCOPTS WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in index c8b2873..7a95a17 100644 --- a/src/lib/gssapi/generic/configure.in +++ b/src/lib/gssapi/generic/configure.in @@ -8,4 +8,4 @@ KRB_INCLUDE AC_SIZE_T CopySrcHeader(gssapi.h,[$(EHDRDIR)]) CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)]) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in index 812fd46..19ec1e3 100644 --- a/src/lib/gssapi/krb5/configure.in +++ b/src/lib/gssapi/krb5/configure.in @@ -5,4 +5,4 @@ AC_SET_BUILDTOP ET_RULES SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 4bf1be7..b7d4213 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -10,4 +10,4 @@ AC_HAVE_HEADERS(unistd.h) AppendRule([all:: libkdb5.a]) KRB_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb425/configure.in b/src/lib/krb425/configure.in index 36b1eb3..a068948 100644 --- a/src/lib/krb425/configure.in +++ b/src/lib/krb425/configure.in @@ -12,4 +12,4 @@ KRB_INCLUDE WITH_KRB5ROOT ISODE_INCLUDE CopyHeader(krb_err.h,[$(EHDRDIR)]) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in index 23e19a3..9e62843 100644 --- a/src/lib/krb5/asn.1/configure.in +++ b/src/lib/krb5/asn.1/configure.in @@ -4,7 +4,7 @@ WITH_CC dnl since we're not doing CONFIG_RULES dnl CONFIG_RULES AC_SET_BUILDTOP SubdirLibraryRule([${OBJS}]) -AC_ENABLE([isode],[ +AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[ UsePepsy PepsyTarget(KRB5) ISODEMAKEFILE=Makefile.isode],[ @@ -29,4 +29,7 @@ Krb5InstallHeaders(krb5_encode.h krb5_decode.h, [$(KRB5_INCDIR)/krb5/asn.1]) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile Makefile.isode Makefile.sane,[EXTRA_RULES_IN($ISODEMAKEFILE)]) +EXTRA_RULES_OUT(includes.out) +AC_OUTPUT(pre.out:[$]ac_prepend Makefile.out:Makefile.in post.out:[$]ac_postpend Makefile.isode.out:Makefile.isode.in Makefile.sane.out:Makefile.sane.in, + , + [cat pre.out Makefile.out post.out > Makefile; cat pre.out [$]{ISODEMAKEFILE}.out post.out includes.out > [$]{ISODEMAKEFILE}]) diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index 187ff79..44193b4 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -11,4 +11,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in index ae3fdc4..20561da 100644 --- a/src/lib/krb5/ccache/file/configure.in +++ b/src/lib/krb5/ccache/file/configure.in @@ -6,4 +6,4 @@ ISODE_DEFS AC_HAVE_HEADERS(unistd.h) SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in index 6341009..4ef9516 100644 --- a/src/lib/krb5/ccache/stdio/configure.in +++ b/src/lib/krb5/ccache/stdio/configure.in @@ -5,4 +5,4 @@ CONFIG_RULES ISODE_DEFS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 482e824..90d1a81 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -11,4 +11,4 @@ MAKE_SUBDIRS("cleaning",clean) AppendRule([all:: libkrb5.a]) WITH_CCOPTS WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in index dd8375b..42512e3 100644 --- a/src/lib/krb5/error_tables/configure.in +++ b/src/lib/krb5/error_tables/configure.in @@ -6,7 +6,7 @@ AC_SET_BUILDTOP ET_RULES SS_RULES KRB_INCLUDE -AC_ENABLE([isode],[ +AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[ ASN1_HDRS=isode_err.h ASN1_OBJS=isode_err.o ASN1_SRCS=isode_err.c @@ -25,4 +25,4 @@ CopyHeader(krb5_err.h,[$(EHDRDIR)]) CopyHeader(kdb5_err.h,[$(EHDRDIR)]) CopyHeader(adm_err.h,[$(EHDRDIR)]) CopyHeader(asn1_err.h,[$(EHDRDIR)]) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in index 054fe24..70598a5 100644 --- a/src/lib/krb5/free/configure.in +++ b/src/lib/krb5/free/configure.in @@ -6,4 +6,4 @@ ISODE_DEFS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index 4d25a76..ede7ee0 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -11,4 +11,4 @@ MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in index 6341009..4ef9516 100644 --- a/src/lib/krb5/keytab/file/configure.in +++ b/src/lib/krb5/keytab/file/configure.in @@ -5,4 +5,4 @@ CONFIG_RULES ISODE_DEFS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in index beaf004..9af1e09 100644 --- a/src/lib/krb5/krb/configure.in +++ b/src/lib/krb5/krb/configure.in @@ -12,4 +12,4 @@ ISODE_INCLUDE AC_WITH([krb4], ADD_DEF(-DKRB5_KRB4_COMPAT), echo "warning: no krb4 support will be built into compat_recvauth") -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in index 7ac4f5e..fa14918 100644 --- a/src/lib/krb5/os/configure.in +++ b/src/lib/krb5/os/configure.in @@ -11,4 +11,4 @@ AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES)) SubdirLibraryRule([${OBJS}]) KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in index f1ee848..d4bd334 100644 --- a/src/lib/krb5/posix/configure.in +++ b/src/lib/krb5/posix/configure.in @@ -9,4 +9,4 @@ AC_CONST AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H)) AC_REPLACE_FUNCS(vfprintf vsprintf strdup strerror memmove daemon) AC_FUNC_CHECK(vsyslog, ,[LIBOBJS="[$]LIBOBJS syslog.o"]) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in index 054fe24..70598a5 100644 --- a/src/lib/krb5/rcache/configure.in +++ b/src/lib/krb5/rcache/configure.in @@ -6,4 +6,4 @@ ISODE_DEFS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE ISODE_INCLUDE -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/slave/configure.in b/src/slave/configure.in index fae0c9c..85a7a0d 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -4,10 +4,10 @@ CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(util) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(util,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in index 6970ba9..0c37720 100644 --- a/src/tests/asn.1/configure.in +++ b/src/tests/asn.1/configure.in @@ -4,9 +4,9 @@ CONFIG_RULES ISODE_DEFS AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/configure.in b/src/tests/configure.in index ae308c4..87a84c4 100644 --- a/src/tests/configure.in +++ b/src/tests/configure.in @@ -7,4 +7,4 @@ MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) MAKE_SUBDIRS("checking",check) CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in index 1c1902c..66f9b88 100644 --- a/src/tests/create/configure.in +++ b/src/tests/create/configure.in @@ -3,11 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in index eb641cf..3fe5e05 100644 --- a/src/tests/hammer/configure.in +++ b/src/tests/hammer/configure.in @@ -3,9 +3,9 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in index c067f1f..2f27eb1 100644 --- a/src/tests/verify/configure.in +++ b/src/tests/verify/configure.in @@ -3,11 +3,11 @@ WITH_CCOPTS CONFIG_RULES AC_SET_BUILDTOP AC_PROG_INSTALL -AC_HAVE_LIBRARY(socket) -AC_HAVE_LIBRARY(nsl) -AC_HAVE_LIBRARY(-lndbm) -AC_HAVE_LIBRARY(-ldbm) +AC_CHECK_LIB(socket,main) +AC_CHECK_LIB(nsl,main) +AC_CHECK_LIB(ndbm,main) +AC_CHECK_LIB(dbm,main) KRB_INCLUDE ISODE_INCLUDE WITH_KRB5ROOT -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/configure.in b/src/util/configure.in index eb25de9..efbec92 100644 --- a/src/util/configure.in +++ b/src/util/configure.in @@ -5,4 +5,4 @@ AC_SET_BUILDTOP CONFIG_DIRS(et ss) MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/et/configure.in b/src/util/et/configure.in index 829f029..8b0b695 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -15,4 +15,4 @@ AC_HEADER_EGREP(perror, errno.h, AC_DEFINE(HDR_HAS_PERROR)) CHECK_STDARG AC_HAVE_HEADERS(stdlib.h) CopySrcHeader(com_err.h,$(BUILDTOP)/include) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 9f6c9f6..377724b 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -22,4 +22,4 @@ CopySrcHeader(mit-sipb-copyright.h,$(BUILDTOP)/include/ss) CopySrcHeader(copyright.h,$(BUILDTOP)/include/ss) CopyHeader(ss_err.h,$(BUILDTOP)/include/ss) CopySrcHeader(ss_internal.h,$(BUILDTOP)/include/ss) -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/unifdef/configure.in b/src/util/unifdef/configure.in index 8d01561..92ca486 100644 --- a/src/util/unifdef/configure.in +++ b/src/util/unifdef/configure.in @@ -2,4 +2,4 @@ AC_INIT(unifdef.c) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES -AC_OUTPUT(Makefile,[EXTRA_RULES]) +V5_AC_OUTPUT_MAKEFILE |