diff options
| author | Hans Fugal <hans@fugal.net> | 2006-06-02 03:33:38 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-06-02 03:33:38 +0000 |
| commit | d96bda7daeb270397e84bed60f12be7098019e8d (patch) | |
| tree | 732dd4e842637af1e19db1d5ecfa0965794c805d /libs | |
| parent | cf644c0c97ffa29f69c5dbfcafd9dceb745c6f88 (diff) | |
Run autogen.sh based on the existence of configure instead of the existence of
.svn or CVS.
git-svn-id: svn://localhost/ardour2/trunk@550 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/glibmm2/SConscript | 9 | ||||
| -rw-r--r-- | libs/sigc++2/SConscript | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript index e5caa60a45..63dc384e3f 100644 --- a/libs/glibmm2/SConscript +++ b/libs/glibmm2/SConscript @@ -18,12 +18,9 @@ glibmm2.Append(CXXFLAGS='-DG_LOG_DOMAIN=\\\"glibmm\\\"') libglibmm2 = glibmm2.SharedLibrary('glibmm2', glibmm2_files) -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]) -else: - Default([libglibmm2]) +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]) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2)) diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index 06387b38cf..f0bf07ca79 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -11,12 +11,9 @@ sigc2 = env.Copy() libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files) -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]) -else: - Default([libsigc2]) +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]) env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsigc2)) |