From 8a2c2824a59d7644e13bc52c9a0ecbd641f21f95 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Wed, 13 Oct 2010 19:34:22 +0000 Subject: new branch muse2, first checkin --- muse2/m4/Makefile.am | 1 + muse2/m4/Makefile.in | 415 ++++++++++++++++++++++++++++++++++++++++++++ muse2/m4/aclocal-include.m4 | 16 ++ muse2/m4/alsa.m4 | 148 ++++++++++++++++ muse2/m4/docbook.m4 | 97 +++++++++++ muse2/m4/libtool.m4 | 1 + muse2/m4/ltoptions.m4 | 1 + muse2/m4/ltsugar.m4 | 1 + muse2/m4/ltversion.m4 | 1 + muse2/m4/lt~obsolete.m4 | 1 + muse2/m4/qt.m4 | 246 ++++++++++++++++++++++++++ 11 files changed, 928 insertions(+) create mode 100644 muse2/m4/Makefile.am create mode 100644 muse2/m4/Makefile.in create mode 100644 muse2/m4/aclocal-include.m4 create mode 100644 muse2/m4/alsa.m4 create mode 100644 muse2/m4/docbook.m4 create mode 120000 muse2/m4/libtool.m4 create mode 120000 muse2/m4/ltoptions.m4 create mode 120000 muse2/m4/ltsugar.m4 create mode 120000 muse2/m4/ltversion.m4 create mode 120000 muse2/m4/lt~obsolete.m4 create mode 100644 muse2/m4/qt.m4 (limited to 'muse2/m4') diff --git a/muse2/m4/Makefile.am b/muse2/m4/Makefile.am new file mode 100644 index 00000000..f7870828 --- /dev/null +++ b/muse2/m4/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = $(wildcard *.m4) \ No newline at end of file diff --git a/muse2/m4/Makefile.in b/muse2/m4/Makefile.in new file mode 100644 index 00000000..3ae01121 --- /dev/null +++ b/muse2/m4/Makefile.in @@ -0,0 +1,415 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = m4 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal-include.m4 \ + $(top_srcdir)/m4/alsa.m4 $(top_srcdir)/m4/docbook.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DOCBOOKSTYLE = @DOCBOOKSTYLE@ +DOCBOOKTARGETS = @DOCBOOKTARGETS@ +DOT = @DOT@ +DOTPATH = @DOTPATH@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_TREEVIEW = @DOXYGEN_TREEVIEW@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +FLUIDSYNTHDIRS = @FLUIDSYNTHDIRS@ +FST_CFLAGS = @FST_CFLAGS@ +FST_LIBS = @FST_LIBS@ +Fluidsynth_CFLAGS = @Fluidsynth_CFLAGS@ +Fluidsynth_LIBS = @Fluidsynth_LIBS@ +GIVERTCAP = @GIVERTCAP@ +GREP = @GREP@ +HAVEDOT = @HAVEDOT@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ +JADE = @JADE@ +LASH_CFLAGS = @LASH_CFLAGS@ +LASH_LIBS = @LASH_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LO_CFLAGS = @LO_CFLAGS@ +LO_LIBS = @LO_LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MUSECXXFLAGS = @MUSECXXFLAGS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NSGMLS = @NSGMLS@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PCH = @PCH@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIB = @PYTHON_LIB@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +QTDIR_BIN = @QTDIR_BIN@ +QTDIR_INC = @QTDIR_INC@ +QT_LIBS = @QT_LIBS@ +RANLIB = @RANLIB@ +SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@ +SAMPLERATE_LIBS = @SAMPLERATE_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNDFILE_CFLAGS = @SNDFILE_CFLAGS@ +SNDFILE_LIBS = @SNDFILE_LIBS@ +STRIP = @STRIP@ +SUIDBUILD = @SUIDBUILD@ +SUIDINSTALL = @SUIDINSTALL@ +USE_SSE = @USE_SSE@ +UUID_CFLAGS = @UUID_CFLAGS@ +UUID_LIBS = @UUID_LIBS@ +VERSION = @VERSION@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +have_docbook = @have_docbook@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +synth_fluid = @synth_fluid@ +synth_fluidsynth = @synth_fluidsynth@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = $(wildcard *.m4) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu m4/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/muse2/m4/aclocal-include.m4 b/muse2/m4/aclocal-include.m4 new file mode 100644 index 00000000..abf6533f --- /dev/null +++ b/muse2/m4/aclocal-include.m4 @@ -0,0 +1,16 @@ +# 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 new file mode 100644 index 00000000..da57ad4f --- /dev/null +++ b/muse2/m4/alsa.m4 @@ -0,0 +1,148 @@ +dnl Configure Paths for Alsa +dnl Some modifications by Richard Boulton +dnl Christopher Lansdown +dnl Jaroslav Kysela +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 +], [ +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 new file mode 100644 index 00000000..eed96346 --- /dev/null +++ b/muse2/m4/docbook.m4 @@ -0,0 +1,97 @@ +# $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 < + + test + + random + + testsect + text + + + +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/libtool.m4 b/muse2/m4/libtool.m4 new file mode 120000 index 00000000..f3504e92 --- /dev/null +++ b/muse2/m4/libtool.m4 @@ -0,0 +1 @@ +/usr/share/aclocal/libtool.m4 \ No newline at end of file diff --git a/muse2/m4/ltoptions.m4 b/muse2/m4/ltoptions.m4 new file mode 120000 index 00000000..b81279e3 --- /dev/null +++ b/muse2/m4/ltoptions.m4 @@ -0,0 +1 @@ +/usr/share/aclocal/ltoptions.m4 \ No newline at end of file diff --git a/muse2/m4/ltsugar.m4 b/muse2/m4/ltsugar.m4 new file mode 120000 index 00000000..4d76cc70 --- /dev/null +++ b/muse2/m4/ltsugar.m4 @@ -0,0 +1 @@ +/usr/share/aclocal/ltsugar.m4 \ No newline at end of file diff --git a/muse2/m4/ltversion.m4 b/muse2/m4/ltversion.m4 new file mode 120000 index 00000000..5eb474fd --- /dev/null +++ b/muse2/m4/ltversion.m4 @@ -0,0 +1 @@ +/usr/share/aclocal/ltversion.m4 \ No newline at end of file diff --git a/muse2/m4/lt~obsolete.m4 b/muse2/m4/lt~obsolete.m4 new file mode 120000 index 00000000..de0b9f94 --- /dev/null +++ b/muse2/m4/lt~obsolete.m4 @@ -0,0 +1 @@ +/usr/share/aclocal/lt~obsolete.m4 \ No newline at end of file diff --git a/muse2/m4/qt.m4 b/muse2/m4/qt.m4 new file mode 100644 index 00000000..5aceb294 --- /dev/null +++ b/muse2/m4/qt.m4 @@ -0,0 +1,246 @@ +dnl +dnl CONFIGURE_QT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl \author J.E. Hoffmann +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 ], + 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 + 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 + 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 +]) -- cgit v1.2.3