Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00
Code Issues Releases Wiki Activity

Fixes from Benjamin that correct several "configure" problems under Ubuntu Natty and Debian Unstable

Browse Source 
Also fixes test in maketarball.sh that determines whether a reconfig is needed.
This commit is contained in:
lllucius
2011-03-29 03:10:10 +00:00
parent 8eee168b56
commit 51ba874c1e
7 changed files with 2240 additions and 3961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
m4/audacity_checklib_libsoundtouch.m4
View File

@@ -31,6 +31,11 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [
soundtouch_available_system="yes",
soundtouch_available_system="no")
fi
if test "x$soundtouch_available_system" = "xno" ; then
PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch >= 1.3.0,
soundtouch_available_system="yes",
soundtouch_available_system="no")
fi
if test "x$soundtouch_available_system" = "xyes" ; then
LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes"

54
m4/audacity_checklib_portsmf.m4 Normal file
View File

@@ -0,0 +1,54 @@
dnl Add Audacity / portSMF license?
dnl
dnl Please increment the serial number below whenever you alter this macro
dnl for the benefit of automatic macro update systems
# audacity_checklib_portsmf.m4 serial 1
AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
AC_ARG_WITH(midi,
[AS_HELP_STRING([--with-midi],
[use portSMF for Midi support])],
PORTSMF_ARGUMENT=$withval,
PORTSMF_ARGUMENT="unspecified")
if false ; then
AC_DEFINE(USE_MIDI, 1,
[Define if midi support should be enabled])
fi
dnl see if libportsmf is installed on the system
PKG_CHECK_MODULES(PORTSMF, portSMF,
portsmf_available_system="yes",
portsmf_available_system="no")
if test "x$portsmf_available_system" = "xyes" ; then
PORTSMF_SYSTEM_AVAILABLE="yes"
PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS"
PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS"
PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI"
dnl extra objects we can now compile
PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
AC_MSG_NOTICE([portSMF library is available as system library])
else
PORTSMF_SYSTEM_AVAILABLE="no"
AC_MSG_NOTICE([portSMF library is NOT available as system library])
fi
AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h,
allegro_h_available="yes",
allegro_h_available="no")
if test "x$allegro_h_available" = "xyes" ; then
PORTSMF_LOCAL_AVAILABLE="yes"
PORTSMF_LOCAL_LIBS="libportSMF.a"
PORTSMF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portsmf'
PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
PORTSMF_LOCAL_CONFIG_SUBDIRS="lib-src/portsmf"
dnl extra objects we can now compile
PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
else
PORTSMF_LOCAL_AVAILABLE="no"
fi
])

39
m4/audacity_checklib_widgetextra.m4
View File

@@ -35,42 +35,3 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [
dnl otherwise good - got it. Flags will be available for use in
dnl WIDGETEXTRA_LIBS and friends
])
AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [
AC_ARG_WITH(midi,
[AS_HELP_STRING([--with-midi],
[use portSMF for Midi support ])],
PORTSMF_ARGUMENT=$withval,
PORTSMF_ARGUMENT="unspecified")
if false ; then
AC_DEFINE(USE_MIDI, 1,
[Define if midi support should be enabled])
fi
dnl we need to configure portSMF if there is a local copy
if test -d ${srcdir}/lib-src/portsmf ; then
AX_CONFIG_DIR(["${srcdir}/lib-src/portsmf"])
fi
dnl having done that we get a pkg-config file we can use
dnl add the directory with portSMF in to the pkg-config search path
PKG_CONFIG_PATH="${srcdir}/lib-src/portsmf/:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH
PKG_CHECK_MODULES(PORTSMF, portSMF,
portsmf_available="yes",
portsmf_available="no")
if test "x$portsmf_available" = "xyes" ; then
PORTSMF_LOCAL_AVAILABLE="yes"
PORTSMF_LOCAL_LDFLAGS=$PORTSMF_LIBS
PORTSMF_LOCAL_CXXFLAGS=$PORTSMF_CFLAGS
PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI"
dnl extra objects we can now compile
PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o"
dnl this bit makes sure that we compile the lib-src copy
PORTSMF_LOCAL_BUILD="portSMF"
else
PORTSMF_LOCAL_AVAILABLE="no"
fi
])