## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'.
HAVE_XFT=maybe
-if test "x${with_freetype}" = "xno"; then
+if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then
with_xft="no";
fi
if test "x${with_xft}" != "xno"; then
dnl As we use Xft, we anyway use freetype.
dnl In this case, there's no need of additional CFLAGS and LIBS.
HAVE_FREETYPE=yes
-elif test "x${with_freetype}" != "xno"; then
+elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then
PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no)
if test "${HAVE_FREETYPE}" = "yes"; then
AC_SUBST(ns_appresdir)
AC_SUBST(ns_appsrc)
AC_SUBST(GNUSTEP_MAKEFILES)
+AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
+AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
AC_SUBST(GNU_OBJC_CFLAGS)
AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
#define INLINE
#endif
+/* `subprocesses' should be defined if you want to
+ have code for asynchronous subprocesses
+ (as used in M-x compile and M-x shell).
+ Only MSDOS does not support this (it overrides
+ this in its config_opsysfile below). */
+
+#define subprocesses
+
/* Include the os and machine dependent files. */
#include config_opsysfile
#include config_machfile
#define OTHER_FILES ns-app
# ifdef NS_IMPL_GNUSTEP
/* See also .m.o rule in Makefile.in */
+/* FIXME: are all these flags really needed? Document here why. */
# define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
+/* GNUstep needs a bit more pure memory. Of the existing knobs,
+SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */
+# define SYSTEM_PURESIZE_EXTRA 30000
# endif /* NS_IMPL_GNUSTEP */
#endif /* HAVE_NS */
-/* `subprocesses' should be defined if you want to
- have code for asynchronous subprocesses
- (as used in M-x compile and M-x shell).
- Only MSDOS does not support this. */
-
-#define subprocesses
-
/* SIGTYPE is the macro we actually use. */
#ifndef SIGTYPE
#define SIGTYPE RETSIGTYPE
echo " Does Emacs use -lotf? ${HAVE_LIBOTF}"
echo " Does Emacs use -lxft? ${HAVE_XFT}"
-echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
+echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
if test $USE_XASSERTS = yes; then