--- build_support.py 2007-07-31 11:57:21.000000000 +0200 +++ /var/tmp/build_support.py 2007-07-31 11:56:02.000000000 +0200 @@ -354,12 +354,12 @@ retval = True context.Message('Generating GG/libltdl/config.h using GG/libltdl/configure... ') initial_dir = os.getcwd() - os.chdir(os.path.join('GG', 'libltdl')) - configure_run = os.system('./configure > /dev/null') - code = os.WEXITSTATUS(configure_run) - if code: - retval = False - os.chdir(initial_dir) +# os.chdir(os.path.join('GG', 'libltdl')) +# configure_run = os.system('./configure > /dev/null') +# code = os.WEXITSTATUS(configure_run) +# if code: +# retval = False +# os.chdir(initial_dir) context.Result(retval and 'ok' or 'failed') return retval --- SConstruct 2007-07-31 11:57:21.000000000 +0200 +++ /var/tmp/SConstruct 2007-07-31 11:53:54.000000000 +0200 @@ -217,9 +217,10 @@ found_gg_pkg_config = False if pkg_config: - if conf.CheckPkg('GiGiSDL', gigi_version): - env.ParseConfig('pkg-config --cflags --libs GiGiSDL') - found_gg_pkg_config = True + #if conf.CheckPkg('GiGiSDL', gigi_version): + # env.ParseConfig('pkg-config --cflags --libs GiGiSDL') + # found_gg_pkg_config = True + env.ParseConfig('pkg-config --cflags --libs GiGiSDL') freeorion_boost_libs = [ ('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();'), @@ -255,8 +255,8 @@ if str(Platform()) == 'posix': if env['multithreaded']: if conf.CheckCHeader('pthread.h') and conf.CheckLib('pthread', 'pthread_create', autoadd = 0): - env.AppendUnique(CCFLAGS = ' -pthread') - env.AppendUnique(LINKFLAGS = ' -pthread') + env.AppendUnique(CCFLAGS = '-pthread') + env.AppendUnique(LINKFLAGS = '-pthread') else: Exit(1) @@ -440,9 +441,9 @@ Exit(1) if not conf.CheckCXXHeader('log4cpp/Category.hh'): Exit(1) - if str(Platform()) != 'win32': - if not conf.CheckLibWithHeader('log4cpp', 'log4cpp/Category.hh', 'C++', 'log4cpp::Category::getRoot();'): - Exit(1) + #if str(Platform()) != 'win32': + # if not conf.CheckLibWithHeader('log4cpp', 'log4cpp/Category.hh', 'C++', 'log4cpp::Category::getRoot();'): + # Exit(1) # GG AppendPackagePaths('gg', env)