diff options
| -rw-r--r-- | muse2/m4/aclocal-include.m4 | 16 | ||||
| -rw-r--r-- | muse2/m4/alsa.m4 | 148 | ||||
| -rw-r--r-- | muse2/m4/docbook.m4 | 97 | ||||
| -rw-r--r-- | muse2/m4/qt.m4 | 246 |
4 files changed, 0 insertions, 507 deletions
diff --git a/muse2/m4/aclocal-include.m4 b/muse2/m4/aclocal-include.m4 deleted file mode 100644 index abf6533f..00000000 --- a/muse2/m4/aclocal-include.m4 +++ /dev/null @@ -1,16 +0,0 @@ -# aclocal-include.m4 -# -# This macro adds the name macrodir to the set of directories -# that `aclocal' searches for macros. - -# serial 1 - -dnl AM_ACLOCAL_INCLUDE(macrodir) -AC_DEFUN([AM_ACLOCAL_INCLUDE], -[ - AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) - - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - - for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done -]) diff --git a/muse2/m4/alsa.m4 b/muse2/m4/alsa.m4 deleted file mode 100644 index da57ad4f..00000000 --- a/muse2/m4/alsa.m4 +++ /dev/null @@ -1,148 +0,0 @@ -dnl Configure Paths for Alsa -dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org> -dnl Christopher Lansdown <lansdoct@cs.alfred.edu> -dnl Jaroslav Kysela <perex@suse.cz> -dnl Last modification: 07/01/2001 -dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. -dnl enables arguments --with-alsa-prefix= -dnl --with-alsa-enc-prefix= -dnl --disable-alsatest (this has no effect, as yet) -dnl -dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, -dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. -dnl -AC_DEFUN([AM_PATH_ALSA], -[dnl Save the original CFLAGS, LDFLAGS, and LIBS -alsa_save_CFLAGS="$CFLAGS" -alsa_save_LDFLAGS="$LDFLAGS" -alsa_save_LIBS="$LIBS" -alsa_found=yes - -dnl -dnl Get the cflags and libraries for alsa -dnl -AC_ARG_WITH(alsa-prefix, -[ --with-alsa-prefix=PFX prefix where alsa library is installed (optional)], -[alsa_prefix="$withval"], [alsa_prefix=""]) - -AC_ARG_WITH(alsa-inc-prefix, -[ --with-alsa-inc-prefix=PFX prefix where include libraries are (optional)], -[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""]) - -dnl FIXME: this is not yet implemented -AC_ARG_ENABLE(alsatest, -[ --disable-alsatest do not try to compile and run a test alsa program], -[enable_alsatest=no], -[enable_alsatest=yes]) - -dnl Add any special include directories -AC_MSG_CHECKING(for ALSA CFLAGS) -if test "$alsa_inc_prefix" != "" ; then - ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix" - CFLAGS="$CFLAGS -I$alsa_inc_prefix" -fi -AC_MSG_RESULT($ALSA_CFLAGS) - -dnl add any special lib dirs -AC_MSG_CHECKING(for ALSA LDFLAGS) -if test "$alsa_prefix" != "" ; then - ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix" - LDFLAGS="$LDFLAGS $ALSA_LIBS" -fi - -dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl" -LIBS=`echo $LIBS | sed 's/-lm//'` -LIBS=`echo $LIBS | sed 's/-ldl//'` -LIBS=`echo $LIBS | sed 's/ //'` -LIBS="$ALSA_LIBS $LIBS" -AC_MSG_RESULT($ALSA_LIBS) - -dnl Check for a working version of libasound that is of the right version. -min_alsa_version=ifelse([$1], ,0.1.1,$1) -AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version) -no_alsa="" - alsa_min_major_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - alsa_min_minor_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - alsa_min_micro_version=`echo $min_alsa_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILE([ -#include <alsa/asoundlib.h> -], [ -void main(void) -{ -/* ensure backward compatibility */ -#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR) -#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR -#endif -#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR) -#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR -#endif -#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR) -#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR -#endif - -# if(SND_LIB_MAJOR > $alsa_min_major_version) - exit(0); -# else -# if(SND_LIB_MAJOR < $alsa_min_major_version) -# error not present -# endif - -# if(SND_LIB_MINOR > $alsa_min_minor_version) - exit(0); -# else -# if(SND_LIB_MINOR < $alsa_min_minor_version) -# error not present -# endif - -# if(SND_LIB_SUBMINOR < $alsa_min_micro_version) -# error not present -# endif -# endif -# endif -exit(0); -} -], - [AC_MSG_RESULT(found.)], - [AC_MSG_RESULT(not present.) - ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)]) - alsa_found=no] -) -AC_LANG_RESTORE - -dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_CHECK_LIB([asound], [snd_seq_create_event],, - [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) - alsa_found=no] -) -AC_LANG_RESTORE - -if test "x$alsa_found" = "xyes" ; then - ifelse([$2], , :, [$2]) - LIBS=`echo $LIBS | sed 's/-lasound//g'` - LIBS=`echo $LIBS | sed 's/ //'` - LIBS="-lasound $LIBS" -fi -if test "x$alsa_found" = "xno" ; then - ifelse([$3], , :, [$3]) - CFLAGS="$alsa_save_CFLAGS" - LDFLAGS="$alsa_save_LDFLAGS" - LIBS="$alsa_save_LIBS" - ALSA_CFLAGS="" - ALSA_LIBS="" -fi - -dnl That should be it. Now just export out symbols: -AC_SUBST(ALSA_CFLAGS) -AC_SUBST(ALSA_LIBS) -]) - diff --git a/muse2/m4/docbook.m4 b/muse2/m4/docbook.m4 deleted file mode 100644 index eed96346..00000000 --- a/muse2/m4/docbook.m4 +++ /dev/null @@ -1,97 +0,0 @@ -# $Header: /cvsroot/lmuse/muse/m4/docbook.m4,v 1.1.1.1 2003/10/27 18:51:13 wschweer Exp $ - -# PGAC_PROG_JADE -# -------------- -AC_DEFUN([PGAC_PROG_JADE], -[AC_CHECK_PROGS([JADE], [openjade jade])]) - - -# PGAC_PROG_NSGMLS -# ---------------- -AC_DEFUN([PGAC_PROG_NSGMLS], -[AC_CHECK_PROGS([NSGMLS], [onsgmls nsgmls])]) - - -# PGAC_CHECK_DOCBOOK(VERSION) -# --------------------------- -AC_DEFUN([PGAC_CHECK_DOCBOOK], -[AC_REQUIRE([PGAC_PROG_NSGMLS]) -AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook], -[cat >conftest.sgml <<EOF -<!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN"> -<book> - <title>test</title> - <chapter> - <title>random</title> - <sect1> - <title>testsect</title> - <para>text</para> - </sect1> - </chapter> -</book> -EOF - -${NSGMLS-false} -s conftest.sgml 1>&5 2>&1 -if test $? -eq 0; then - pgac_cv_check_docbook=yes -else - pgac_cv_check_docbook=no -fi -rm -f conftest.sgml]) - -have_docbook=$pgac_cv_check_docbook -AC_SUBST([have_docbook]) -]) -# PGAC_CHECK_DOCBOOK - - -# PGAC_PATH_DOCBOOK_STYLESHEETS -# ----------------------------- -AC_DEFUN([PGAC_PATH_DOCBOOK_STYLESHEETS], [ -AC_MSG_CHECKING([for DocBook stylesheets]) -AC_ARG_WITH(docbook-stylesheets, - [ --with-docbook-stylesheets=DIR use DIR/html/docbook.dsl], - [muse_docbook_prefix="$withval"]) -AC_CACHE_VAL([pgac_cv_path_stylesheets], [ -if test -n "$muse_docbook_prefix"; then - if test -r "$muse_docbook_prefix/html/docbook.dsl" \ - && test -r "$muse_docbook_prefix/print/docbook.dsl"; then - pgac_cv_path_stylesheets="$muse_docbook_prefix" - fi -fi -if test -z "$pgac_cv_path_stylesheets"; then - if test -n "$DOCBOOKSTYLE"; then - if test -r "$DOCBOOKSTYLE/html/docbook.dsl" \ - && test -r "$DOCBOOKSTYLE/print/docbook.dsl"; then - pgac_cv_path_stylesheets="$DOCBOOKSTYLE" - fi - fi -fi -if test -z "$pgac_cv_path_stylesheets"; then - for pgac_prefix in /usr /usr/local /opt; do - for pgac_infix in share lib; do - for pgac_postfix in \ - sgml/stylesheets/nwalsh-modular \ - sgml/stylesheets/docbook \ - sgml/docbook/dsssl/modular \ - sgml/docbook/stylesheet/dsssl/modular - do - pgac_candidate=$pgac_prefix/$pgac_infix/$pgac_postfix - if test -r "$pgac_candidate/html/docbook.dsl" \ - && test -r "$pgac_candidate/print/docbook.dsl" - then - pgac_cv_path_stylesheets=$pgac_candidate - break 3 - fi - done - done - done -fi -]) -DOCBOOKSTYLE=$pgac_cv_path_stylesheets -AC_SUBST([DOCBOOKSTYLE]) -if test -n "$DOCBOOKSTYLE"; then - AC_MSG_RESULT([$DOCBOOKSTYLE]) -else - AC_MSG_RESULT(no) -fi]) # PGAC_PATH_DOCBOOK_STYLESHEETS diff --git a/muse2/m4/qt.m4 b/muse2/m4/qt.m4 deleted file mode 100644 index 5aceb294..00000000 --- a/muse2/m4/qt.m4 +++ /dev/null @@ -1,246 +0,0 @@ -dnl -dnl CONFIGURE_QT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl \author J.E. Hoffmann <je-h@gmx.net> -dnl -AC_DEFUN([CONFIGURE_QT], -[ - qt_error="no" - - QT_CFLAGS="" - QT_LIBS="" - MOC="moc" - UIC="uic" - qt_includes="/usr/include/qt" - qt_libraries="" - qt_binaries="" - - if test "$qt_error" = "no"; then - AC_MSG_CHECKING([for QT environment variable QTDIR]) - if test -z "$QTDIR"; then - AC_MSG_RESULT(no) - AC_MSG_WARN([ - - ***************** WARNING ***************** - -YOU HAVE NOT SET YOUR 'QTDIR' ENVIRONMENT VARIABLE!!! - -This is the source of most people's problems when -configuring muse. If the configuration fails to find -qt, try setting your QTDIR environment variable to -the directory where qt is installed. - - ******************************************* - -]) - echo -ne "\a" - echo -ne "\a" - echo -ne "\a" - sleep 7 - else - AC_MSG_RESULT(yes) - qt_includes="$QTDIR/include" - qt_libraries="$QTDIR/lib" - qt_binaries="$QTDIR/bin" - MOC="$qt_binaries/moc"; - UIC="$qt_binaries/uic"; - fi - fi - - muse_qttest="yes" - AC_ARG_ENABLE(qttest, - [ --disable-qttest do not try to compile and run a test libqt program],[ - case "$enableval" in - "yes") - muse_qttest="yes" - ;; - "no") - muse_qttest="no" - ;; - *) - AC_MSG_ERROR([must use --enable-qttest(=yes/no) or --disable-qttest]) - ;; - esac - ]) - - - AC_ARG_WITH(qt-prefix, - [ --with-qt-prefix=PFX where the root of Qt is installed ], - [ - qt_includes="$withval/include" - qt_libraries="$withval/lib" - qt_binaries="$withval/bin" - MOC="$qt_binaries/moc"; - UIC="$qt_binaries/uic"; - ]) - - AC_ARG_WITH(qt-includes, - [ --with-qt-includes=DIR where the Qt includes are installed ], - [ - qt_includes="$withval" - ]) - - AC_ARG_WITH(qt-libraries, - [ --with-qt-libraries=DIR where the Qt libraries are installed.], - [ - qt_libraries="$withval" - ]) - - AC_ARG_WITH(qt-binaries, - [ --with-qt-binaries=DIR where the Qt binaries are installed.], - [ - qt_binaries="$withval" - MOC="$qt_binaries/moc"; - UIC="$qt_binaries/uic"; - ]) - - AC_ARG_WITH(qt-moc, - [ --with-qt-moc=PROG where the Qt meta object compiler is installed.], - [ - MOC="$withval" - ]) - - AC_ARG_WITH(qt-uic, - [ --with-qt-uic=PROG where the Qt user interface compiler is installed.], - [ - UIC="$withval" - ]) - - if test "$qt_error" = "no"; then - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - CPPFLAGS="$saved_CPPFLAGS -I$qt_includes" - if test -n "$qt_libraries"; then - LIBS="$saved_LIBS -L$qt_libraries -lqt-mt -lqui" - QT_LIBS="-L$qt_libraries -lqt-mt -lqui" - else - LIBS="$saved_LIBS -lqt-mt -lqui -lm $X11_LIBS" - QT_LIBS="-lqt-mt -lqui" - fi - AC_MSG_CHECKING([for QT includes ($qt_includes)]) - AC_CACHE_VAL(qt_includes_found, - [ - AC_LANG_PUSH(C++) - AC_TRY_CPP([#include <qapplication.h>], - qt_includes_found=yes, qt_includes_found=no) - AC_LANG_POP(C++) - if test "$qt_includes_found" = "yes"; then - QT_CFLAGS="-I$qt_includes" - AC_MSG_RESULT(yes) - else - qt_error=yes - AC_MSG_RESULT(no) - fi - ]) - - AC_MSG_CHECKING([for QT libraries ($qt_libraries)]) - AC_CACHE_VAL(qt_libraries_found, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - saved_CXXFLAGS="$CXXFLAGS" - saved_LIBS="$LIBS" - CXXFLAGS="$QT_CFLAGS $LIBS" - LIBS="$QT_LIBS $LIBS" - - - if test "$muse_qttest" = "yes"; then - AC_TRY_RUN([ - #include <qapplication.h> - int main(int argc, char **argv) - { - QApplication app(argc, argv, false); - - } - ],[ - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - qt_error="yes" - ], - AC_MSG_ERROR([cross compiling unsupported]) - ) - else - AC_MSG_RESULT([yes (assumed due to --disable-qttest)]) - fi - - LIBS="$saved_LIBS" - CXXFLAGS="$saved_CXXFLAGS" - AC_LANG_RESTORE - ]) - - AC_MSG_CHECKING([for QT moc ($MOC)]) - output=`eval "$MOC --help 2>&1 | grep Qt"` - if test -z "$output"; then - AC_MSG_RESULT(no) - qt_error="yes" - else - AC_MSG_RESULT(yes) - fi - - AC_MSG_CHECKING([for QT uic ($UIC)]) - output=`eval "$UIC --help 2>&1 | grep Qt"` - if test -z "$output"; then - AC_MSG_RESULT(no) - qt_error="yes" - else - AC_MSG_RESULT(yes) - fi - CPPFLAGS="$saved_CPPFLAGS" - LIBS="$saved_LIBS" - fi - - if test "$qt_error" = "no"; then - AC_MSG_CHECKING([for QT version >= $1]) - qt_major_version=`echo $1 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - qt_minor_version=`echo $1 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - qt_micro_version=`echo $1 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - qt_version="$qt_major_version$qt_minor_version$qt_micro_version" - - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - saved_CXXFLAGS="$CXXFLAGS" - saved_LIBS="$LIBS" - CXXFLAGS="$QT_CFLAGS $LIBS" - LIBS="$QT_LIBS $LIBS" - - if test "$muse_qttest" = "yes"; then - AC_TRY_RUN([ - #include <qglobal.h> - int main() - { - int version = ($qt_major_version << 16) - + ($qt_minor_version << 8) - + $qt_micro_version; - if (QT_VERSION < version) return(1); - return(0); - } - ],[ - AC_MSG_RESULT(yes) - ],[ - AC_MSG_RESULT(no) - qt_error="yes" - ], - AC_MSG_ERROR([cross compiling unsupported]) - ) - else - AC_MSG_RESULT([yes (assumed due to --disable-qttest)]) - fi - - LIBS="$saved_LIBS" - CXXFLAGS="$saved_CXXFLAGS" - AC_LANG_RESTORE - fi - - AC_SUBST(QT_CFLAGS) - AC_SUBST(QT_LIBS) - AC_SUBST(MOC) - AC_SUBST(UIC) - if test "$qt_error" = "no"; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi -]) |