diff options
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | libs/sigc++2/SConscript | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 4aa0e7204c..98d422cd8d 100644 --- a/SConstruct +++ b/SConstruct @@ -28,7 +28,6 @@ opts.AddOptions( BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), BoolOption('DEVBUILD', 'Use shared libardour (developers only)', 0), - BoolOption('SIGCCVSBUILD', 'Use if building sigc++ with a new configure.ac (developers only)', 0), BoolOption('NLS', 'Set to turn on i18n support', 1), BoolOption('NOARCH', 'Do not use architecture-specific compilation flags', 0), PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript index 244ff7af9e..8934591105 100644 --- a/libs/sigc++2/SConscript +++ b/libs/sigc++2/SConscript @@ -8,8 +8,12 @@ sigc2_files = glob.glob('sigc++/*.cc') + glob.glob('sigc++/functors/*.cc') + glo Import('env') sigc2 = env.Copy() -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) +if os.path.exists ('CVS'): + 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([sigc_config_h,libsigc]) +else: + Default([libsigc]) libsigc2 = sigc2.StaticLibrary('sigc++2', sigc2_files) Default([sigc2_config_h, libsigc2]) |