Update of /cvsroot/audacity/audacity-src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2486
Modified Files:
configure configure.in
Log Message:
Redo FileDialog build to accommodate Linux better and to get rid of those
silly .hpp files.
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- configure 6 Apr 2007 10:20:17 -0000 1.104
+++ configure 30 Apr 2007 04:12:39 -0000 1.105
@@ -273,6 +273,7 @@
ac_unique_file="src/Audacity.h"
ac_default_prefix=/usr/local
+ac_subdirs_all="$ac_subdirs_all lib-src/FileDialog"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -315,7 +316,7 @@
ac_subdirs_all="$ac_subdirs_all lib-src/rtaudio"
ac_subdirs_all="$ac_subdirs_all lib-src/portmixer"
ac_subdirs_all="$ac_subdirs_all lib-src/dlcompat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BUILDLIBS EXTRAOBJS EXTRATARGETS
EXTRAINSTALLTARGETS EXTRAUNINSTALLTARGETS OPTOBJS CDEPEND PRECOMP_CFLAGS
AFTERBUILD INSTALL_PREFIX CONFIGHEADER LOCAL_LIBS AUDACITY_NAME PKG_CONFIG
ac_pt_PKG_CONFIG SNDFILE_CFLAGS SNDFILE_LIBS SAMPLERATE_CFLAGS SAMPLERATE_LIBS
SOUNDTOUCH_CFLAGS SOUNDTOUCH_LIBS subdirs WX_CONFIG build build_cpu
build_vendor build_os host host_cpu host_vendor host_os JACK_CFLAGS JACK_LIBS
LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS
LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BUILDLIBS EXTRAOBJS EXTRATARGETS
EXTRAINSTALLTARGETS EXTRAUNINSTALLTARGETS OPTOBJS CDEPEND PRECOMP_CFLAGS
AFTERBUILD INSTALL_PREFIX CONFIGHEADER LOCAL_LIBS AUDACITY_NAME subdirs
PKG_CONFIG ac_pt_PKG_CONFIG SNDFILE_CFLAGS SNDFILE_LIBS SAMPLERATE_CFLAGS
SAMPLERATE_LIBS SOUNDTOUCH_CFLAGS SOUNDTOUCH_LIBS WX_CONFIG build build_cpu
build_vendor build_os host host_cpu host_vendor host_os JACK_CFLAGS JACK_LIBS
LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3433,6 +3434,11 @@
wx_preference=""
fi;
+
+
+subdirs="$subdirs lib-src/FileDialog"
+
+
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE
LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBEXPAT LIBTWOLAME"
{ echo "$as_me:$LINENO: Determining what libraries are available in this tree
and on the system" >&5
@@ -6236,6 +6242,9 @@
esac
+ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
+
+
LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference $wx_preference --libs`"
CPPFLAGS="$CPPFLAGS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference $wx_preference --cxxflags`"
@@ -7779,6 +7788,7 @@
s,@CONFIGHEADER@,$CONFIGHEADER,;t t
s,@LOCAL_LIBS@,$LOCAL_LIBS,;t t
s,@AUDACITY_NAME@,$AUDACITY_NAME,;t t
+s,@subdirs@,$subdirs,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s,@SNDFILE_CFLAGS@,$SNDFILE_CFLAGS,;t t
@@ -7787,7 +7797,6 @@
s,@SAMPLERATE_LIBS@,$SAMPLERATE_LIBS,;t t
s,@SOUNDTOUCH_CFLAGS@,$SOUNDTOUCH_CFLAGS,;t t
s,@SOUNDTOUCH_LIBS@,$SOUNDTOUCH_LIBS,;t t
-s,@subdirs@,$subdirs,;t t
s,@WX_CONFIG@,$WX_CONFIG,;t t
s,@build@,$build,;t t
s,@build_cpu@,$build_cpu,;t t
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- configure.in 6 Apr 2007 10:20:19 -0000 1.97
+++ configure.in 30 Apr 2007 04:12:41 -0000 1.98
@@ -136,6 +136,8 @@
wx_preference="--version=$withval",
wx_preference="")
+AC_CONFIG_SUBDIRS([lib-src/FileDialog])
+
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE
LIBRESAMPLE LIBSOUNDTOUCH LIBNYQUIST LIBEXPAT LIBTWOLAME"
AC_MSG_NOTICE([Determining what libraries are available in this tree and on
the system])
@@ -353,6 +355,10 @@
${wx_list}])
esac
+dnl Pass wx config path to lower levels
+
+ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\""
+
dnl Gather wx arguments
LIBS="$LIBS `$WX_CONFIG $static_preference $unicode_preference
$debug_preference $wx_preference --libs`"
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
