STAMP OUT IMAKE IN OUR LIFETIMES!

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4075 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/util/Imakefile b/src/util/Imakefile
deleted file mode 100644 (file)
index 86e14b4..0000000
--- a/src/util/Imakefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#      $Source$
-#      $Author$
-#      $Id$
-#
-#  Copyright 1990,1991 by the Massachusetts Institute of Technology.
-#  All Rights Reserved.
-# 
-# Export of this software from the United States of America may
-#   require a specific license from the United States Government.
-#   It is the responsibility of any person or organization contemplating
-#   export to obtain such a license before exporting.
-# 
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission.  M.I.T. makes no representations about the suitability of
-# this software for any purpose.  It is provided "as is" without express
-# or implied warranty.
-# 
-# 
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS=makedepend unifdef et ss
-MakeSubdirs($(SUBDIRS))

diff --git a/src/util/autoconf/configure b/src/util/autoconf/configure
index 943429b9151808b4613d931a3598d1848d05cf88..b22f8b8aba582896b044d8bca84c28a01b844a3f 100644 (file)
--- a/src/util/autoconf/configure
+++ b/src/util/autoconf/configure
@@ -18,7 +18,17 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 # Save the original args to write them into config.status later.
-configure_args="$*"
+# Do argument quoting in a sane fashion so things don't break while recursing.
+configure_args=
+for arg do
+  case $arg in
+    *\"*|*\\*|*\$*|*\`*)
+      arg=`echo $arg|sed -e 's/\\\\/\\\\\\\\/g;s/"/\\\\"/g;s/\\$/\\\\$/g;s/\`/\\\\\`/g'`
+      ;;
+  esac
+  configure_args="$configure_args \"$arg\""
+done
+# configure_args="[$]*"
 
 # Only options that might do something get documented.
 ac_usage="Usage: configure [options] [host]
@@ -266,7 +276,8 @@ ac_configure_temp="${configure_args-$*}"
 # Strip out --no-create and --norecursion so they don't pile up.
 configure_args=
 for ac_arg in $ac_configure_temp; do
-  case "$ac_arg" in
+  eval ac_unquoted="$ac_arg"
+  case "$ac_unquoted" in
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c) ;;
   -norecursion | --norecursion | --norecursio | --norecursi \
@@ -383,14 +394,14 @@ fi
 
 if test -z "$INSTALL"; then
   # As a last resort, use the slow shell script.
-  for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../..; do
+  for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../.. ${srcdir}/../../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
-  echo "configure: can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.." >&2; exit 1
+  echo "configure: can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.. ${srcdir}/../../util/autoconf" >&2; exit 1
 fi
 test -n "$verbose" && echo "   setting INSTALL to $INSTALL"
 
@@ -403,6 +414,24 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 test -n "$verbose" && echo "   setting INSTALL_DATA to $INSTALL_DATA"
 
 
+ac_top=../../
+case $ac_top in
+  /*) ;; # it's fine as is
+  *) ac_top=$srcdir/$ac_top ;;
+esac
+  ac_tmpin="${ac_top}config/pre.in"
+  if test -r $ac_tmpin; then
+     ac_prepend=$ac_tmpin
+  else
+     ac_prepend=
+  fi
+  ac_tmpin="${ac_top}config/post.in"
+  if test -r $ac_tmpin; then
+     ac_postpend=$ac_tmpin
+  else
+     ac_postpend=
+  fi
+
 # The preferred way to propogate these variables is regular @ substitutions.
 if test -n "$prefix"; then
   ac_prsub="s%^prefix\\([      ]*\\)=\\([      ]*\\).*$%prefix\\1=\\2$prefix%"
@@ -474,6 +503,8 @@ DEFS='$DEFS'
 ac_prsub='$ac_prsub'
 ac_vpsub='$ac_vpsub'
 extrasub='$extrasub'
+ac_prepend='$ac_prepend'
+ac_postpend='$ac_postpend'
 EOF
 cat >> config.status <<\EOF
 
@@ -524,7 +555,7 @@ s%@top_srcdir@%$top_srcdir%g
 s%@prefix@%$prefix%g
 s%@exec_prefix@%$exec_prefix%g
 s%@DEFS@%$DEFS%
-" $ac_given_srcdir/${ac_file}.in >> $ac_file
+" $ac_prepend $ac_given_srcdir/${ac_file}.in $ac_postpend >> $ac_file
 fi; done
 
 

diff --git a/src/util/et/Imakefile b/src/util/et/Imakefile
deleted file mode 100644 (file)
index c6f3dd0..0000000
--- a/src/util/et/Imakefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#      $Source$
-#      $Author$
-#      $Id$
-#
-#  Copyright 1993 by the Massachusetts Institute of Technology.
-#  All Rights Reserved.
-# 
-# Export of this software from the United States of America may
-#   require a specific license from the United States Government.
-#   It is the responsibility of any person or organization contemplating
-#   export to obtain such a license before exporting.
-# 
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission.  M.I.T. makes no representations about the suitability of
-# this software for any purpose.  It is provided "as is" without express
-# or implied warranty.
-# 
-# 
-NormalLibraryObjectRule()
-
-#ifdef HasVfprintf
-VPOBJS=
-VPSRCS=
-#else
-VPOBJS=vfprintf.o 
-VPSRCS=$(SRCDIR)vfprintf.c
-#endif
-
-OBJS=  error_message.o et_name.o init_et.o com_err.o $(VPOBJS)
-SRCS=  error_message.c et_name.c init_et.c com_err.c $(VPSRCS)
-#ifndef LinuxArchitecture
-DEFINES= -DNEED_SYS_ERRLIST
-#endif
-
-Krb5LibraryTarget(com_err,$(OBJS))
-
-compile_et: compile_et.sh
-       ./config_script compile_et.sh $(AWK) > compile_et
-       chmod +x compile_et
-
-all:: compile_et
-
-includes:: compile_et
-       -$(RM) -f $(TOP)/include/com_err.h
-       $(LN) ../$(CURRENT_DIR)/com_err.h $(TOP)/include
-
-clean::
-       $(RM) compile_et

diff --git a/src/util/makedepend/Imakefile b/src/util/makedepend/Imakefile
deleted file mode 100644 (file)
index bcfc523..0000000
--- a/src/util/makedepend/Imakefile
+++ /dev/null
@@ -1,45 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.22 94/03/29 15:54:05 gildea Exp $
-
-    SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
-    OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
-
-#if HasGcc && !defined(PreIncDir)
-#define PreIncDir /usr/local/lib/gcc-include
-#endif
-#ifdef PreIncDir
-PREINCDIR = PreIncDir
-PREINC_DEFINES = -DPREINCDIR=\"$(PREINCDIR)\"
-#endif
-#ifndef StdIncDir
-#define StdIncDir /usr/include
-#endif
-STDINCDIR = StdIncDir
-STDINC_DEFINES = -DINCLUDEDIR=\"$(STDINCDIR)\"
-#ifdef PostIncDir
-POSTINCDIR = PostIncDir
-POSTINC_DEFINES = -DPOSTINCDIR=\"$(POSTINCDIR)\"
-#endif
-INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES)
-OSUF = .Osuf
-OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
-MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
-INCLUDES = -I$(IMAKESRC)
- DEPLIBS =
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture)
- XBSDLIB = /**/
-#endif
-
-all:: makedepend
-
-#undef InstallManPage
-#define InstallManPage(file,dest) /* as nothing */
-#if CrossCompiling
-ComplexHostProgramTarget(makedepend)
-#else
-ComplexProgramTarget(makedepend)
-#endif
-
-SpecialObjectRule(main.o,$(ICONFIGFILES),$(MAIN_DEFINES))
-
-InstallManPageLong(mkdepend,$(MANDIR),makedepend)

diff --git a/src/util/ss/Imakefile b/src/util/ss/Imakefile
deleted file mode 100644 (file)
index 8a8880a..0000000
--- a/src/util/ss/Imakefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#      $Source$
-#      $Author$
-#      $Id$
-#
-#  Copyright 1990 by the Massachusetts Institute of Technology.
-#  All Rights Reserved.
-# 
-# Export of this software from the United States of America may
-#   require a specific license from the United States Government.
-#   It is the responsibility of any person or organization contemplating
-#   export to obtain such a license before exporting.
-# 
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission.  M.I.T. makes no representations about the suitability of
-# this software for any purpose.  It is provided "as is" without express
-# or implied warranty.
-# 
-# 
-NormalLibraryObjectRule()
-ErrorTableObjectRule()
-
-OBJS=  ss_err.o \
-       std_rqs.o \
-       invocation.o help.o \
-       execute_cmd.o listen.o parse.o error.o prompt.o \
-       request_tbl.o list_rqs.o pager.o requests.o \
-       data.o
-
-SRCS=  invocation.c help.c \
-       execute_cmd.c listen.c parse.c error.c prompt.c \
-       request_tbl.c list_rqs.c pager.c requests.c \
-       data.c
-
-INCLUDE=-I$(TOP)/include -I. -I.. -I../et
-
-Krb5LibraryTarget(ss,$(OBJS))
-
-mk_cmds: mk_cmds.sh
-       ./config_script mk_cmds.sh $(AWK) > mk_cmds
-       chmod +x mk_cmds
-
-SpecialObjectRule(ss_err.o,ss_err.c,)
-SpecialObjectRule(std_rqs.o,std_rqs.c,)
-
-std_rqs.c: std_rqs.ct mk_cmds
-       ./mk_cmds std_rqs.ct
-
-all:: mk_cmds
-
-includes:: mk_cmds ss_err.h
-       -$(RM) -rf $(TOP)/include/ss
-       mkdir $(TOP)/include/ss
-       $(LN) ../../$(CURRENT_DIR)/ss.h $(TOP)/include/ss
-       $(LN) ../../$(CURRENT_DIR)/mit-sipb-copyright.h $(TOP)/include/ss
-       $(LN) ../../$(CURRENT_DIR)/copyright.h $(TOP)/include/ss
-       $(LN) ../../$(CURRENT_DIR)/ss_err.h $(TOP)/include/ss
-       $(LN) ../../$(CURRENT_DIR)/ss_internal.h $(TOP)/include/ss
-
-clean::
-       $(RM) mk_cmds ss_err.c ss_err.h
-
-

diff --git a/src/util/unifdef/Imakefile b/src/util/unifdef/Imakefile
deleted file mode 100644 (file)
index ab18048..0000000
--- a/src/util/unifdef/Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#      $Source$
-#      $Author$
-#      $Id$
-#
-#  Copyright 1990 by the Massachusetts Institute of Technology.
-#  All Rights Reserved.
-# 
-# Export of this software from the United States of America may
-#   require a specific license from the United States Government.
-#   It is the responsibility of any person or organization contemplating
-#   export to obtain such a license before exporting.
-# 
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission.  M.I.T. makes no representations about the suitability of
-# this software for any purpose.  It is provided "as is" without express
-# or implied warranty.
-# 
-# 
-
-SimpleTestProgramTarget(unifdef)
-
-DependTarget()
-
-#
-# We need to actually build the program during the includes stage.
-#
-
-includes:: unifdef