added conditionals to detect SVN build conditions where we used to use CVS

git-svn-id: svn://localhost/trunk/ardour2@527 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index 5ed114df2fd2fa502b559a534f7dc3fd96d9fb25..e5caa60a451e47125495f50dbb47308c6e30747a 100644 (file)
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -18,7 +18,7 @@ glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"')
 
 libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files)
 
-if os.path.exists ('CVS'):
+if os.path.exists ('CVS') or os.path.exists ('.svn'):
    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)
    Default([glibmm2_config_h, libglibmm2])

diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript
index 0d7f6e37f85bde612eff25dc20cc088ce135dee0..3ad0129653936c3c13a1b71d3c52e8a6a463f40b 100644 (file)
--- a/libs/sigc++2/SConscript
+++ b/libs/sigc++2/SConscript
@@ -11,7 +11,7 @@ sigc2 = env.Copy()
 
 libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files)
 
-if os.path.exists ('CVS'):
+if os.path.exists ('CVS') or os.path.exists ('.svn'):
     sigc2_configure_script = sigc2.Command ('configure', 'configure.ac', 'cd libs/sigc++2; ./autogen.sh; cd -', ENV=os.environ)
     sigc2_config_h = sigc2.Command('sigc++config.h', [sigc2_configure_script, 'sigc++config.h.in'], 'cd libs/sigc++2; ./configure; cd -', ENV=os.environ)
     Default([sigc2_config_h,libsigc2])