[[$2]="[$1] $[$2]" && dnl
if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])
+dnl XE_DIE(message)
+define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])
+
+dnl XE_STRIP_4TH_COMPONENT(var)
+dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended.
+define([XE_STRIP_4TH_COMPONENT],
+[$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`])
dnl Initialize some variables set by options.
dnl The variables have the same names as the options, with
XE_APPEND(lib-src, MAKE_SUBDIR)
XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR)
-dnl run_in_place='no'
prefix='/usr/local'
exec_prefix='${prefix}'
bindir='${exec_prefix}/bin'
case "$opt" in
dnl Process (many) boolean options
- run_in_place | \
- with_site_lisp | \
+ with_site_lisp | \
with_x | \
with_x11 | \
with_msw | \
with_gcc | \
- with_gnu_make | \
dynamic | \
with_ncurses | \
with_dnet | \
with_tiff | \
with_session | \
with_xmu | \
+ with_purify | \
with_quantify | \
with_toolbars | \
with_tty | \
with_xfs | \
with_i18n3 | \
with_mule | \
- with_file_coding | \
+ with_file_coding| \
with_canna | \
with_wnn | \
with_wnn6 | \
with_workshop | \
with_sparcworks | \
- with_tooltalk | \
+ with_tooltalk | \
with_ldap | \
with_pop | \
with_kerberos | \
verbose | \
extra_verbose | \
const_is_losing | \
- usage_tracking | \
- use_union_type | \
+ usage_tracking | \
+ use_union_type | \
debug | \
use_assertions | \
+ gung_ho | \
use_minimal_tagbits | \
use_indexed_lrecord_implementation | \
- gung_ho | \
- use_assertions | \
memory_usage_stats | \
with_clash_detection | \
with_shlib | \
dnl Make sure the value given was either "yes" or "no".
case "$val" in
y | ye | yes ) val=yes ;;
- n | no ) val=no ;;
+ n | no ) val=no ;;
* ) USAGE_ERROR("The \`--$optname' option requires a boolean value: \`yes' or \`no'.") ;;
esac
- eval "$opt=\"$val\"" ;;
+ eval "$opt=\"$val\"" ;;
dnl Options that take a user-supplied value, as in --puresize=8000000
ldflags | \
puresize | \
cache_file | \
- native_sound_lib | \
+ native_sound_lib| \
site_lisp | \
x_includes | \
x_libraries | \
g | gn | gnu | gnud | gnudb | gnudbm ) with_database_gnudbm=yes ;;
* ) USAGE_ERROR(["The \`--$optname' option value
must be either \`no' or a comma-separated list
- of one or more of \`berkdb', \`dbm', or \`gnudbm'."]) ;;
+ of one or more of \`berkdb' and either \`dbm' or \`gnudbm'."]) ;;
esac
done
if test "$with_database_dbm" = "yes" -a \
eval "$opt=\"$val\""
;;
- dnl XFontSet support?
- "with_xfs" )
- case "$val" in
- y | ye | yes ) val=yes ;;
- n | no | non | none ) val=no ;;
- * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
- \`yes', or \`no'."]) ;;
- esac
- eval "$opt=\"$val\""
- ;;
-
dnl Mail locking specification
"mail_locking" )
case "$val" in
dnl Has the user specified one of the path options?
prefix | exec_prefix | bindir | datadir | statedir | libdir | \
mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \
- archlibdir | docdir | package_path )
+ archlibdir | docdir | package_path )
dnl If the value was omitted, get it from the next argument.
if test "$valomitted" = "yes"; then
if test "$#" = 0; then
dnl Has the user asked for some help?
"usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;;
- dnl Has the user specified what toolkit to use for the menubars,
- dnl scrollbar or dialogs?
- "with_menubars" | "with_scrollbars" | "with_dialogs" )
+ dnl Has the user specified the toolkit(s) to use for GUI elements?
+ "with_menubars" | \
+ "with_scrollbars" | \
+ "with_dialogs" )
case "$val" in
l | lu | luc | luci | lucid ) val=lucid ;;
m | mo | mot | moti | motif ) val=motif ;;
eval "$opt=\"$val\""
;;
- dnl Fail on unrecognized arguments.
+ dnl Obsolete legacy argument? Warn, but otherwise ignore.
+ "run_in_place" | \
+ "with_gnu_make" )
+ AC_MSG_WARN([Obsolete option \`--$optname' ignored.])
+ ;;
+
+ dnl Unrecognized option? No mercy for user errors.
* ) USAGE_ERROR("Unrecognized option: $arg") ;;
esac
dnl Assume anything with multiple hyphens is a configuration name.
*-*-*) configuration="$arg" ;;
- dnl Anything else is an error
+ dnl Unrecognized argument? No mercy for user errors.
*) USAGE_ERROR("Unrecognized argument: $arg") ;;
esac
dnl --extra-verbose implies --verbose
test "$extra_verbose" = "yes" && verbose=yes
-dnl Allow use of either ":" or spaces for lists of directories
-define(COLON_TO_SPACE,
- [case "$[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's/^ //' -e 's/:/ /g'`";; esac])dnl
-COLON_TO_SPACE(site_includes)
-COLON_TO_SPACE(site_libraries)
-COLON_TO_SPACE(site_prefixes)
-COLON_TO_SPACE(site_runtime_libraries)
-
dnl with_x is an obsolete synonym for with_x11
test -n "$with_x" && with_x11="$with_x"
+dnl --with-quantify or --with-purify imply --use-system-malloc
+if test "$with_purify" = "yes" -o "$with_quantify" = "yes"; then
+ test "$with_system_malloc" = "default" && with_system_malloc=yes
+fi
+
dnl --gung-ho=val is a synonym for
dnl --use-minimal-tagbits=val --use-indexed-lrecord-implementation=val
-
if test -n "$gung_ho"; then
test -z "$use_minimal_tagbits" && use_minimal_tagbits="$gung_ho"
test -z "$use_indexed_lrecord_implementation" && \
dnl CDE requires tooltalk
XE_CHECK_FEATURE_DEPENDENCY(cde, tooltalk)
-dnl Ignore useless run-in-place flag
-if test "$run_in_place" = "yes"; then
- AC_MSG_WARN("The --run-in-place option is ignored because it is unnecessary.")
-fi
-
dnl Find the source directory.
case "$srcdir" in
dnl ###########################################################################
if test -z "$configuration"; then
- AC_MSG_CHECKING("host system type")
- dnl Guess the configuration and remove 4th name component, if present.
- if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \
- sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'` ; then
- AC_MSG_RESULT($configuration)
- else
- AC_MSG_RESULT(unknown)
+ dnl Guess the configuration
+ configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess`
+ if test -z "$configuration"; then
USAGE_ERROR(["XEmacs has not been ported to this host type.
Try explicitly specifying the CONFIGURATION when rerunning configure."])
fi
dnl names of the m/*.h and s/*.h files we should use.
dnl Canonicalize the configuration name.
-AC_CHECKING("the configuration name")
+AC_MSG_CHECKING("host system type")
dnl allow -workshop suffix on configuration name
internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
-if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
- exit $?
-fi
+canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
+XE_STRIP_4TH_COMPONENT(configuration)
+XE_STRIP_4TH_COMPONENT(canonical)
+AC_MSG_RESULT($configuration)
dnl If you add support for a new configuration, add code to this
dnl switch statement to recognize your configuration name and select
m68*-sony-* ) machine=news ;;
mips-sony-* ) machine=news-risc ;;
clipper-* ) machine=clipper ;;
+ arm-* ) machine=arm ;;
+ ns32k-* ) machine=ns32000 ;;
esac
dnl Straightforward OS determination
dnl OpenBSD ports
*-*-openbsd* )
case "${canonical}" in
- alpha*-*-openbsd*) machine=alpha ;;
i386-*-openbsd*) machine=intel386 ;;
m68k-*-openbsd*) machine=hp9000s300 ;;
mipsel-*-openbsd*) machine=pmax ;;
- ns32k-*-openbsd*) machine=ns32000 ;;
- sparc-*-openbsd*) machine=sparc ;;
- vax-*-openbsd*) machine=vax ;;
esac
;;
dnl Linux/68k
m68k-*-linux* ) machine=m68k opsys=linux ;;
- dnl Linux/arm
- arm-*-linux* ) machine=arm opsys=linux ;;
-
esac
if test -z "$machine" -o -z "$opsys"; then
dnl The value of CPP is a quoted variable reference, so we need to do this
dnl to get its actual value...
-CPP=`eval "echo $CPP"`
+CPP=`eval "echo $CPP $CPPFLAGS"`
define(TAB, [ ])dnl
changequote(, )dnl
eval `$CPP -Isrc $tempcname \
set x $[$1]; shift; [$1]=""
while test -n "[$]1"; do
case [$]1 in
- -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;;
- -L* | -l* | -u* | -Wl* ) [$1]="$[$1] [$]1" ;;
+ -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;;
+ -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;;
-Xlinker* ) ;;
* ) [$1]="$[$1] -Xlinker [$]1" ;;
esac
dnl Add site and system specific flags to compile and link commands
dnl ---------------------------------------------------------------
-dnl All dirs present in site-prefixes will be searched for include/ and lib/
-dnl subdirs. This can avoid specifying both site-includes and site-libraries.
-dnl Those dirs will take precedence over the standard places, but not over
-dnl site-includes and site-libraries.
-
-dnl --site-prefixes (multiple dirs)
-if test -n "$site_prefixes"; then
- for arg in $site_prefixes; do
- case "$arg" in
- -* ) ;;
- * ) argi="-I${arg}/include" ; argl="-L${arg}/lib" ;;
- esac
- XE_APPEND($argi, c_switch_site)
- XE_APPEND($argl, ld_switch_site)
- done
-fi
+dnl Allow use of either ":" or spaces for lists of directories
+define(COLON_TO_SPACE,
+ [case "$[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's/^ //' -e 's/:/ /g'`";; esac])dnl
dnl --site-libraries (multiple dirs)
+COLON_TO_SPACE(site_libraries)
if test -n "$site_libraries"; then
for arg in $site_libraries; do
- case "$arg" in -* ) ;; * ) arg="-L${arg}" ;; esac
+ case "$arg" in
+ -* ) ;;
+ * ) test -d "$arg" || \
+ XE_DIE("Invalid site library \`$arg': no such directory")
+ arg="-L${arg}" ;;
+ esac
XE_APPEND($arg, ld_switch_site)
done
fi
dnl --site-includes (multiple dirs)
+COLON_TO_SPACE(site_includes)
if test -n "$site_includes"; then
for arg in $site_includes; do
- case "$arg" in -* ) ;; * ) arg="-I${arg}" ;; esac
+ case "$arg" in
+ -* ) ;;
+ * ) test -d "$arg" || \
+ XE_DIE("Invalid site include \`$arg': no such directory")
+ arg="-I${arg}" ;;
+ esac
XE_APPEND($arg, c_switch_site)
done
fi
+dnl --site-prefixes (multiple dirs)
+dnl --site-prefixes=dir1:dir2 is a convenient shorthand for
+dnl --site-libraries=dir1/lib:dir2/lib --site-includes=dir1/include:dir2/include
+dnl Site prefixes take precedence over the standard places, but not over
+dnl site-includes and site-libraries.
+COLON_TO_SPACE(site_prefixes)
+if test -n "$site_prefixes"; then
+ for dir in $site_prefixes; do
+ inc_dir="${dir}/include"
+ lib_dir="${dir}/lib"
+ if test ! -d "$dir"; then
+ XE_DIE("Invalid site prefix \`$dir': no such directory")
+ elif test ! -d "$inc_dir"; then
+ XE_DIE("Invalid site prefix \`$dir': no such directory \`$inc_dir'")
+ elif test ! -d "$lib_dir"; then
+ XE_DIE("Invalid site prefix \`$dir': no such directory \`$lib_dir'")
+ else
+ XE_APPEND("-I$inc_dir", c_switch_site)
+ XE_APPEND("-L$lib_dir", ld_switch_site)
+ fi
+ done
+fi
+
dnl GNU software installs by default into /usr/local/{include,lib}
dnl if test -d "/usr/local/include" -a -d "/usr/local/lib"; then
dnl XE_APPEND("-L/usr/local/lib", ld_switch_site)
done
dnl --site-runtime-libraries (multiple dirs)
+COLON_TO_SPACE(site_runtime_libraries)
if test -n "$site_runtime_libraries"; then
LD_RUN_PATH="`echo $site_runtime_libraries | sed -e 's/ */:/g'`"
export LD_RUN_PATH
dnl checks for header files
AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h)
AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h cygwin/version.h)
-AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h)
+AC_CHECK_HEADERS(kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h)
AC_HEADER_SYS_WAIT
AC_HEADER_STDC
AC_HEADER_TIME
test "$with_dialogs" != "no" && with_dialogs=msw \
&& XE_ADD_OBJS(dialog-msw.o)
else
- test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
+ test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o)
test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o)
- test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-msw.o)
+ test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-msw.o)
fi
- dnl check for our special version of select
+ dnl check for our special version of select
AC_TRY_RUN([#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }],
[AC_DEFINE(HAVE_MSG_SELECT)])
with_file_coding=yes
use_minimal_tagbits=yes
use_indexed_lrecord_implementation=yes
- XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o)
+ XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o)
fi
fi
fi
dnl Always compile OffiX unless --without-offix is given, no
-dnl X11 support is compiled in, no standard Xmu is avaiable,
+dnl X11 support is compiled in, no standard Xmu is available,
dnl or dragndrop support is disabled
dnl Because OffiX support currently loses when more than one display
dnl is in use, we now disable it by default -slb 07/10/1998.
test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o)
test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o)
test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o)
-test "$all_widgets" != "no no no no" && XE_ADD_OBJS(gui.o)
if test "$with_x11" = "yes"; then
test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
XE_ADD_OBJS(nas.o)
XE_PREPEND(-laudio, libs_x)
dnl If the nas library does not contain the error jump point,
- dnl then we force safer behaviour.
+ dnl then we force safer behavior.
AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[AC_DEFINE(NAS_NO_ERROR_JUMP)])
esac
test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o)
dnl Database support
-dnl <mdiers@logware.de>
dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support.
dnl On FreeBSD, both DB and DBM are part of libc.
-dnl Note that unless support for DB/(G)DBM is explicitly disabled, we always
-dnl want to check for libdb/lib(g)dbm. Also note that libc will not be
-dnl checked if we have the libraries.
-dnl If support for DB/(G)DBM is requested, but we neither have libdb/lib(g)dbm,
-dnl nor does libc implement it, we are a bit lost :)
-
-AC_CHECKING(for database support)
+dnl By default, we check for DBM support in libgdbm, then libc, then libdbm.
+
+test "$with_database_gnudbm $with_database_dbm $with_database_berkdb" \
+ != "no no no" && AC_CHECKING(for database support)
+
+dnl Check for ndbm.h, required for either kind of DBM support.
+if test "$with_database_gnudbm $with_database_dbm" != "no no"; then
+ AC_CHECK_HEADER(ndbm.h, [:], [
+ test "$with_database_gnudbm" = "yes" -o \
+ "$with_database_dbm" = "yes" && \
+ XE_DIE("Required DBM support cannot be provided.")
+ with_database_gnudbm=no with_database_dbm=no])
+fi
+dnl Check for DBM support in libgdbm.
if test "$with_database_gnudbm" != "no"; then
- AC_CHECK_HEADERS(ndbm.h, have_ndbm_h=yes)
- if test "$have_ndbm_h" = "yes"; then
- AC_CHECK_LIB(gdbm, dbm_open, with_database_gnudbm=yes have_libgdbm=yes)
- fi
- if test "$with_database_gnudbm" != "yes"; then
- AC_CHECK_FUNC(dbm_open, with_database_gnudbm=yes)
- fi
- if test "$with_database_gnudbm" = "yes"; then
- AC_DEFINE(HAVE_DBM)
- test "$have_libgdbm" = "yes" && XE_PREPEND(-lgdbm, LIBS)
- with_database_dbm=no
- else with_database_gnudbm=no
- fi
+ AC_CHECK_LIB(gdbm, dbm_open, [
+ with_database_gnudbm=yes with_database_dbm=no libdbm=-lgdbm], [
+ if test "$with_database_gnudbm" = "yes"; then
+ XE_DIE("Required GNU DBM support cannot be provided.")
+ fi
+ with_database_gnudbm=no])
fi
+dnl Check for DBM support in libc and libdbm.
if test "$with_database_dbm" != "no"; then
- AC_CHECK_FUNC(dbm_open, with_database_dbm=yes need_libdbm=no)
- if test "$need_libdbm" != "no"; then
- AC_CHECK_LIB(dbm, dbm_open, with_database_dbm=yes need_libdbm=yes)
- fi
- if test "$with_database_dbm" = "yes"; then
- AC_DEFINE(HAVE_DBM)
- test "$need_libdbm" = "yes" && XE_PREPEND(-ldbm, LIBS)
- else with_database_dbm=no
- fi
+ AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [
+ AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [
+ test "$with_database_dbm" = "yes" && \
+ XE_DIE("Required DBM support cannot be provided.")
+ with_database_dbm=no])])
fi
+dnl Tell make about the DBM support we detected.
+test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS)
+test "$with_database_gnudbm" = "yes" -o \
+ "$with_database_dbm" = "yes" && \
+ AC_DEFINE(HAVE_DBM)
+
+dnl Check for Berkeley DB.
if test "$with_database_berkdb" != "no"; then
AC_MSG_CHECKING(for Berkeley db.h)
for path in "db/db.h" "db.h"; do
dnl Compute lists of Makefiles and subdirs
AC_SUBST(SRC_SUBDIR_DEPS)
XE_APPEND(src, MAKE_SUBDIR)
-internal_makefile_list="Makefile"
+internal_makefile_list="Makefile.in"
SUBDIR_MAKEFILES=''
test -d lock || mkdir lock
for dir in $MAKE_SUBDIR; do
done ) ;;
* ) test -d "$dir" || mkdir "$dir" ;;
esac
- XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile)
+ XE_SPACE(SUBDIR_MAKEFILES, $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile)
XE_SPACE(internal_makefile_list, $internal_makefile_list $dir/Makefile.in)
done
AC_SUBST(INSTALL_ARCH_DEP_SUBDIR)
AC_SUBST(RANLIB)
AC_SUBST(dynodump_arch)
-# The default is yes
+dnl Preliminary support for using a different compiler for xemacs itself.
+dnl Useful for building XEmacs with a C++ or 64-bit compiler.
+: ${XEMACS_CC:=$CC}
+AC_SUBST(XEMACS_CC)
+
+
+dnl The default is yes
if test "$with_site_lisp" = "no"; then
AC_DEFINE(INHIBIT_SITE_LISP)
fi
test "$with_i18n3" = "yes" && AC_DEFINE(I18N3)
test "$GCC" = "yes" && AC_DEFINE(USE_GCC)
test "$external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
-test "$with_gnu_make" = "yes" && AC_DEFINE(USE_GNU_MAKE)
test "$no_doc_file" = "yes" && AC_DEFINE(NO_DOC_FILE)
dnl test "$const_is_losing" = "yes" && AC_DEFINE(CONST_IS_LOSING)
+test "$with_purify" = "yes" && AC_DEFINE(PURIFY)
test "$with_quantify" = "yes" && AC_DEFINE(QUANTIFY)
test "$with_pop" = "yes" && AC_DEFINE(MAIL_USE_POP)
test "$with_kerberos" = "yes" && AC_DEFINE(KERBEROS)
native ) echo " Compiling in native sound support." ;;
both ) echo " Compiling in both network and native sound support." ;;
esac
-test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously"
+test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously."
test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley DB."
test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
test "$with_clash_detection" = yes && \
echo " Clash detection will use \"$lockdir\" for locking files."
echo " movemail will use \"$mail_locking\" for locking mail spool files."
-test "$with_pop" = yes && echo " Using POP for mail access"
-test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication"
-test "$with_hesiod" = yes && echo " Using Hesiod to get POP server host"
+test "$with_pop" = yes && echo " Using POP for mail access."
+test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication."
+test "$with_hesiod" = yes && echo " Using Hesiod to get POP server host."
test "$use_union_type" = yes && echo " Using the union type for Lisp_Objects."
test "$use_minimal_tagbits" = yes && echo " Using Lisp_Objects with minimal tagbits."
test "$use_indexed_lrecord_implementation" = yes && echo " Using indexed lrecord implementation."
dnl -----------------------------------
dnl Now generate config.h and Makefiles
dnl -----------------------------------
-
dnl This has to be called in order for this variable to get into config.status
AC_SUBST(internal_makefile_list)
# Remove any trailing slashes in these variables.
ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
AC_OUTPUT($ac_output_files,
-[for dir in $MAKE_SUBDIR; do
- echo creating $dir/Makefile
+[for dir in . $MAKE_SUBDIR; do
(
-changequote(<<, >>)dnl
cd $dir
rm -f junk.c
< Makefile.in \
sed -e '/^# Generated/d' \
-e 's%/\*\*/#.*%%' \
-e 's/^ *# */#/' \
+dnl Delete Makefile.in.in comment lines
-e '/^##/d' \
+dnl Pass through CPP directives unchanged
-e '/^#/ {
p
d
-}' -e '/./ {
-s/\([\"]\)/\\\1/g
+}' \
+dnl Quote other lines to protect from CPP substitution
+ -e '/./ {
+s/\([[\"]]\)/\\\1/g
s/^/"/
s/$/"/
}' > junk.c;
- $CPP -I. -I${top_srcdir}/src $CPPFLAGS junk.c > junk.cpp;
- < junk.cpp \
- sed -e 's/^#.*//' \
- -e 's/^[ TAB][ TAB]*$//' \
- -e 's/^ /TAB/' \
- | sed -n -e '/^..*$/p' \
- | sed '/^"/ {
-s/\\\([\"]\)/\1/g
-s/^[ TAB]*"//
-s/"[ TAB]*$//
-}' > Makefile.new
+
+dnl Create a GNUmakefile and Makefile from Makefile.in.
+
+changequote(<<,>>)dnl
+dnl CPP_MAKEFILE(CPPFLAGS,filename)
+define(<<CPP_MAKEFILE>>,
+echo creating $dir/<<$2>>
+$CPP -I. -I${top_srcdir}/src <<$1>> junk.c \
+dnl Delete line directives inserted by $CPP
+ | sed -e 's/^\#.*//' \
+dnl Delete spurious blanks inserted by $CPP
+ -e 's/^[ TAB][ TAB]*$//'\
+ -e 's/^ /TAB/' \
+dnl Delete blank lines
+ | sed -n -e '/^..*$/p' \
+dnl Restore lines quoted above to original contents.
+ | sed '/^\"/ {
+ s/\\\([\"]\)/\1/g
+ s/^[ TAB]*\"//
+ s/\"[ TAB]*$//
+}' > Makefile.new
chmod 444 Makefile.new
- mv -f Makefile.new Makefile
- rm -f junk.c junk.cpp
-changequote([, ])dnl
-)
+ mv -f Makefile.new <<$2>>
+)dnl CPP_MAKEFILE
+
+ CPP_MAKEFILE(,Makefile)
+ CPP_MAKEFILE(-DUSE_GNU_MAKE,GNUmakefile)
+changequote([,])dnl
+ rm -f junk.c
+ )
done
dnl Append AC_DEFINE information to lib-src/config.values
],
[CPP="$CPP"
- CPPFLAGS="$CPPFLAGS"
top_srcdir="$srcdir"
MAKE_SUBDIR="$MAKE_SUBDIR"
-])
+])dnl