[llvm-commits] [hlvm] r38126 - /hlvm/trunk/build/configure.py

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:00:06 2007
New Revision: 38126

URL: http://llvm.org/viewvc/llvm-project?rev=38126&view=rev
Log:
Check things in a consistent order.

Modified:
    hlvm/trunk/build/configure.py

Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38126&r1=38125&r2=38126&view=diff

==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul  7 19:00:06 2007
@@ -144,7 +144,7 @@
     [env['with_xml2']],[],'libxml2')
 
 def CheckProgram(context,progname,varname,moredirs=[]):
-  context.Message("Checking for " + progname + "...")
+  context.Message("Checking for Program " + progname + "...")
   if exists(context.env[varname]):
     ret = 1
   else:
@@ -159,10 +159,6 @@
 def CheckForHeaders(conf,env):
   if not conf.CheckCXXHeader('algorithm'):
     env.Exit(1)
-  if not conf.CheckCHeader(['apr-1/apr.h','apr-1/apr_pools.h']):
-    env.Exit(1)
-  if not conf.CheckCHeader(['apr-1/apr.h','apr-1/apr_uri.h']):
-    env.Exit(1)
   if not conf.CheckCXXHeader('cassert'):
     env.Exit(1)
   if not conf.CheckCXXHeader('ios'):
@@ -171,16 +167,6 @@
     env.Exit(1)
   if not conf.CheckCXXHeader('istream'):
     env.Exit(1)
-  if not conf.CheckCHeader('libxml/parser.h'):
-    env.Exit(1)
-  if not conf.CheckCHeader('libxml/relaxng.h'):
-    env.Exit(1)
-  if not conf.CheckCHeader('libxml/xmlwriter.h'):
-    env.Exit(1)
-  if not conf.CheckCXXHeader('llvm/ADT/StringExtras.h'):
-    env.Exit(1)
-  if not conf.CheckCXXHeader('llvm/System/Path.h'):
-    env.Exit(1)
   if not conf.CheckCXXHeader('map'):
     env.Exit(1)
   if not conf.CheckCXXHeader('memory'):
@@ -193,6 +179,20 @@
     env.Exit(1)
   if not conf.CheckCXXHeader('vector'):
     env.Exit(1)
+  if not conf.CheckCXXHeader('llvm/ADT/StringExtras.h'):
+    env.Exit(1)
+  if not conf.CheckCXXHeader('llvm/System/Path.h'):
+    env.Exit(1)
+  if not conf.CheckCHeader(['apr-1/apr.h','apr-1/apr_pools.h']):
+    env.Exit(1)
+  if not conf.CheckCHeader(['apr-1/apr.h','apr-1/apr_uri.h']):
+    env.Exit(1)
+  if not conf.CheckCHeader('libxml/parser.h'):
+    env.Exit(1)
+  if not conf.CheckCHeader('libxml/relaxng.h'):
+    env.Exit(1)
+  if not conf.CheckCHeader('libxml/xmlwriter.h'):
+    env.Exit(1)
   return 1
 
 def CheckForPrograms(conf,env):