diff --git a/config.jam.in b/config.jam.in new file mode 100644 index 0000000..7383388 --- /dev/null +++ b/config.jam.in @@ -0,0 +1,82 @@ +# +# $Id$ +# +# Part of Equinox Desktop Environment (EDE). +# Copyright (c) 2000-2007 EDE Authors. +# +# This program is licensed under terms of the +# GNU General Public License version 2 or newer. +# See COPYING for details. + +# directories +prefix ?= "@prefix@" ; +exec_prefix ?= "@exec_prefix@" ; +datarootdir ?= "@datarootdir@" ; +bindir ?= "@bindir@" ; +datadir ?= "@datadir@" ; +docdir ?= "@datadir@/doc" ; +includedir ?= "@includedir@" ; +libdir ?= "@libdir@" ; +mandir ?= "@mandir@" ; +srcdir ?= "@abs_srcdir@" ; +sysconfdir ?= "@sysconfdir@" ; + +# tools used by jam rules +XGETTEXT ?= @XGETTEXT@ ; +MSGFMT ?= @MSGFMT@ ; +RMDIR_UNSAFE ?= $(RM) -Rf ; +RMDIR_SAFE ?= rmdir ; +CP ?= cp ; +COPYDIR ?= "cp -R" ; +MV ?= mv ; +MKDIRS ?= "mkdir -p" ; +LINKCMD ?= "ln -s" ; + +# directories used by build system +PREFIX ?= "$(prefix)" ; +EDEBINDIR ?= "$(bindir)" ; +EDECONFIGDIR ?= "$(datadir)/config" ; +EDEICONDIR ?= "$(datadir)/icons" ; +EDEDESKTOPDIR ?= "$(datadir)/desktop" ; +EDEMIMEDIR ?= "$(datadir)/mime" ; +EDEDOCDIR ?= "$(docdir)/ede-2.0.0" ; + +EDE_VERSION ?= "@EDE_VERSION@" ; + +OPTIMFLAGS ?= @EDE_OPTIM_FLAGS@ ; +DEBUGFLAGS ?= @EDE_DEBUG_FLAGS@ ; + +# global flags used to be passed to every target +GLOBALFLAGS ?= -Wall -pedantic -I$(TOP) $(OPTIMFLAGS) $(DEBUGFLAGS) ; +STDLIB ?= -lstdc++ ; + +# Note that REMOVE_UNUSED_DEPENDENCIES_TRICK _does not_ works when +# edelib is compiled as shared library +REMOVE_UNUSED_DEPENDENCIES_TRICK = 1 ; + +# edelib libraries path +EDELIBINCLUDE ?= @EDELIB_CFLAGS@ ; +EDELIBLIB ?= @EDELIB_LIBS@ ; +EDELIB_DBUS_INCLUDE ?= @EDELIB_DBUS_CFLAGS@ ; +EDELIB_DBUS_LIB ?= @EDELIB_DBUS_LIBS@ ; + +# fltk libraries path +FLTKINCLUDE ?= @FLTK_CFLAGS@ ; +FLTKLIB ?= @FLTK_LIBS@ ; +FLTKLIB_NOIMAGES ?= @FLTK_LIBS_NOIMAGES@ ; + +# backward; efltk libraries path +EFLTKINCLUDE ?= @EFLTK_CFLAGS@ ; +EFLTKLIB ?= @EFLTK_LIBS@ ; +EFLTKLIB_NOIMAGES ?= @EFLTK_LIBS_NOIMAGES@ ; + +# Xcomposite +COMPOSITEINCLUDE ?= @COMPOSITE_CFLAGS@ ; +COMPOSITELIB ?= @COMPOSITE_LIBS@ ; + +# HAL +HALINCLUDE ?= @HAL_CFLAGS@ +HALLIB ?= @HAL_LIBS@ + +# do not touch this +JAMCONFIG_READ = "yes" ; diff --git a/configure.in b/configure.in index ebd1d09..c757e7e 100644 --- a/configure.in +++ b/configure.in @@ -2,110 +2,138 @@ dnl dnl $Id: configure.in 1719 2006-08-15 08:56:42Z karijes $ dnl dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. +dnl Copyright (c) 2000-2008 EDE Authors. dnl dnl This program is licenced under terms of the dnl GNU General Public Licence version 2 or newer. dnl See COPYING for details. -dnl If edeconf.h.in missing, parse this file with autoheader -dnl or run './prepare'. +m4_define([ede_major_version], [2]) +m4_define([ede_minor_version], [0]) +m4_define([ede_patch_version], [0]) +m4_define([ede_version_short], [200]) +m4_define([ede_version], [ede_major_version.ede_minor_version.ede_patch_version]) -AC_PREREQ(2.16) -AC_INIT(EDE, 2.0.0 alpha, [karijes@users.sourceforge.net]) -AC_DEFINE(VERSION, 200, [Short version number]) - -dnl dummy real file from source, so older autoconf versions -dnl does not require creating EDE file in source root +AC_PREREQ(2.13) +AC_INIT(edewm, ede_version, [karijes@users.sourceforge.net]) AC_CONFIG_SRCDIR(COPYING) - AC_CONFIG_HEADER(edeconf.h:edeconf.h.in) -dnl $PACKAGE_VERSION is filled from AC_INIT +dnl PACKAGE_VERSION is filled from AC_INIT EDE_VERSION=$PACKAGE_VERSION if test "$prefix" = NONE; then - INSTALL_DIR="/usr/local" + EDE_INSTALL_DIR="/usr/local" else - INSTALL_DIR="$prefix" + EDE_INSTALL_DIR="$prefix" fi -AC_DEFINE_UNQUOTED(PREFIX, "$INSTALL_DIR", [Default installation place. Overwrite if you like.]) +AC_DEFINE_UNQUOTED(PREFIX, "$EDE_INSTALL_DIR", [Default installation place]) -SOURCE_DIR="`pwd`" -OPTIMFLAGS="-O2" -DEBUGFLAGS="" +PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/ede/lib/pkgconfig" + +EDE_OPTIM_FLAGS="" +EDE_DEBUG_FLAGS="" + +AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [turn on debugging support (default=no)]),, enable_debug=no) +AC_ARG_ENABLE(profile, AC_HELP_STRING([--enable-profile], [turn on profiling support (default=no)]),, enable_profile=no) +AC_ARG_ENABLE(shape, AC_HELP_STRING([--enable-shape], [enable XShape extension (default=yes)]),, enable_shape=yes) +AC_ARG_ENABLE(composite, AC_HELP_STRING([--enable-composite], [enable XComposite extension (default=yes)]),, enable_composite=yes) +AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL usage (default=yes)]),, enable_hal=yes) AC_PROG_CXX AC_PROG_CPP +EDE_PROG_JAM + AC_PATH_PROG(MSGFMT, msgfmt) AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(DOXYGEN, doxygen) -dnl sh/gdb is used by elauncher AC_PATH_PROG(GDB, gdb) -AC_PATH_PROG(SH, sh) +AC_PATH_PROG(PYTHON, python) -EDE_PROG_JAM() +AC_PATH_X +AC_PATH_XTRA -dnl basic headers AC_HEADER_STDC -dnl TODO: it would be nice if we could pass parameter -dnl for custom STL implementation (via STDLIB var), and -dnl test be linked against it -EDE_CHECK_STL() -AC_CHECK_HEADER(dirent.h, AC_DEFINE(HAVE_DIRENT_H, 1, [Define to 1 if you have dirent.h])) -AC_CHECK_HEADER(ndir.h, AC_DEFINE(HAVE_NDIR_H, 1, [Define to 1 if you have ndir.h])) -AC_CHECK_HEADER(sys/dir.h, AC_DEFINE(HAVE_SYS_DIR_H, 1, [Define to 1 if you have sys/dir.h])) -AC_CHECK_HEADER(sys/ndir.h, AC_DEFINE(HAVE_SYS_NDIR_H, 1, [Define to 1 if you have sys/ndir.h])) +if test "$enable_profile" = "yes"; then + enable_debug=yes +fi -dnl functions and headers used by pty.h -AC_CHECK_FUNCS(grantpt, AC_DEFINE(HAVE_GRANTPT, 1, [Define to 1 if you have grantpt() in stdlib.h])) -AC_CHECK_FUNCS(ptsname, AC_DEFINE(HAVE_PTSNAME, 1, [Define to 1 if you have ptsname() in stdlib.h])) -AC_CHECK_FUNCS(unlockpt, AC_DEFINE(HAVE_PTSNAME, 1, [Define to 1 if you have unlockpt() in stdlib.h])) -AC_CHECK_FUNCS(_getpty, AC_DEFINE(HAVE__GETPTY, 1, [Define to 1 if you have _getpty()])) -AC_CHECK_HEADER(pty.h, AC_DEFINE(HAVE_PTY_H, 1, [Define to 1 if you have pty.h])) -AC_CHECK_HEADER(libutil.h, AC_DEFINE(HAVE_LIBUTIL_H, 1, [Define to 1 if you have libutil.h])) -AC_CHECK_HEADER(util.h, AC_DEFINE(HAVE_UTIL_H, 1, [Define to 1 if you have util.h])) +if test "$enable_debug" = "yes"; then + EDE_DEBUG_FLAGS="$EDE_DEBUG_FLAGS -g3 -D_DEBUG -DDEBUG" + EDE_OPTIM_FLAGS="" +fi -EDE_CHECK_TIME_FUNCS() +if test "$enable_profile" = "yes"; then + EDE_DEBUG_FLAGS="$EDE_DEBUG_FLAGS -pg" +fi -EDE_CHECK_X11() +if test "$enable_shape" = "yes"; then + AC_CHECK_HEADER(X11/extensions/shape.h, [have_xshape_h=yes],) -dnl --enable-debug and --enable-profile options -EDE_DEVELOPMENT() + if test "$have_xshape_h" = "yes"; then + AC_CHECK_LIB(Xext, XShapeInputSelected, [have_xshape=yes],,$X_LIBS) + fi -dnl --enable-shape option -EDE_X11_SHAPE() + if test "$have_xshape" = "yes"; then + AC_DEFINE(HAVE_SHAPE, 1, [Define to 1 if you have XShape extension]) + fi +fi -dnl set FLTKFLAGS, FLTKLIBS -EDE_CHECK_FLTK() -dnl set EFLTKFLAGS, EFLTKLIBS -EDE_CHECK_EFLTK() +if test "$enable_composite" = "yes"; then + PKG_CHECK_MODULES(COMPOSITE, [xcomposite, xdamage, xext], [have_xcomposite=yes],) -EDE_CHECK_LIBMAGIC() + if test "$have_xcomposite" = "yes"; then + AC_DEFINE(HAVE_COMPOSITE, 1, [Define to 1 if you have Xcomposite extension]) + fi +fi -dnl sound stuff -EDE_CHECK_ALSA() -dnl --enable-sound option -dnl set SOUNDFLAGS, SOUNDLIBS -EDE_SOUND() +if test "$enable_hal" = "yes"; then + PKG_CHECK_MODULES(HAL, [hal, hal-storage], [have_hal=yes],) -EDE_INIT_JAM() -AC_SUBST(SOURCE_DIR) -AC_SUBST(OPTIMFLAGS) -AC_SUBST(DEBUGFLAGS) -AC_SUBST(FLTKFLAGS) -AC_SUBST(FLTKLIBS) -AC_SUBST(EFLTKFLAGS) -AC_SUBST(EFLTKLIBS) -AC_SUBST(SOUNDFLAGS) -AC_SUBST(SOUNDLIBS) -AC_SUBST(MAKE_EVOLUME) -AC_SUBST(INSTALL_DIR) -AC_SUBST(XGETTEXT) -AC_SUBST(MSGFMT) -AC_SUBST(DOXYGEN) + if test "$have_hal" = "yes"; then + AC_DEFINE(HAVE_HAL, 1, [Define to 1 if you have HAL libraries]) + fi +fi -AC_OUTPUT([ - Jamconfig -]) +PKG_CHECK_MODULES(EDELIB, [edelib],, [have_edelib=no]) +if test "$have_edelib" = "no"; then + AC_MSG_ERROR(edelib not found! You must install it first) +fi + +PKG_CHECK_MODULES(EDELIB_DBUS, [edelib-dbus],, [have_edelib_dbus=no]) +if test "$have_edelib_dbus" = "no"; then + AC_MSG_ERROR(edelib-dbus not found! You must install it first) +fi + +AC_PATH_PROG(FLTK_CONFIG, fltk-config) +if test -n "$FLTK_CONFIG"; then + fltk_version=`$FLTK_CONFIG --version` + + AC_MSG_CHECKING([for FLTK version >= 1.1.7]) + + case "$fltk_version" in ["1.1."[789]]) + AC_MSG_RESULT(yes) + ;; + *) + AC_MSG_ERROR([Looks like you have an older FLTK version ($fltk_version). Required is >= 1.1.7]) + esac + + dnl remove -Wno-non-virtual-dtor from flags + FLTK_CFLAGS=`$FLTK_CONFIG --cxxflags | sed -e 's/-Wno-non-virtual-dtor//'` + dnl remove -lsupc++ so we can chose what to use + FLTK_LIBS_NOIMAGES=`$FLTK_CONFIG --ldflags | sed -e 's/-lsupc++//g'` + FLTK_LIBS=`$FLTK_CONFIG --use-images --ldflags | sed -e 's/-lsupc++//g'` +else + AC_MSG_ERROR([You don't have FLTK installed. To compile EDE, you will need it.]) +fi + +EDE_INIT_JAM + +AC_SUBST(EDE_VERSION) +AC_SUBST(EDE_OPTIM_FLAGS) +AC_SUBST(EDE_DEBUG_FLAGS) +AC_SUBST(FLTK_CFLAGS) +AC_SUBST(FLTK_LIBS) +AC_SUBST(FLTK_LIBS_NOIMAGES) + +AC_OUTPUT([config.jam]) diff --git a/m4/fltk.m4 b/m4/fltk.m4 deleted file mode 100644 index 0c30dcf..0000000 --- a/m4/fltk.m4 +++ /dev/null @@ -1,44 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. -dnl -dnl This program is licenced under terms of the -dnl GNU General Public Licence version 2 or newer. -dnl See COPYING for details. - -AC_DEFUN([EDE_CHECK_FLTK], [ - dnl AC_MSG_NOTICE(whether is fltk 2.0 present) - AC_PATH_PROG(FLTK2_CONFIG, fltk2-config) - if test -n "$FLTK2_CONFIG"; then - FLTKFLAGS=`fltk2-config --cxxflags` - - dnl remove -lsupc++ so we can chose what to use - FLTKLIBS=`fltk2-config --use-images --ldflags | sed -e 's/-lsupc++//g'` - else - AC_MSG_ERROR([You don't have fltk2 installed. To compile EDE, you will need it.]) - fi -]) - - -AC_DEFUN([EDE_CHECK_EFLTK], [ - dnl AC_MSG_NOTICE(whether is efltk present) - AC_PATH_PROG(EFLTK_CONFIG, efltk-config) - if test -n "$EFLTK_CONFIG"; then - EFLTKFLAGS=`efltk-config --cxxflags` - EFLTKLIBS=`efltk-config --use-images --ldflags` - else - AC_MSG_ERROR([You don't have efltk installed. To compile EDE, you will need it.]) - fi - - AC_MSG_CHECKING(efltk version >= 2.0.4) - EFLTK_VERSION="`efltk-config --version`" - case "$EFLTK_VERSION" in ["2.0."[56789]]) - dnl Display 'yes' for efltk version check - AC_MSG_RESULT(yes) - ;; - *) - AC_MSG_ERROR([It seems that you have older efltk version. Required is >= 2.0.4]) - esac -]) diff --git a/m4/initjamfile.m4 b/m4/initjamfile.m4 index cb4c11b..2c16ea5 100644 --- a/m4/initjamfile.m4 +++ b/m4/initjamfile.m4 @@ -8,10 +8,7 @@ dnl Based on code from Autojam (c) Matze Braun # EDE_INIT_JAM # This rule fixes several issues related to autoconf being make centric #---------------------------------------------------------------------------- -AC_DEFUN([EDE_INIT_JAM], - [ - AC_OUTPUT_INSTALLDIRS - AC_FIX_INSTALL]) +AC_DEFUN([EDE_INIT_JAM], [AC_OUTPUT_INSTALLDIRS]) #----------------------------------------------------------------------------- # AC_OUTPUT_INSTALLDIRS @@ -19,12 +16,6 @@ AC_DEFUN([EDE_INIT_JAM], # properties in the Jamconfig file for them. We deal with stuff like # variable references inside the paths (often the paths contain ${prefix}) # and with correct quoting here. -# The script will set the INSTALLDIR.PREFIX, INSTALLDIR.EXEC_PREFIX, -# INSTALLDIR.APPLICATION, INSTALLDIR.SBIN, INSTALLDIR.LIBEXEC, -# INSTALLDIR.DATA, INSTALLDIR.MAP, INSTALLDIR.CONFIG, INSTALLDIR.SHAREDSTATE -# INSTALLDIR.LOCALSTATE, INSTALLDIR.PLUGIN, INSTALLDIR.DOC -# INSTALLDIR.LIBRARY, INSTALLDIR.INCLUDE, INSTALLDIR.OLDINCLUDE, -# INSTALLDIR.INFO, INSTALLDIR.MAN #----------------------------------------------------------------------------- AC_DEFUN([AC_OUTPUT_INSTALLDIRS],[ # Handle the case when no prefix is given. And the special case when a path @@ -41,6 +32,7 @@ exec_prefix=AC_FIX_VARIABLEREF([$exec_prefix]) bindir=AC_FIX_VARIABLEREF([$bindir]) sbindir=AC_FIX_VARIABLEREF([$sbindir]) libexecdir=AC_FIX_VARIABLEREF([$libexecdir]) +datarootdir=AC_FIX_VARIABLEREF([$datarootdir]) datadir=AC_FIX_VARIABLEREF([$datadir]) sysconfdir=AC_FIX_VARIABLEREF([$sysconfdir]) sharedstatedir=AC_FIX_VARIABLEREF([$sharedstatedir]) @@ -69,25 +61,7 @@ AC_SUBST(mandir) ]) #----------------------------------------------------------------------------- -# AC_FIX_INSTALL -# Fixes the output from AC_PROG_INSTALL -#----------------------------------------------------------------------------- -AC_DEFUN([AC_FIX_INSTALL], [ -AC_REQUIRE([AC_PROG_INSTALL]) -INSTALL=AC_FIX_VARIABLEREF([$INSTALL]) -INSTALL_PROGRAM=AC_FIX_VARIABLEREF([$INSTALL_PROGRAM]) -INSTALL_SCRIPT=AC_FIX_VARIABLEREF([$INSTALL_SCRIPT]) -INSTALL_DATA=AC_FIX_VARIABLEREF([$INSTALL_DATA]) - -# fix for order... -AC_SUBST([INSTALL]) -AC_SUBST([INSTALL_PROGRAM]) -AC_SUBST([INSTALL_SCRIPT]) -AC_SUBST([INSTALL_DATA]) -]) - -#----------------------------------------------------------------------------- -# AC_PREPARE_INSTALLPATH +# AC_FIX_VARIABLEREF # Transform variables of the form ${bla} to $(bla) inside the string and # correctly quotes backslashes. # This is needed if you want to output some of the paths that autoconf diff --git a/m4/libmagic.m4 b/m4/libmagic.m4 deleted file mode 100644 index 68a4593..0000000 --- a/m4/libmagic.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. -dnl -dnl This program is licenced under terms of the -dnl GNU General Public Licence version 2 or newer. -dnl See COPYING for details. - -dnl Check for presence of libmagic, since is used for mime types -dnl Note that libmagic requires libz to be linked against in this test -AC_DEFUN([EDE_CHECK_LIBMAGIC], [ - AC_CHECK_HEADER(magic.h, [ - AC_CHECK_LIB(magic, magic_open, AC_DEFINE(HAVE_LIBMAGIC, 1, [Define to 1 if you have libmagic library]),, - -lz) - ]) -]) diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 0000000..62193b0 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,57 @@ + +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic + $1_LIBS="`$PKG_CONFIG --libs-only-L \"$2\"` `$PKG_CONFIG --libs-only-l \"$2\"`" + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) diff --git a/m4/sound.m4 b/m4/sound.m4 deleted file mode 100644 index 08e39ab..0000000 --- a/m4/sound.m4 +++ /dev/null @@ -1,59 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. -dnl -dnl This program is licenced under terms of the -dnl GNU General Public Licence version 2 or newer. -dnl See COPYING for details. - -dnl Enable sound param and check for facility -dnl For now only .ogg via libao -AC_DEFUN([EDE_SOUND], [ - - AC_ARG_ENABLE(sounds, [ --enable-sounds enable sounds (default=yes)],, enable_sounds=yes) - - if eval "test $enable_sounds = yes"; then - AC_CHECK_HEADER(ao/ao.h, [have_ao_h=yes], [have_ao_h=no]) - AC_CHECK_LIB(ao, ao_is_big_endian, [have_ao_lib=yes], [have_ao_lib=no]) - - AC_CHECK_HEADER(vorbis/codec.h, [have_codec_h=yes], [have_codec_h=no]) - AC_CHECK_LIB(vorbis, vorbis_info_init, [have_vorbis_lib=yes], [have_vorbis_lib=no]) - - AC_CHECK_HEADER(vorbis/vorbisfile.h, [have_vorbisfile_h=yes], [have_vorbisfile_h=no]) - AC_CHECK_LIB(vorbisfile, ov_clear, [have_vorbisfile_lib=yes], [have_vorbisfile_lib=no]) - - AC_MSG_CHECKING(sound support) - if eval "test $have_ao_h = yes" && \ - eval "test $have_codec_h = yes" && \ - eval "test $have_vorbisfile_h = yes"; then - AC_MSG_RESULT(ok) - SOUNDFLAGS="-DSOUND" - SOUNDLIBS="-lao -lvorbis -lvorbisfile" - else - AC_MSG_RESULT(disabled) - fi - fi -]) - -dnl Check if we have alsa installed since evolume rely on it -dnl Here are two parameters that are set: -dnl - HAVE_ALSA used in edeconf.h -dnl - MAKE_EVOLUME used by jam -AC_DEFUN([EDE_CHECK_ALSA], [ - AC_CHECK_HEADER(linux/soundcard.h, AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if you have alsa libraries])) - - if eval "test $ac_cv_header_linux_soundcard_h = yes"; then - MAKE_EVOLUME="1" - else - echo - echo "***************************************" - echo "* ALSA WAS NOT FOUND *" - echo "* *" - echo "* Sadly, evolume is ALSA-only at this *" - echo "* moment. It will be disabled. *" - echo "***************************************" - MAKE_EVOLUME="0" - fi -]) diff --git a/m4/time.m4 b/m4/time.m4 deleted file mode 100644 index abd706b..0000000 --- a/m4/time.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. -dnl -dnl This program is licenced under terms of the -dnl GNU General Public Licence version 2 or newer. -dnl See COPYING for details. - -dnl Check for time functions since they are -dnl different between systems -AC_DEFUN([EDE_CHECK_TIME_FUNCS], [ - dnl glibc extension, not present on BSD's - AC_CHECK_HEADER(time.h, [ - AC_CHECK_FUNCS(stime, AC_DEFINE(HAVE_STIME, 1, [Define to 1 if you have stime() in time.h])) - ]) - - dnl rest should have this - AC_CHECK_HEADER(sys/time.h, [ - AC_CHECK_FUNCS(gettimeofday, AC_DEFINE(HAVE_GETTIMEOFDAY, 1, [Define to 1 if you have gettimeofday() in sys/time.h])) - AC_CHECK_FUNCS(settimeofday, AC_DEFINE(HAVE_SETTIMEOFDAY, 1, [Define to 1 if you have settimeofday() in sys/time.h])) - ]) -]) diff --git a/m4/various.m4 b/m4/various.m4 deleted file mode 100644 index 9e92d70..0000000 --- a/m4/various.m4 +++ /dev/null @@ -1,52 +0,0 @@ -dnl -dnl $Id$ -dnl -dnl Part of Equinox Desktop Environment (EDE). -dnl Copyright (c) 2000-2007 EDE Authors. -dnl -dnl This program is licenced under terms of the -dnl GNU General Public Licence version 2 or newer. -dnl See COPYING for details. - -dnl --enable-debug and --enable-profile options -AC_DEFUN([EDE_DEVELOPMENT], [ - dnl clear all optimization flags - OPTIMFLAGS="" - - AC_ARG_ENABLE(debug, [ --enable-debug enable debug (default=no)],,enable_debug=no) - if eval "test $enable_debug = yes"; then - DEBUGFLAGS="$DEBUGFLAGS -g3" - fi - - AC_ARG_ENABLE(profile, [ --enable-profile enable profile (default=no)],,enable_profile=no) - if eval "test $enable_profile = yes"; then - DEBUGFLAGS="$DEBUGFLAGS -pg" - fi - - AC_ARG_ENABLE(pedantic, [ --enable-pedantic enable pedantic (default=no)],,enable_pedantic=no) - if eval "test $enable_pedantic = yes"; then - DEBUGFLAGS="$DEBUGFLAGS -pedantic" - fi -]) - -dnl Some distributions split packages between STL runtime -dnl and development versions; this will ensure we have development packages -dnl Code is based on AC_CXX_HAVE_STL from Todd Veldhuizen and Luc Maisonobe -AC_DEFUN([EDE_CHECK_STL], [ - AC_MSG_CHECKING(for reasonable STL support) - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE([ - #include - #include - using namespace std; - ],[ - list x; x.push_back(5); - list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0; - ], ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) - - if eval "test $ac_cv_cxx_have_stl = no"; then - AC_MSG_ERROR(You don't have STL (C++ standard library) packages installed, or your version of compiler is too old. Please fix this first) - else - AC_MSG_RESULT(yes) - fi -])