1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-26 07:10:09 +01:00

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

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

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
])