pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk
[krb5.git] / src / config / pre.in
index 02aa7546139698f4e6e5a2ce8f84206855f9a17f..de08645550a51b43aee74f226a6bd25aa33f0883 100644 (file)
@@ -136,12 +136,8 @@ C=./
 # "/" for UNIX, "\" for Windows; *sigh*
 S=/
 
-#SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
-SUBDIRS_@top_srcdir@ = @subdirs@
-SUBDIRS = $(SUBDIRS_@srcdir@) $(LOCAL_SUBDIRS)
 #
 srcdir = @srcdir@
-SRCTOP = @srcdir@/$(BUILDTOP)
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 CONFIG_RELTOPDIR = @CONFIG_RELTOPDIR@
@@ -155,30 +151,35 @@ FAKELIBDIR=$(FAKEPREFIX)/lib
 # LOCALINCLUDES        set by local Makefile.in
 # CPPFLAGS     user override
 # CFLAGS       user override but starts off set by configure
+# WARN_CFLAGS  user override but starts off set by configure
 # PTHREAD_CFLAGS set by configure, not included in CFLAGS so that we
 #              don't pull the pthreads library into shared libraries
 ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
-       $(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
+       -DKRB5_DEPRECATED=1 \
+       $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
+ALL_CXXFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
+       -DKRB5_DEPRECATED=1 \
+       $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS)
 
 CFLAGS = @CFLAGS@
+CXXFLAGS = @CXXFLAGS@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@
 CC = @CC@
+CXX = @CXX@
 LD = $(PURE) @LD@
 DEPLIBS = @DEPLIBS@
-KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include
+KRB_INCLUDES = -I$(BUILDTOP)/include -I$(top_srcdir)/include
 LDFLAGS = @LDFLAGS@
 LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@
 LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@
 LDARGS = @LDARGS@
 LIBS = @LIBS@
-SRVLIBS = @SRVLIBS@
-SRVDEPLIBS = @SRVDEPLIBS@
-CLNTLIBS = @CLNTLIBS@
-CLNTDEPLIBS = @CLNTDEPLIBS@
 
 INSTALL=@INSTALL@
 INSTALL_STRIP=
@@ -193,6 +194,7 @@ prefix=@prefix@
 INSTALL_PREFIX=$(prefix)
 INSTALL_EXEC_PREFIX=@exec_prefix@
 exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
 SHLIB_TAIL_COMP=@SHLIB_TAIL_COMP@
 
 datadir = @datadir@
@@ -211,10 +213,14 @@ KRB5_SHLIBDIR = @libdir@$(SHLIB_TAIL_COMP)
 KRB5_INCDIR = @includedir@
 MODULE_DIR = @libdir@/krb5/plugins
 KRB5_DB_MODULE_DIR = $(MODULE_DIR)/kdb
+KRB5_PA_MODULE_DIR = $(MODULE_DIR)/preauth
+KRB5_AD_MODULE_DIR = $(MODULE_DIR)/authdata
 KRB5_LIBKRB5_MODULE_DIR = $(MODULE_DIR)/libkrb5
+GSS_MODULE_DIR = @libdir@/gss
 KRB5_INCSUBDIRS = \
+       $(KRB5_INCDIR)/kadm5 \
+       $(KRB5_INCDIR)/krb5 \
        $(KRB5_INCDIR)/gssapi \
-       $(KRB5_INCDIR)/kerberosIV \
        $(KRB5_INCDIR)/gssrpc
 
 #
@@ -222,26 +228,25 @@ KRB5_INCSUBDIRS = \
 # XXX check which of these are actually used!
 #
 TESTDIR                = $(BUILDTOP)/kadmin/testing
-STESTDIR       = $(SRCTOP)/kadmin/testing
+STESTDIR       = $(top_srcdir)/kadmin/testing
 COMPARE_DUMP   = $(TESTDIR)/scripts/compare_dump.pl
-FIX_CONF_FILES = $(TESTDIR)/scripts/fixup-conf-files.pl
 INITDB         = $(STESTDIR)/scripts/init_db
 MAKE_KEYTAB    = $(TESTDIR)/scripts/make-host-keytab.pl
 LOCAL_MAKE_KEYTAB= $(TESTDIR)/scripts/make-host-keytab.pl
-RESTORE_FILES  = $(STESTDIR)/scripts/restore_files.sh
-SAVE_FILES     = $(STESTDIR)/scripts/save_files.sh
 ENV_SETUP      = $(TESTDIR)/scripts/env-setup.sh
-CLNTTCL                = $(TESTDIR)/util/ovsec_kadm_clnt_tcl
-SRVTCL         = $(TESTDIR)/util/ovsec_kadm_srv_tcl
+CLNTTCL                = $(TESTDIR)/util/kadm5_clnt_tcl
+SRVTCL         = $(TESTDIR)/util/kadm5_srv_tcl
 # Dejagnu variables.
 # We have to set the host with --host so that setup_xfail will work.
 # If we don't set it, then the host type used is "native", which
 # doesn't match "*-*-*".
 host=@krb5_cv_host@
-DEJAFLAGS      = $(DEJALFLAGS) $(CLFLAGS) --debug --srcdir $(srcdir) --host \
-                  $(host)
+DEJAFLAGS      = --debug --srcdir $(srcdir) --host $(host)
 RUNTEST                = runtest $(DEJAFLAGS)
 
+RUNPYTEST      = PYTHONPATH=$(top_srcdir)/util VALGRIND="$(VALGRIND)" \
+                       $(PYTHON)
+
 START_SERVERS  = $(STESTDIR)/scripts/start_servers $(TEST_SERVER) $(TEST_PATH)
 START_SERVERS_LOCAL = $(STESTDIR)/scripts/start_servers_local
 
@@ -254,7 +259,7 @@ STOP_SERVERS_LOCAL = $(STESTDIR)/scripts/stop_servers_local
 transform = @program_transform_name@
 
 RM = rm -f
-CP  = cp
+CP = cp
 MV = mv -f
 CHMOD=chmod
 RANLIB = @RANLIB@
@@ -266,12 +271,13 @@ LEX = @LEX@
 LEXLIB = @LEXLIB@
 YACC = @YACC@
 PERL = @PERL@
+PYTHON = @PYTHON@
 AUTOCONF = autoconf
 AUTOCONFFLAGS =
 AUTOHEADER = autoheader
 AUTOHEADERFLAGS =
+MOVEIFCHANGED = $(top_srcdir)/config/move-if-changed
 
-HOST_TYPE = @HOST_TYPE@
 SHEXT = @SHEXT@
 STEXT=@STEXT@
 VEXT=@VEXT@
@@ -299,21 +305,26 @@ EXEEXT =
 
 
 CC_LINK=@CC_LINK@
+CXX_LINK=@CXX_LINK@
 
 # prefix (with no spaces after) for rpath flag to cc
 RPATH_FLAG=@RPATH_FLAG@
 
+# link flags to add PROG_RPATH to the rpath
+PROG_RPATH_FLAGS=@PROG_RPATH_FLAGS@
+
 # this gets set by configure to either $(STLIBEXT) or $(SHLIBEXT),
 # depending on whether we're building with shared libraries.
 DEPLIBEXT=@DEPLIBEXT@
 
-KADMCLNT_DEPLIB        = $(TOPLIBD)/libkadm5clnt$(DEPLIBEXT)
-KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv$(DEPLIBEXT)
+KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@
+KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@
+
+KADMCLNT_DEPLIB        = $(TOPLIBD)/libkadm5clnt_mit$(DEPLIBEXT)
+KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv_mit$(DEPLIBEXT)
 KDB5_DEPLIB    = $(TOPLIBD)/libkdb5$(DEPLIBEXT)
 GSSRPC_DEPLIB  = $(TOPLIBD)/libgssrpc$(DEPLIBEXT)
 GSS_DEPLIB     = $(TOPLIBD)/libgssapi_krb5$(DEPLIBEXT)
-KRB4_DEPLIB    = @KRB4_DEPLIB@         # $(TOPLIBD)/libkrb4$(DEPLIBEXT)
-DES425_DEPLIB  = @DES425_DEPLIB@       # $(TOPLIBD)/libdes425$(DEPLIBEXT)
 KRB5_DEPLIB    = $(TOPLIBD)/libkrb5$(DEPLIBEXT)
 CRYPTO_DEPLIB  = $(TOPLIBD)/libk5crypto$(DEPLIBEXT)
 COM_ERR_DEPLIB = $(COM_ERR_DEPLIB-@COM_ERR_VERSION@)
@@ -327,12 +338,10 @@ SUPPORT_DEPLIB    = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT)
 SS_DEPLIB      = $(SS_DEPLIB-@SS_VERSION@)
 SS_DEPLIB-k5   = $(TOPLIBD)/libss.a
 SS_DEPLIB-sys  =
-PTY_DEPLIB     = $(TOPLIBD)/libpty.a
 APPUTILS_DEPLIB        = $(TOPLIBD)/libapputils.a
 
 KRB5_BASE_DEPLIBS      = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
-KRB4COMPAT_DEPLIBS     = $(KRB4_DEPLIB) $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS)
-KDB5_DEPLIBS           = $(KDB5_DEPLIB)
+KDB5_DEPLIBS           = $(KDB5_DEPLIB) $(KDB5_PLUGIN_DEPLIBS)
 GSS_DEPLIBS            = $(GSS_DEPLIB)
 GSSRPC_DEPLIBS         = $(GSSRPC_DEPLIB) $(GSS_DEPLIBS)
 KADM_COMM_DEPLIBS      = $(GSSRPC_DEPLIBS) $(KDB5_DEPLIBS) $(GSSRPC_DEPLIBS)
@@ -352,11 +361,6 @@ SS_DEPS            = $(SS_DEPS-@SS_VERSION@)
 SS_DEPS-sys    =
 SS_DEPS-k5     = $(BUILDTOP)/include/ss/ss.h $(BUILDTOP)/include/ss/ss_err.h
 
-# Header file dependencies that might depend on whether krb4 support
-# is compiled.
-
-KRB_ERR_H_DEP  = @KRB_ERR_H_DEP@
-
 # LIBS gets substituted in... e.g. -lnsl -lsocket
 
 # GEN_LIB is -lgen if needed for regexp
@@ -365,7 +369,7 @@ GEN_LIB             = @GEN_LIB@
 SS_LIB         = $(SS_LIB-@SS_VERSION@)
 SS_LIB-sys     = @SS_LIB@
 SS_LIB-k5      = $(TOPLIBD)/libss.a
-KDB5_LIB       = -lkdb5
+KDB5_LIB       = -lkdb5 $(KDB5_PLUGIN_LIBS)
 
 DL_LIB         = @DL_LIB@
 
@@ -375,30 +379,18 @@ COM_ERR_LIB                       = -lcom_err
 GSS_KRB5_LIB                   = -lgssapi_krb5
 SUPPORT_LIB                    = -l$(SUPPORT_LIBNAME)
 
-# KRB4_LIB is -lkrb4 if building --with-krb4
-# needs fixing if ever used on Mac OS X!
-KRB4_LIB       = @KRB4_LIB@
-
-# DES425_LIB is -ldes425 if building --with-krb4
-# needs fixing if ever used on Mac OS X!
-DES425_LIB     = @DES425_LIB@
-
 # HESIOD_LIBS is -lhesiod...
 HESIOD_LIBS    = @HESIOD_LIBS@
 
-KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) $(LIBS)
-KRB4COMPAT_LIBS        = $(KRB4_LIB) $(DES425_LIB) $(KRB5_BASE_LIBS)
-KDB5_LIBS      = $(KDB5_LIB)
+KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) $(LIBS) $(DL_LIB)
+KDB5_LIBS      = $(KDB5_LIB) $(GSSRPC_LIBS)
 GSS_LIBS       = $(GSS_KRB5_LIB)
 # needs fixing if ever used on Mac OS X!
 GSSRPC_LIBS    = -lgssrpc $(GSS_LIBS)
 KADM_COMM_LIBS = $(GSSRPC_LIBS)
 # need fixing if ever used on Mac OS X!
-KADMSRV_LIBS   = -lkadm5srv $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS)
-KADMCLNT_LIBS  = -lkadm5clnt $(KADM_COMM_LIBS)
-
-# need fixing if ever used on Mac OS X!
-PTY_LIB                = -lpty
+KADMSRV_LIBS   = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS)
+KADMCLNT_LIBS  = -lkadm5clnt_mit $(KADM_COMM_LIBS)
 
 # libutil for NetBSD, et al. for openpty(), etc.
 UTIL_LIB       = @UTIL_LIB@
@@ -407,10 +399,9 @@ UTIL_LIB   = @UTIL_LIB@
 # eventually) but which we don't want to install.
 APPUTILS_LIB   = -lapputils
 
-#
-# some more stuff for --with-krb4
-KRB4_LIBPATH   = @KRB4_LIBPATH@
-KRB4_INCLUDES  = @KRB4_INCLUDES@
+# So test programs can find their libraries without "make install", etc.
+KRB5_RUN_ENV=@KRB5_RUN_ENV@
+KRB5_RUN_VARS=@KRB5_RUN_VARS@
 
 #
 # variables for --with-tcl=
@@ -420,12 +411,16 @@ TCL_RPATH = @TCL_RPATH@
 TCL_MAYBE_RPATH = @TCL_MAYBE_RPATH@
 TCL_INCLUDES   = @TCL_INCLUDES@
 
+# Crypto and PRNG back-end selections
+CRYPTO_IMPL    = @CRYPTO_IMPL@
+PRNG_ALG       = @PRNG_ALG@
+
 # error table rules
 #
 ### /* these are invoked as $(...) foo.et, which works, but could be better */
 COMPILE_ET= $(COMPILE_ET-@COM_ERR_VERSION@)
 COMPILE_ET-sys= compile_et
-COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(SRCTOP)/util/et
+COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(top_srcdir)/util/et
 
 .SUFFIXES:  .h .c .et .ct
 
@@ -438,18 +433,28 @@ COMPILE_ET-k5= $(BUILDTOP)/util/et/compile_et -d $(SRCTOP)/util/et
 #.et.c: ; $(COMPILE_ET) $<
 
 .et.h:
-       d=ettmp$$$$ ; (cp $< $$d.et && $(COMPILE_ET) $$d.et && mv $$d.h $*.h) ; \
-               e=$$? ; rm -f $$d.* ; exit $$e
-
+       $(RM) et-h-$*.et et-h-$*.c et-h-$*.h
+       $(CP) $< et-h-$*.et
+       $(COMPILE_ET) et-h-$*.et
+       $(MV) et-h-$*.h $*.h
+       $(RM) et-h-$*.et et-h-$*.c
 .et.c:
-       d=ettmp$$$$ ; (cp $< $$d.et && $(COMPILE_ET) $$d.et && mv $$d.c $*.c) ; \
-               e=$$? ; rm -f $$d.* ; exit $$e
+       $(RM) et-c-$*.et et-c-$*.c et-c-$*.h
+       $(CP) $< et-c-$*.et
+       $(COMPILE_ET) et-c-$*.et
+       $(MV) et-c-$*.c $*.c
+       $(RM) et-c-$*.et et-c-$*.h
 
 # rule to make object files
 #
-.SUFFIXES: .c .o
+.SUFFIXES: .cpp .c .o
 .c.o:
        $(CC) $(ALL_CFLAGS) -c $<
+# Use .cpp because that's what autoconf uses in its test.
+# If the compiler doesn't accept a .cpp suffix here, it wouldn't
+# have accepted it when autoconf tested it.
+.cpp.o:
+       $(CXX) $(ALL_CXXFLAGS) -c $<
 
 # ss command table rules
 #
@@ -462,6 +467,12 @@ MAKE_COMMANDS-k5= $(BUILDTOP)/util/ss/mk_cmds
 
 ## Parameters to be set by configure for use in lib.in:
 ##
+#
+# These settings are for building shared libraries only.  Including
+# libpriv.in will override with values appropriate for static
+# libraries that we don't install.  Some values will depend on whether
+# the platform supports major and minor version number extensions on
+# shared libraries, hence the FOO_@@ settings.
 
 LN_S=@LN_S@
 AR=@AR@
@@ -474,9 +485,18 @@ LIBLIST=@LIBLIST@
 # Set by configure; list of library symlinks to make to $(TOPLIBD)
 LIBLINKS=@LIBLINKS@
 
-# Set by configure; list of install targets
+# Set by configure; name of plugin module to build (libfoo.a or foo.so)
+PLUGIN=@PLUGIN@
+
+# Set by configure; symlink for plugin module for static plugin linking
+PLUGINLINK=@PLUGINLINK@
+
+# Set by configure; list of install targets for libraries
 LIBINSTLIST=@LIBINSTLIST@
 
+# Set by configure; install target
+PLUGININST=@PLUGININST@
+
 # Some of these should really move to pre.in, since programs will need
 # it too. (e.g. stuff that has dependencies on the libraries)
 
@@ -515,8 +535,12 @@ SHLIB_EXPORT_FILE_DEP=@SHLIB_EXPORT_FILE_DEP@
 # to change to rearrange where the various parameters fit in.
 MAKE_SHLIB_COMMAND=@MAKE_SHLIB_COMMAND@
 
+# run path flags for explicit libraries depending on this one,
+# e.g. "-R$(SHLIB_RPATH)"
+SHLIB_RPATH_FLAGS=@SHLIB_RPATH_FLAGS@
+
 # flags for explicit libraries depending on this one,
-# e.g. "-R$(SHLIB_RPATH) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
+# e.g. "$(SHLIB_RPATH_FLAGS) $(SHLIB_SHLIB_DIRFLAGS) $(SHLIB_EXPLIBS)"
 SHLIB_EXPFLAGS=@SHLIB_EXPFLAGS@
 
 ## Parameters to be set by configure for use in libobj.in:
@@ -533,10 +557,6 @@ PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@)
 # "$(CC) -G", "$(LD) -Bshareable", etc.
 LDCOMBINE=@LDCOMBINE@
 
-# "-h $@", "-h lib$(LIBNAME).$(LIBMAJOR)", etc.
-SONAME=@SONAME@
-
-
 #
 # rules to make various types of object files
 #
@@ -546,7 +566,21 @@ PROFFLAGS=@PROFFLAGS@
 # platform-dependent temporary files that should get cleaned up
 EXTRA_FILES=@EXTRA_FILES@
 
-
+VALGRIND=
+# Need absolute paths here because under kshd or ftpd we may run programs
+# while in other directories.
+VALGRIND_LOGDIR = `cd $(BUILDTOP)&&pwd`
+VALGRIND1 = valgrind --tool=memcheck --log-file=$(VALGRIND_LOGDIR)/vg.%p --trace-children=yes -v --leak-check=yes --suppressions=`cd $(top_srcdir)&&pwd`/util/valgrind-suppressions
+
+# Set OFFLINE=yes to disable tests that assume network connectivity.
+# (Specifically, this concerns the ability to fetch DNS data for
+# mit.edu, to verify that SRV queries are working.)  Note that other
+# tests still assume that the local hostname can be resolved into
+# something that looks like an FQDN, with an IPv4 address.
+OFFLINE=no
+
+# Used when running Python tests.
+PYTESTFLAGS=
 
 ##
 ## end of pre.in