From d7945a6727cfa39039434d4da63a7080a91cabcd Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 3 Mar 2003 07:09:46 +0000 Subject: [PATCH] Remove ADD_DEF and uses thereof, and move the appropriate symbols to AC_DEFINE'ed things or to Makefile.in files. Remove explicit settings of CPPFLAGS. These allow CPPFLAGS to be a user parameter. Also, add CFLAGS to the CC_LINK variables, so they can control usage of the compiler to link programs. ticket: 677 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15214 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 6 ++++ src/aclocal.m4 | 19 ++----------- src/appl/bsd/ChangeLog | 6 ++++ src/appl/bsd/Makefile.in | 2 +- src/appl/bsd/configure.in | 1 - src/config/ChangeLog | 11 +++++++ src/config/libobj.in | 6 ++-- src/config/pre.in | 11 ++++++- src/config/shlib.conf | 60 +++++++++++++++++++-------------------- src/util/pty/ChangeLog | 5 ++++ src/util/pty/configure.in | 1 - 11 files changed, 74 insertions(+), 54 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8f2a231f2..cb2d129a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-03-03 Tom Yu + + * aclocal.m4: Remove KRB_INCLUDE; it's now in pre.in. Remove + ADD_DEF and uses thereof, thus allowing CPPFLAGS to be a user + parameter. + 2003-03-02 Sam Hartman * aclocal.m4 : Substitute in DEPLIBEXT into krb5_build_library_with_deps diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 742406334..3a0895f71 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -57,11 +57,10 @@ KRB5_AC_CHOOSE_ET dnl KRB5_AC_CHOOSE_SS dnl KRB5_AC_CHOOSE_DB dnl dnl allow stuff in tree to access deprecated/private stuff for now -ADD_DEF([-DKRB5_PRIVATE=1]) dnl +AC_DEFINE([KRB5_PRIVATE], 1, [Define only if building in-tree]) AC_C_CONST dnl WITH_NETLIB dnl WITH_HESIOD dnl -KRB_INCLUDE dnl AC_ARG_PROGRAM dnl dnl dnl This selects the correct autoconf file; either the one in our source tree, @@ -402,8 +401,8 @@ if test $withval = no; then KRB524_ERR_H_DEP= krb5_cv_build_krb4_libs=no krb5_cv_krb4_libdir= -else - ADD_DEF(-DKRB5_KRB4_COMPAT) +else + AC_DEFINE([KRB5_KRB4_COMPAT], 1, [Define this if building with krb4 compat]) if test $withval = yes; then AC_MSG_RESULT(built in krb4 support) KRB4_DEPLIB='$(TOPLIBD)/libkrb4$(DEPLIBEXT)' @@ -517,18 +516,6 @@ AC_ARG_WITH([cppopts], AC_HELP_STRING(--with-cppopts=CPPOPTS,deprecated; use CPPFLAGS=...), AC_MSG_ERROR(option --with-cppopts is deprecated; use CPPFLAGS=...))]) dnl -dnl arbitrary DEFS -- ADD_DEF(value) -dnl -AC_DEFUN(ADD_DEF,[ -CPPFLAGS="[$]CPPFLAGS "'$1' -])dnl -dnl -dnl local includes are used -- KRB_INCLUDE -dnl -AC_DEFUN(KRB_INCLUDE,[ -CPPFLAGS='-I$(BUILDTOP)/include -I$(SRCTOP)/include -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5'" $CPPFLAGS" -])dnl -dnl dnl check for yylineno -- HAVE_YYLINENO dnl AC_DEFUN(HAVE_YYLINENO,[dnl diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index c7c9bdc44..0f495d62c 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,9 @@ +2003-03-03 Tom Yu + + * Makefile.in (DEFINES): Add -DKERBEROS. + + * configure.in: Delete ADD_DEF. + 2003-02-05 Tom Yu * login.c (main): Don't zero out terminal window size. diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index f2933c366..0b08025c3 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -30,7 +30,7 @@ RSH= -DKRB5_PATH_RLOGIN=\"$(CLIENT_BINDIR)/rlogin\" BSD= -DUCB_RLOGIN=\"$(UCB_RLOGIN)\" \ -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\" -DEFINES = $(RSH) $(BSD) $(RPROGS) \ +DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \ -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \ -DHEIMDAL_FRIENDLY diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index 331db0346..8f4a16bd6 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -181,7 +181,6 @@ dnl K5_AC_CHECK_FILES(/etc/environment /etc/TIMEZONE) dnl dnl -ADD_DEF(-DKERBEROS) AC_C_CONST if test "$krb5_cv_build_krb4_libs" = yes; then AC_DEFINE(HAVE_KRB_GET_ERR_TEXT) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index c622de0b7..7a0623513 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,14 @@ +2003-03-03 Tom Yu + + * libobj.in: Change .c.so and .c.po rules to use ALL_CFLAGS. + + * pre.in (ALL_CFLAGS): Add KRB_INCLUDES. + (KRB_INCLUDES): Move from aclocal.m4, where it had been added to + CPPFLAGS. This move allows CPPFLAGS to be used by the builder. + + * shlib.conf: Add CFLAGS to many places where only LDFLAGS had + been previously. + 2003-02-12 Tom Yu * post.in (.dtmp): Use -DDEPEND to allow source files to exclude diff --git a/src/config/libobj.in b/src/config/libobj.in index 7a5fb06ca..79b4c0163 100644 --- a/src/config/libobj.in +++ b/src/config/libobj.in @@ -9,11 +9,9 @@ .SUFFIXES: .c .so .po .c.so: - $(CC) $(DEFS) $(DEFINES) $(PICFLAGS) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.so.o && \ - $(MV) $*.so.o $*.so + $(CC) $(PICFLAGS) $(ALL_CFLAGS) -c $< -o $*.so.o && $(MV) $*.so.o $*.so .c.po: - $(CC) $(DEFS) $(DEFINES) $(PROFFLAGS) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.po.o && \ - $(MV) $*.po.o $*.po + $(CC) $(PROFFLAGS) $(ALL_CFLAGS) -c $< -o $*.po.o && $(MV) $*.po.o $*.po # rules to generate object file lists diff --git a/src/config/pre.in b/src/config/pre.in index 9d9b8776b..c36b4ee8b 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -123,13 +123,22 @@ SRCTOP = @srcdir@/$(BUILDTOP) VPATH = @srcdir@ CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@ -ALL_CFLAGS = $(DEFS) $(DEFINES) $(LOCALINCLUDES) $(CPPFLAGS) $(CFLAGS) +# DEFS set by configure +# DEFINES set by local Makefile.in +# LOCALINCLUDES set by local Makefile.in +# CPPFLAGS user override +# CFLAGS user override but starts off set by configure +ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \ + $(CPPFLAGS) $(CFLAGS) + CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ CC = @CC@ LD = $(PURE) @LD@ DEPLIBS = @DEPLIBS@ +KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include \ + -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5 LDFLAGS = @LDFLAGS@ LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@ LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@ diff --git a/src/config/shlib.conf b/src/config/shlib.conf index da68b568c..156495f64 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -15,7 +15,7 @@ STOBJEXT=.o SHOBJEXT=.so PFOBJEXT=.po # Default for systems w/o shared libraries -CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' +CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' # Set up architecture-specific variables. case $krb5_cv_host in @@ -29,12 +29,12 @@ alpha*-dec-osf*) SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' # Need -oldstyle_liblookup to avoid picking up shared libs from # other builds. OSF/1 / Tru64 ld programs look through the entire # library path for shared libs prior to looking through the # entire library path for static libs. - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) -Wl,-oldstyle_liblookup $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) -Wl,-oldstyle_liblookup $(CFLAGS) $(LDFLAGS)' # $(PROG_RPATH) is here to handle things like a shared tcl library RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib; export LD_LIBRARY_PATH; _RLD_ROOT=/dev/dummy/d; export _RLD_ROOT;' ;; @@ -67,8 +67,8 @@ alpha*-dec-osf*) SHLIB_EXPFLAGS='+s +b $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' LDCOMBINE='ld -b +h lib$(LIB)$(SHLIBSEXT)' fi - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,+s $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,+s $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='SHLIB_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export SHLIB_PATH;' ;; @@ -87,8 +87,8 @@ mips-sgi-irix6.3) # This is a Kludge; see below # no gprof for Irix... PROFFLAGS=-p RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' # This grossness is necessary due to the presence of *three* # supported ABIs on Irix, and the precedence of the rpath over # LD_LIBRARY*_PATH. Like OSF/1, _RLD*_ROOT needs to be set to @@ -110,8 +110,8 @@ mips-sgi-irix*) # no gprof for Irix... PROFFLAGS=-p RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' # This grossness is necessary due to the presence of *three* # supported ABIs on Irix, and the precedence of the rpath over # LD_LIBRARY*_PATH. Like OSF/1, _RLD*_ROOT needs to be set to @@ -137,8 +137,8 @@ mips-sni-sysv4) SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.so.$(LIBMAJOR)' RPATH_FLAG=-R - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg ;; @@ -151,8 +151,8 @@ mips-*-netbsd*) LDCOMBINE='ld -shared -soname lib$(LIB)$(SHLIBSEXT)' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg ;; @@ -164,8 +164,8 @@ mips-*-netbsd*) LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' RPATH_FLAG=-R - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg ;; @@ -184,11 +184,11 @@ mips-*-netbsd*) RPATH_FLAG=-R SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' fi - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg ;; @@ -200,8 +200,8 @@ mips-*-netbsd*) LDCOMBINE='ld -Bshareable' SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' RPATH_FLAG=-R - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' PROFFLAGS=-pg ;; @@ -212,9 +212,9 @@ mips-*-netbsd*) SHLIBSEXT='.$(LIBMAJOR).dylib' SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)' SHLIBEXT=.dylib - LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)" $(LDFLAGS)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;' ;; @@ -233,8 +233,8 @@ mips-*-netbsd*) SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg RPATH_FLAG=-R - CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' ;; @@ -252,8 +252,8 @@ mips-*-netbsd*) PROFFLAGS=-pg # ick. RPATH_FLAG=-L - CC_LINK_SHARED='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"` $(PURE) $(CC) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g` $(PURE) $(CC) $(LDFLAGS)' + CC_LINK_SHARED='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"` $(PURE) $(CC) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g` $(PURE) $(CC) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' ;; *-*-linux*) @@ -275,8 +275,8 @@ mips-*-netbsd*) SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' PROFFLAGS=-pg RPATH_FLAG='-Wl,-rpath -Wl,' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' ;; @@ -294,8 +294,8 @@ mips-*-netbsd*) RPATH_FLAG=-blibpath: fi RPATH_TAIL=:/usr/lib:/lib - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"'$(LDFLAGS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH):'"$RPATH_TAIL"' $(CFLAGS) $(LDFLAGS)' + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' # $(PROG_RPATH) is here to handle things like a shared tcl library RUN_ENV='LIBPATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/lib:/usr/local/lib; export LIBPATH; ' diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index f76ada5bb..041e159aa 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,8 @@ +2003-03-03 Tom Yu + + * configure.in: Delete unused ADD_DEF, probably left over from + appl/bsd. + 2003-01-10 Ken Raeburn * configure.in: Don't explicitly invoke AC_PROG_INSTALL, diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in index 2fafd0cb9..ec430cf0a 100644 --- a/src/util/pty/configure.in +++ b/src/util/pty/configure.in @@ -280,7 +280,6 @@ if test $krb5_cv_setpgrp_args = two; then AC_DEFINE(SETPGRP_TWOARG) fi dnl -ADD_DEF(-DKERBEROS) KRB5_AC_INET6 AC_C_CONST dnl KRB5_BUILD_LIBRARY_WITH_DEPS -- 2.26.2