[all], [all], [dnl
OG_MULTIARG_ITEM([ase], [ase], [algebraic structures])
OG_MULTIARG_ITEM([cl], [cl], [fast Common Lisp implementation])
+ OG_MULTIARG_ITEM([dbus], [dbus], [D-BUS bindings])
])
OG_MULTIARG_WITH([static-modules], [dnl
[none], [NONE], [dnl
OG_MULTIARG_ITEM([ase], [ase], [algebraic structures])
OG_MULTIARG_ITEM([cl], [cl], [fast Common Lisp implementation])
+ OG_MULTIARG_ITEM([dbus], [dbus], [D-BUS bindings])
])
OG_MULTIARG_WITH([ent], [dnl
OG_MULTIARG_WITH([sound], [dnl
AS_HELP_STRING([--with-sound=TYPE],
[Compile with sound support.])],
- [auto], [Autodetect all sound support (except Pulse)], [dnl
+ [auto], [Autodetect all sound support], [dnl
OG_MULTIARG_ITEM([alsa], [ALSA], [kernel-based linux sound standard])
OG_MULTIARG_ITEM([ao], [ao], [generic audio output layer])
OG_MULTIARG_ITEM([esd], [ESD], [Enlightenment Sound Daemon])
OG_MULTIARG_ITEM([jack], [Jack], [a low-latency audio server])
OG_MULTIARG_ITEM([nas], [NAS], [Network Audio System])
OG_MULTIARG_ITEM([oss], [OSS], [Open Sound System])
+ OG_MULTIARG_ITEM([pulse], [PulseAudio], [PulseAudio Sound Server])
])
-OG_ARG_WITH([pulseaudio],
- AS_HELP_STRING([--with-pulseaudio],
- [Compile with support for the PulseAudio audio server.
- This has been turned off by default because of too many
- bugs in recent versions of PA. Use at your own risk,
- YMMV, and all that.]),
- [no], [NO])
-
OG_MULTIARG_WITH([media], [dnl
AS_HELP_STRING([--with-media=TYPE],
[Compile with media stream support.])],
dnl ----------------------------------------------------------------
SXE_CHECK_BASIC_FUNS
-AC_CHECK_FUNCS([alarm cbrt closedir dup2 eaccess endpwent floor fmod fpathconf frexp fsync ftime ftruncate getaddrinfo getcwd gethostbyname gethostname getnameinfo getpagesize getrlimit gettimeofday getwd isascii link logb lrand48 matherr memchr memmove memset mkdir mktime munmap perror poll pow putenv random re_comp readlink regcomp rename res_init rint rmdir select setitimer setlocale setpgid setsid sigblock sighold sigprocmask snprintf socket sqrt stpcpy strcasecmp strchr strdup strerror strlwr strrchr strspn strtol strupr symlink tzset ulimit umask uname usleep utime vlimit vsnprintf waitpid wcscmp wcslen])
+AC_CHECK_FUNCS([alarm cbrt closedir dup2 eaccess endpwent floor fmod fpathconf frexp fsync ftime ftruncate getaddrinfo getcwd gethostbyname gethostname getnameinfo getpagesize getrlimit gettimeofday getwd isascii isatty link logb lrand48 matherr memchr memmove memset mkdir mktime munmap perror poll pow putenv random re_comp readlink regcomp rename res_init rint rmdir select setitimer setlocale setpgid setsid sigblock sighold sigprocmask snprintf socket sqrt stpcpy strncpy strncat strcasecmp strchr strdup strerror strlwr strrchr strspn strtol strupr symlink ttyname tzset ulimit umask uname usleep utime vlimit vsnprintf waitpid wcscmp wcslen])
+
+AS_IF([test "$have_isatty" = "yes"],
+ AC_DEFINE([HAVE_ISATTY], [1], [isatty is available]))
+AS_IF([test "$have_ttyname" = "yes"],
+ AC_DEFINE([HAVE_TTYNAME], [1], [ttyname is available]))
## combines all these time structures and funs
AC_MSG_WARN([Sorry no bison means no cl module for you.])
fi
fi
+
SXE_EMOD_STATMOD([cl])
+dnl D-Bus
+SXE_CHECK_DBUS
+if test "$have_dbus" = "yes"; then
+ if test "$with_modules_dbus" = "yes"; then
+ have_modules_dbus=yes
+ fi
+ if test "$with_static_modules_dbus" = "yes"; then
+ have_static_modules_dbus=yes
+ fi
+else
+ AC_MSG_WARN([I cannot believe you do not have d-bus.])
+fi
+
+SXE_EMOD_STATMOD([dbus])
+
AM_CONDITIONAL([AUTARKIC], [test "0" = "1"])
MODARCHDIR=
MAKE_DOCFILE="$sxe_blddir/lib-src/make-docfile"
AC_DEFINE_UNQUOTED([CURSES_H_FILE], ["${curses_h_file-curses.h}"], [The curses.h header file])
AC_DEFINE_UNQUOTED([TERMCAP_H_FILE], ["${termcap_h_file-termcap.h}"], [The termcap.h header file])
AC_DEFINE_UNQUOTED([TERM_H_FILE], ["${term_h_file-term.h}"], [The term.h header file])
+])
+AS_IF([test "$with_tty" != "no" -a "$have_tty" != no], [
+ AC_DEFINE([HAVE_TTY], [1], [Include TTY support for SXEmacs])
+ AC_DEFINE([HAVE_UNIXOID_EVENT_LOOP], [1], [Include Unixoid event loop - TTY provided])
+ SXE_ADD_SXEUITTY_OBJS([console-tty.o device-tty.o event-tty.o frame-tty.o objects-tty.o redisplay-tty.o cm.o])
+])
+AS_IF([test "$with_tty" != "no" -a "$have_tty" != no], [
dnl General Purpose Mouse (libgpm) support
AS_IF([test "$with_gpm" != "no"], [
AC_CHECK_HEADER(gpm.h, [
SXE_CHECK_UI_SUFFICIENCY
-AS_IF([test -z "$window_system" -o "$window_system" != "none" ], [
+AS_IF([test -z "$window_system" -o "$window_system" = "none" ], [
dnl It ought to be reasonable to have no output device at all, and only use
dnl SXEmacs in --batch mode.
- AS_IF([test "$with_tty" = "no"],
- AC_MSG_WARN([No window system nor TTY support. You only can use --batch mode.]))
+ AS_IF([test "$have_tty" = "no"],
+ AC_MSG_ERROR([No window system nor TTY support. SXEmacs cannot be compiled.
+Check INSTALL and PROBLEMS files for hints on how to solve.]))
])
## Uncertain options
dnl sox support
if test "$with_media_sox" != "no"; then
- ## defines $LIBST_CONFIG
SXE_MM_CHECK_SOX([have_media_sox=yes], [have_media_sox=no])
AC_MSG_CHECKING([for sufficient SoX support])
fi
dnl PulseAudio Sound support
-if test "$with_pulseaudio" != "no"; then
+if test "$with_sound_pulse" != "no"; then
SXE_MM_CHECK_PULSE([have_sound_pulse=yes], [have_sound_pulse=no])
AC_MSG_CHECKING([for sufficient PulseAudio support])
if test "$have_sound_pulse" = "yes"; then
AC_MSG_RESULT([yes])
- PULSEAUDIO_LIBS=`$PKG_CONFIG --libs libpulse`
- pulse_version=`$PKG_CONFIG --modversion libpulse`
- pulse_major_version=0
- pulse_minor_version=`echo $pulse_version | \
- sed -e "s/0\.\([[0-9]]*\).*/\1/"`
need_internal_media=yes
SXE_ADD_MM_OBJS([sound-pulse.o])
- SXE_PREPEND($PULSEAUDIO_LIBS, MM_LIBS)
+ SXE_PREPEND($PULSE_LIBS, MM_LIBS)
+ SXE_PREPEND_UNDUP($PULSE_CFLAGS, MM_CPPFLAGS)
AC_DEFINE([HAVE_PULSE_SOUND], [1],
[Whether to put in support for PulseAudio.])
- AC_DEFINE_UNQUOTED([PULSE_VERSION], [$pulse_minor_version],
- [Version of the underlying pulse lib.])
else
AC_MSG_RESULT(no)
have_sound_pulse=no
[have_setitimer=$?],[have_setitimer=0])
AM_CONDITIONAL([HAVE_SETITIMER], [test "$have_setitimer" = "1"])
-## whether to build with sheap.o
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
-int main(int c, char *v[])
-{
-#if defined(HEAP_IN_DATA) && !defined(PDUMP)
- return 1;
-#else
- return 0;
-#endif
-}]])], [./conftest; build_sheap=$?],
- [build_sheap=$?],[build_sheap=0])
-AM_CONDITIONAL([BUILD_SHEAP], [test "$build_sheap" = "1"])
-
dnl There are no more compile tests; remove the core they created.
rm -f core