dnl To rebuild the `configure' script from this, execute the command
dnl autoconf
dnl in the directory containing this script. You must have autoconf
-dnl version 1.7 or later.
+dnl version 1.8 or later.
dnl
dnl The following text appears in the resulting `configure' script,
dnl explaining how to rebuild it.
machine=symmetry opsys=bsd4-3
;;
- ## Unspecified sysv on an ncr machine defaults to svr4.
+ ## Unspecified sysv on an ncr machine defaults to svr4.2.
+ ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
i[34]86-ncr-sysv* )
- machine=intel386 opsys=usg5-4
+ machine=intel386 opsys=usg5-4-2
;;
## Intel 860
machine=i860 opsys=usg5-4
;;
- ## Silicon Graphics machines
- ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
- m68*-sgi-iris3.5* )
- machine=irist opsys=iris3-5
- ;;
- m68*-sgi-iris3.6* | m68*-sgi-iris*)
- machine=irist opsys=iris3-6
- ;;
- ## Iris 4D
- mips-sgi-irix3.* )
- machine=iris4d opsys=irix3-3
- ;;
- mips-sgi-irix5.* )
- machine=iris4d opsys=irix5-0
- ;;
- mips-sgi-irix4.* | mips-sgi-irix* )
- machine=iris4d opsys=irix4-0
- ;;
-
## Masscomp machines
m68*-masscomp-rtu* )
machine=masscomp opsys=rtu
machine=sequent opsys=bsd4-3
;;
+ ## Siemens Nixdorf
+ mips-siemens-sysv* )
+ machine=mips-siemens opsys=usg5-4
+ NON_GNU_CC=/usr/ccs/bin/cc
+ NON_GNU_CPP=/usr/ccs/bin/cc -E
+ ;;
+
+ ## Silicon Graphics machines
+ ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
+ m68*-sgi-iris3.5* )
+ machine=irist opsys=iris3-5
+ ;;
+ m68*-sgi-iris3.6* | m68*-sgi-iris*)
+ machine=irist opsys=iris3-6
+ ;;
+ ## Iris 4D
+ mips-sgi-irix3.* )
+ machine=iris4d opsys=irix3-3
+ ;;
+ mips-sgi-irix5.* )
+ machine=iris4d opsys=irix5-0
+ ;;
+ mips-sgi-irix4.* | mips-sgi-irix* )
+ machine=iris4d opsys=irix4-0
+ ;;
+
## SONY machines
m68*-sony-bsd4.2* )
machine=news opsys=bsd4-2
i386-*-sunos4 ) opsys=sunos4-0 ;;
*-sunos4.0* ) opsys=sunos4-0 ;;
*-sunos4.1.3* ) opsys=sunos4-1-3 ;;
+ *-sunos4shr* ) opsys=sunos4shr ;;
*-sunos4* | *-sunos ) opsys=sunos4-1 ;;
*-sunos5.3* | *-solaris2.3* )
opsys=sol2-3
case "${canonical}" in
*-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
*-isc2.2* ) opsys=isc2-2 ;;
+ *-isc4.0* ) opsys=isc4-0 ;;
*-isc* ) opsys=isc3-0 ;;
- *-esix5* ) opsys=esix5r4 ;;
+ *-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
*-esix* ) opsys=esix ;;
*-xenix* ) opsys=xenix ;;
*-linux* ) opsys=linux ;;
*-sco3.2v4* ) opsys=sco4 ;;
*-bsd386* ) opsys=bsd386 ;;
*-386bsd* ) opsys=386bsd ;;
+ *-freebsd* ) opsys=freebsd ;;
*-netbsd* ) opsys=netbsd ;;
*-nextstep* ) opsys=mach2 ;;
## Otherwise, we'll fall through to the generic opsys code at the bottom.
]
AC_PREPARE(lisp)
+ifdef([AC_LANG_C], AC_LANG_C)dnl
AC_CONFIG_HEADER(src/config.h)
[
#### Choose a compiler.
if [ "x$CC" = x ]
-then cc_specified=1
+then true
+else cc_specified=1
fi
case ${with_gcc} in
"yes" ) CC="gcc" GCC=1 ;;
"no" )
if [ "x$CC" = x ]
- then true;
- else CC=cc;
+ then CC=cc;
+ else true;
fi
;;
* )
dnl checks for compiler characteristics
AC_CONST
+dnl check for Make feature
+AC_SET_MAKE
+
dnl checks for operating system services
AC_LONG_FILE_NAMES
;;
no )
window_system=${window_system}none
-esac
-case "${with_x11}" in
- yes )
- window_system=${window_system}x11
;;
esac
-case "${with_x10}" in
- yes )
- window_system=${window_system}x10
+case "${window_system}" in
+ .* )
+ ;;
+ * )
+ case "${with_x11}" in
+ yes )
+ window_system=x11
+ ;;
+ no )
+ window_system=none
+ ;;
+ esac
+ case "${with_x10}" in
+ yes )
+ window_system=x10
+ ;;
+ no )
+ window_system=none
+ ;;
+ esac
;;
esac
echo " Using Open-Look toolkit."
;;
* )
- USE_X_TOOLKIT=no
+ USE_X_TOOLKIT=none
echo " Using Xlib directly."
;;
esac
x10 )
HAVE_X_WINDOWS=yes
HAVE_X11=no
- USE_X_TOOLKIT=no
+ USE_X_TOOLKIT=none
echo " Using X10."
;;
none )
HAVE_X_WINDOWS=no
HAVE_X11=no
+ USE_X_TOOLKIT=none
echo " Using no window system."
;;
esac
#endif
#ifdef __GNUC__
-configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH
+configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${CFLAGS}'
#else
-configure___ CFLAGS=C_DEBUG_SWITCH
+configure___ CFLAGS=C_DEBUG_SWITCH '${CFLAGS}'
#endif
' > ${tempcname}
# The value of CPP is a quoted variable reference, so we need to do this
dnl If found, this defines HAVE_LIBDNET, which m/pmax.h checks,
dnl and also adds -ldnet to LIBS, which Autoconf uses for checks.
AC_HAVE_LIBRARY(-ldnet)
+AC_HAVE_LIBRARY(-lresolv)
AC_HAVE_LIBRARY(-lXbsd, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
[
#### Find out which version of Emacs this is.
version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \
- | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)[."].*$/\1/'`
+ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
if [ x"${version}" = x ]; then
echo "${progname}: can't find current emacs version in
\`${srcdir}/lisp/version.el'." >&2
[
fi
-
#### Specify what sort of things we'll be editing into Makefile and config.h.
### Use configuration here uncanonicalized to avoid exceeding size limits.
]
AC_SUBST(docdir)
AC_SUBST(c_switch_system)
AC_SUBST(c_switch_machine)
-AC_SUBST(libsrc_libs)
AC_SUBST(LD_SWITCH_X_SITE)
AC_SUBST(LD_SWITCH_X_SITE_AUX)
AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(CFLAGS)
AC_SUBST(X_TOOLKIT_TYPE)
+AC_SUBST(machfile)
+AC_SUBST(opsysfile)
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
if [ "${HAVE_X_WINDOWS}" = "yes" ] ; then
] AC_DEFINE(HAVE_X_WINDOWS) [
fi
-if [ "${USE_X_TOOLKIT}" != "no" ] ; then
+if [ "${USE_X_TOOLKIT}" != "none" ] ; then
] AC_DEFINE(USE_X_TOOLKIT) [
fi
if [ "${HAVE_X11}" = "yes" ] ; then
What compiler should emacs be built with? ${CC} ${CFLAGS}
Should Emacs use the GNU version of malloc? ${GNU_MALLOC}${GNU_MALLOC_reason}
Should Emacs use the relocating allocator for buffers? ${REL_ALLOC}
- What window system should Emacs use? ${window_system}${x_includes+
+ What window system should Emacs use? ${window_system}
+ What toolkit should Emacs use? ${USE_X_TOOLKIT}${x_includes+
Where do we find X Windows header files? }${x_includes}${x_libraries+
Where do we find X Windows libraries? }${x_libraries}
test -n "${exec_prefix}" &&
exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
]
-AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [
+AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile lwlib/Makefile src/Makefile.in, [
+
# Build src/Makefile from ${srcdir}/src/Makefile.in. This must be done
# after src/config.h is built, since we rely on that file.
# the C preprocessor to some helpful value like 1, or maybe the empty
# string. Needless to say consequent macro substitutions are less
# than conducive to the makefile finding the correct directory.
-undefs="`echo $top_srcdir $configuration |
-sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/ */ -U/g' \
- -e 's/ -U$//' -e 's/^[^ ]/-U/' \
- -e 's/-U[0-9][^ ]*//g' \
+undefs="`echo $top_srcdir $configuration |
+sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \
+ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \
`"
changequote([,])dnl
+echo creating lib-src/Makefile
+( cd lib-src
+ rm -f junk.c
+ sed -e 's@^# \(Generated.*\)$@/* \1 */@' \
+ -e 's@/\*\*/#\(.*\)$@/* \1 */@' \
+ < Makefile.in > junk.c
+ $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ \f]*$/d' > Makefile.new
+ rm -f junk.c
+ chmod 444 Makefile.new;
+ mv -f Makefile.new Makefile;
+)
+
echo creating src/Makefile
( cd src
rm -f junk.c
-e 's@/\*\*/#\(.*\)$@/* \1 */@' \
< Makefile.in > junk.c
$CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c |
- sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > Makefile.new
+ sed -e 's/^ / /' -e '/^#/d' -e '/^[ \f]*$/d' > Makefile.new
rm -f junk.c
chmod 444 Makefile.new;
mv -f Makefile.new Makefile;