[Xorp-hackers] [PATCH] main SConstract bugs

["Igor Maravić"]

When I did "scons install" rtrmngr was looking for .xrls files in folder /xrl/targets not in folder /xorp/xrls, so I changed that.
Also I removed ; from if statements.
Also only when value of 'optimize' is set to 'override', we should skip appending CFLAGS/CXXFLAGS.
When it's value is 'no', CFLAGS/CXXFLAGS still have some value to be appended.

BR
Igor Maravić

Sigend-off-by: Igor Maravić <igorm at etf.rs>
---

diff -upNr xorp.orig/SConstruct xorp/SConstruct
--- xorp.orig/SConstruct	2011-09-12 20:23:12.000000000 +0200
+++ xorp/SConstruct	2011-09-23 15:28:34.429947091 +0200
@@ -379,30 +379,30 @@ env['xorp_moduledir']   = env['libdir']
 env['xorp_sbindir']     = env['sbindir']		# End-user binaries
 env['xorp_templatedir'] = env['datadir'] + '/templates'
 env['xorp_tooldir']     = env['libdir']  + '/xorp/bin'	# tools/*
-env['xorp_xrlsdir']     = env['datadir'] + '/xorp/xrls'	# *.xrls
+env['xorp_xrlsdir']     = env['datadir'] + '/xrl/targets'	# *.xrls
 env['xorp_sourcedir']   = sourcedir	# rtrmgr/util.cc and xif need this

 tst = ARGUMENTS.get('enable_boost', False)
 if tst and not (tst == "no"):
-    env['enable_boost'] = True;
+    env['enable_boost'] = True
 else:
     env['enable_boost'] = False

 tst = ARGUMENTS.get('enable_ustl', False)
 if tst and not (tst == "no"):
-    env['enable_ustl'] = True;
+    env['enable_ustl'] = True
 else:
     env['enable_ustl'] = False

 tst = ARGUMENTS.get('enable_tests', False)
 if tst and not (tst == "no"):
-    env['enable_tests'] = True;
+    env['enable_tests'] = True
 else:
     env['enable_tests'] = False

 tst = ARGUMENTS.get('enable_click', False)
 if tst and not (tst == "no"):
-    env['enable_click'] = True;
+    env['enable_click'] = True
 else:
     env['enable_click'] = False

@@ -464,67 +464,67 @@ else:

 tst = ARGUMENTS.get('disable_ipv6', False)
 if tst and not (tst == "no"):
-    env['disable_ipv6'] = True;
+    env['disable_ipv6'] = True
 else:
     env['disable_ipv6'] = False

 tst = ARGUMENTS.get('disable_fw', False)
 if tst and not (tst == "no"):
-    env['disable_fw'] = True;
+    env['disable_fw'] = True
 else:
     env['disable_fw'] = False

 tst = ARGUMENTS.get('disable_libtecla', False)
 if tst and not (tst == "no"):
-    env['disable_libtecla'] = True;
+    env['disable_libtecla'] = True
 else:
     env['disable_libtecla'] = False

 tst = ARGUMENTS.get('disable_profile', False)
 if tst and not (tst == "no"):
-    env['disable_profile'] = True;
+    env['disable_profile'] = True
 else:
     env['disable_profile'] = False

 tst = ARGUMENTS.get('disable_warninglogs', False)
 if tst and not (tst == "no"):
-    env['disable_warninglogs'] = True;
+    env['disable_warninglogs'] = True
 else:
     env['disable_warninglogs'] = False

 tst = ARGUMENTS.get('disable_errorlogs', False)
 if tst and not (tst == "no"):
-    env['disable_errorlogs'] = True;
+    env['disable_errorlogs'] = True
 else:
     env['disable_errorlogs'] = False

 tst = ARGUMENTS.get('disable_tracelogs', False)
 if tst and not (tst == "no"):
-    env['disable_tracelogs'] = True;
+    env['disable_tracelogs'] = True
 else:
     env['disable_tracelogs'] = False

 tst = ARGUMENTS.get('disable_fatallogs', False)
 if tst and not (tst == "no"):
-    env['disable_fatallogs'] = True;
+    env['disable_fatallogs'] = True
 else:
     env['disable_fatallogs'] = False

 tst = ARGUMENTS.get('disable_infologs', False)
 if tst and not (tst == "no"):
-    env['disable_infologs'] = True;
+    env['disable_infologs'] = True
 else:
     env['disable_infologs'] = False

 tst = ARGUMENTS.get('disable_assertlogs', False)
 if tst and not (tst == "no"):
-    env['disable_assertlogs'] = True;
+    env['disable_assertlogs'] = True
 else:
     env['disable_assertlogs'] = False

 tst = ARGUMENTS.get('disable_otherlogs', False)
 if tst and not (tst == "no"):
-    env['disable_otherlogs'] = True;
+    env['disable_otherlogs'] = True
 else:
     env['disable_otherlogs'] = False

@@ -713,7 +713,7 @@ if not env['optimize'] == 'override':
                  'highest': '-O3',
                  'size': '-Os' }
     bigoflag = bigodict[env['optimize']]
-    if not env['optimize'] == 'no':
+    if not env['optimize'] == 'override':
         env.AppendUnique(CFLAGS = [ bigoflag ])
         env.AppendUnique(CXXFLAGS = [ bigoflag ])