Undid config breakage

Author: jgg
Date: 2001-03-05 21:11:52 GMT
Undid config breakage

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 37ee9f830d4a284e5b85970988159bb6d0354b87..35a3e71de25a4ae4079b43def29b39b4c8c41a13 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -82,7 +82,7 @@ YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
 SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
 
-include $(wildcard $(BUILD)/environment.*mak)
+include $(BUILD)/environment.mak
 
 ifdef STATICLIBS
 LIBRARY_H += $(BASE)/buildlib/staticlibrary.mak

diff --git a/buildlib/makefile.in b/buildlib/makefile.in
index ec7cdd63a98bf17a35b0e6491b79af1e357ec3d2..756565f40dca63d6041d2a1b7ca0b5e1702111d4 100644 (file)
--- a/buildlib/makefile.in
+++ b/buildlib/makefile.in
@@ -21,7 +21,7 @@ all headers library clean veryclean binary program doc:
 .PHONY: maintainer-clean dist-clean pristine sanity distclean
 maintainer-clean dist-clean pristine sanity distclean:
        -rm -rf $(DIRS)
-       -rm -f config.cache config.log config.status environment.*mak makefile
+       -rm -f config.cache config.log config.status environment.mak makefile
        
 # Create the required directories and build the shims
 # The configure script fills in below, and then we do the right things..

diff --git a/configure.in b/configure.in
index 1c4857191669be6dfc2d5ed732ed27b882398cf1..95ff0176e94460e5ed6fac7fd781b09e4cc5d988 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,8 +14,7 @@ dnl configure.in correctly and can be run at any time
 
 AC_INIT(configure.in)
 AC_CONFIG_AUX_DIR(buildlib)
-AC_CONFIG_HEADER(include/config.h:buildlib/core/config.h.in include/apti18n.h:buildlib/core/apti18n.h.in)
-CONFIG_STATUS=config.status.apt
+AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_DEFINE_UNQUOTED(VERSION,"0.5.1")
@@ -129,7 +128,6 @@ if test x"$c9x_ints" = x"no"; then
   
    HAVE_C9X=
    AC_SUBST(HAVE_C9X)
-   AC_OUTPUT_COMMANDS([echo Have c9x $HAVE_C9X],[HAVE_C9X=$HAVE_C9X])
 fi
 
 dnl HP-UX sux..
@@ -164,4 +162,4 @@ ah_NUM_PROCS
 ah_GLIBC_VER
 ah_LIBSTDCPP_VER
 
-AC_OUTPUT(environment.mak:buildlib/core/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)
+AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs)