From c0fa196073f21587129aaf7e8305bbbb8f1ec5ca Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Oct 2006 20:29:57 +0000 Subject: changes to make the tarball compile git-svn-id: svn://localhost/ardour2/trunk@939 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/glibmm2/SConscript | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'libs/glibmm2/SConscript') diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index 63dc384e3f..dbc58e6499 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -18,14 +18,29 @@ glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files) -glibmm2_configure_script = glibmm2.Command ('configure', 'configure.ac', 'cd libs/glibmm2; ./autogen.sh; cd -', ENV=os.environ) -glibmm2_config_h = glibmm2.Command('glibmmconfig.h', [glibmm2_configure_script, 'glibmmconfig.h.in'], 'cd libs/glibmm2; ./configure; cd -', ENV=os.environ) +if os.access ('autogen.sh', os.F_OK) : + glibmm2_configure_script = glibmm2.Command ('configure', 'configure.ac', 'cd libs/glibmm2; ./autogen.sh; cd -', ENV=os.environ) + glibmm2_config_h = glibmm2.Command('glibmmconfig.h', [glibmm2_configure_script, 'glibmmconfig.h.in'], + 'cd libs/glibmm2; ./configure || exit 1; cd -', ENV=os.environ) +else : + glibmm2_config_h = glibmm2.Command('glibmmconfig.h', ['configure', 'glibmmconfig.h.in'], + 'cd libs/glibmm2; ./configure || exit 1; cd -', ENV=os.environ) + Default([glibmm2_config_h, libglibmm2]) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2)) env.Alias('tarball', env.Distribute (env['DISTTREE'], - [ 'SConscript', 'glibmm.h','glibmmconfig.h'] + + [ 'SConscript', + 'glibmm.h', + 'configure', + 'Makefile.in', + 'glibmmconfig.h', + 'glibmmconfig.h.in', + 'glibmm-2.4.pc.in', + 'glibmm/Makefile.in', + 'scripts' + ] + glibmm2_files + glob.glob('glibmm/*.h') + glob.glob('glibmm/private/*.h') -- cgit v1.2.3