[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/bksys
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2006-01-20 13:35:29
Message-ID: 1137764129.980435.11739.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 500507 by chehrlic:

define HAVE_PCREPOSIX if pcre is found
disable pkgconfig on windows
define HAVE_SYS_TIMEB_H for windows

 M  +1 -1      libpcre.py  
 M  +4 -1      pkgconfig.py  
 M  +1 -1      win32/detect_generic.py  
 M  +1 -0      win32/detect_lowlevel.py  


--- trunk/KDE/kdelibs/bksys/libpcre.py #500506:500507
@@ -46,6 +46,6 @@
 
 		env = conf.Finish()
 
-		env.write_lib_header( 'libpcre', env['CACHED_PCRE'], False )
+		env.write_lib_header( 'libpcre', env['CACHED_PCRE'], False, '', '#define \
HAVE_PCREPOSIX 1\n' )  
 	opts.Save(optionFile, env)
--- trunk/KDE/kdelibs/bksys/pkgconfig.py #500506:500507
@@ -89,7 +89,7 @@
 			
 		return haveModule
 
-	if not env.has_key('HAVE_PKGCONFIG'):
+	if not env['HELP'] and (env['_CONFIGURE_'] or not env.has_key('HAVE_PKGCONFIG')):
 		conf = env.Configure(custom_tests =
 				     { 'Check_pkg_config' : Check_pkg_config  }
 				     )
@@ -97,6 +97,9 @@
 			env['HAVE_PKGCONFIG'] = 1
 		else:
 		    env['HAVE_PKGCONFIG'] = 0
+		
+		if env['WINDOWS']:
+		    env['HAVE_PKGCONFIG'] = 0
 		env = conf.Finish()
 
 	SConsEnvironment.pkgConfig_findPackage = pkgConfig_findPackage
--- trunk/KDE/kdelibs/bksys/win32/detect_generic.py #500506:500507
@@ -39,7 +39,7 @@
 
 	if env['CC'] == 'cl':
 		# avoid some compiler warnings...
-		env.AppendUnique( GENCCFLAGS = ['-wd4619','-wd4820','-DWIN32_LEAN_AND_MEAN'] )
+		env.AppendUnique( GENCCFLAGS = \
['-wd4619','-wd4820','-wd4996','-D_CRT_SECURE_NO_DEPRECATE','-DWIN32_LEAN_AND_MEAN'] \
)  
 	if os.environ.has_key('CXXFLAGS'):  env['GENCXXFLAGS']  += SCons.Util.CLVar( \
os.environ['CXXFLAGS'] )  if os.environ.has_key('CFLAGS'): env['GENCCFLAGS'] = \
                SCons.Util.CLVar( os.environ['CFLAGS'] )
--- trunk/KDE/kdelibs/bksys/win32/detect_lowlevel.py #500506:500507
@@ -8,6 +8,7 @@
 	content="""
 #define HAVE_SYS_STAT_H 1
 #define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIMEB_H 1
 #define HAVE_CTYPE_H 1 
 #define HAVE_MALLOC_H 1
 #define HAVE_STRING_H 1 


[prev in list] [next in list] [prev in thread] [next in thread]