[Lmuse-cvs-traffic] muse ChangeLog,1.347,1.348 configure.ac,1.44,1.45

[Robert J. <spa...@us...>]

Update of /cvsroot/lmuse/muse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12278

Modified Files:
	ChangeLog configure.ac 
Log Message:
autoconf bug with fluidsynth.h fixed

Index: configure.ac
===================================================================
RCS file: /cvsroot/lmuse/muse/configure.ac,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** configure.ac	4 Jun 2005 17:27:46 -0000	1.44
--- configure.ac	29 Jul 2005 11:58:43 -0000	1.45
***************
*** 104,108 ****
    case "$enableval" in
      "yes")
-       AC_DEFINE(ENABLEFLUIDSYNTH, 1, [Compile fluidsynth])
        ;;
      "no")
--- 104,107 ----
***************
*** 114,125 ****
    esac
  ])
  
  if test "$muse_enable_fluidlib" = "yes"; then
!   AC_CHECK_LIB(fluidsynth, new_fluid_synth,
!     FLUIDSYNTHDIRS="fluid fluidsynth",
!     AC_MSG_WARN([libfluidsynth not found; disabling fluidsynth plugins])
!   )
  fi
- AM_CONDITIONAL(ENABLEFLUIDSYNTH, test "$muse_enable_fluidlib" = "yes")
  AC_SUBST(FLUIDSYNTHDIRS)
  
--- 113,125 ----
    esac
  ])
+ AM_CONDITIONAL(ENABLEFLUIDSYNTH, test "$muse_enable_fluidlib" = "yes")
  
  if test "$muse_enable_fluidlib" = "yes"; then
!   PKG_CHECK_MODULES(Fluidsynth, fluidsynth,
!     [FLUIDSYNTHDIRS="fluid fluidsynth"; AC_DEFINE(ENABLEFLUIDSYNTH, 1, [Compile fluidsynth])],
!     [AC_MSG_WARN([libfluidsynth not found; disabling fluidsynth plugins]) ; 
!     muse_enable_fluidlib="no"]
!     )
  fi
  AC_SUBST(FLUIDSYNTHDIRS)
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/lmuse/muse/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -C2 -d -r1.347 -r1.348
*** ChangeLog	17 Jul 2005 14:23:13 -0000	1.347
--- ChangeLog	29 Jul 2005 11:58:43 -0000	1.348
***************
*** 1,2 ****
--- 1,4 ----
+ 29.7. 
+       * Fixed autoconf bug, unable to build without fluidsynth.h (rj)
  17.7. (ws)
        * implemented direct routing from midi input port to synti
***************
*** 26,30 ****
          - added save & load in the MusE project
  13.7
!       * Added patches from Daniel Kobras to korrekt error in listeditor and
          erros in old html docs. (rj)
        * Added uppercase filters to midi import (rj)
--- 28,32 ----
          - added save & load in the MusE project
  13.7
!       * Added patches from Daniel Kobras to correct error in listeditor and
          erros in old html docs. (rj)
        * Added uppercase filters to midi import (rj)