Attachment #126980 for bug #59212




    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)
    context.Result(retval and 'ok' or 'failed')
    return retval






        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
            env.ParseConfig('pkg-config --cflags --libs GiGiSDL')

        freeorion_boost_libs = [
            ('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();'),

            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')
                    else:
                        Exit(1)

                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)

        # GG
        AppendPackagePaths('gg', env)

Return to bug 59212

Lines 354-365 Link Here

(-)build_support.py (-6 / +6 lines)
354	retval = True	354	retval = True
355	context.Message('Generating GG/libltdl/config.h using GG/libltdl/configure... ')	355	context.Message('Generating GG/libltdl/config.h using GG/libltdl/configure... ')
356	initial_dir = os.getcwd()	356	initial_dir = os.getcwd()
357	os.chdir(os.path.join('GG', 'libltdl'))	357	# os.chdir(os.path.join('GG', 'libltdl'))
358	configure_run = os.system('./configure > /dev/null')	358	# configure_run = os.system('./configure > /dev/null')
359	code = os.WEXITSTATUS(configure_run)	359	# code = os.WEXITSTATUS(configure_run)
360	if code:	360	# if code:
361	retval = False	361	# retval = False
362	os.chdir(initial_dir)	362	# os.chdir(initial_dir)
363	context.Result(retval and 'ok' or 'failed')	363	context.Result(retval and 'ok' or 'failed')
364	return retval	364	return retval
365		365

Lines 217-225 Link Here

(-)SConstruct (-8 / +9 lines)
217		217
218	found_gg_pkg_config = False	218	found_gg_pkg_config = False
219	if pkg_config:	219	if pkg_config:
220	if conf.CheckPkg('GiGiSDL', gigi_version):	220	#if conf.CheckPkg('GiGiSDL', gigi_version):
221	env.ParseConfig('pkg-config --cflags --libs GiGiSDL')	221	# env.ParseConfig('pkg-config --cflags --libs GiGiSDL')
222	found_gg_pkg_config = True	222	# found_gg_pkg_config = True
		223	env.ParseConfig('pkg-config --cflags --libs GiGiSDL')
223		224
224	freeorion_boost_libs = [	225	freeorion_boost_libs = [
225	('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();'),	226	('boost_serialization', 'boost/archive/binary_iarchive.hpp', 'boost::archive::binary_iarchive::is_saving();'),
Lines 255-262 Link Here
255	if str(Platform()) == 'posix':	255	if str(Platform()) == 'posix':
256	if env['multithreaded']:	256	if env['multithreaded']:
257	if conf.CheckCHeader('pthread.h') and conf.CheckLib('pthread', 'pthread_create', autoadd = 0):	257	if conf.CheckCHeader('pthread.h') and conf.CheckLib('pthread', 'pthread_create', autoadd = 0):
258	env.AppendUnique(CCFLAGS = ' -pthread')	258	env.AppendUnique(CCFLAGS = '-pthread')
259	env.AppendUnique(LINKFLAGS = ' -pthread')	259	env.AppendUnique(LINKFLAGS = '-pthread')
260	else:	260	else:
261	Exit(1)	261	Exit(1)
Lines 440-448 Link Here
440	Exit(1)	441	Exit(1)
441	if not conf.CheckCXXHeader('log4cpp/Category.hh'):	442	if not conf.CheckCXXHeader('log4cpp/Category.hh'):
442	Exit(1)	443	Exit(1)
443	if str(Platform()) != 'win32':	444	#if str(Platform()) != 'win32':
444	if not conf.CheckLibWithHeader('log4cpp', 'log4cpp/Category.hh', 'C++', 'log4cpp::Category::getRoot();'):	445	# if not conf.CheckLibWithHeader('log4cpp', 'log4cpp/Category.hh', 'C++', 'log4cpp::Category::getRoot();'):
445	Exit(1)	446	# Exit(1)
446		447
447	# GG	448	# GG
448	AppendPackagePaths('gg', env)	449	AppendPackagePaths('gg', env)