[Xorp-cvs] SF.net SVN: xorp:[11698] trunk/xorp

[greear at users.sourceforge.net]

Revision: 11698
          http://xorp.svn.sourceforge.net/xorp/?rev=11698&view=rev
Author:   greear
Date:     2010-04-29 15:10:56 +0000 (Thu, 29 Apr 2010)

Log Message:
-----------
libboost:  Remove use of boost-regex.

The rest of boost usage is not changed, but I think this will
make boost only a compile-time requirement, not run-time, which
in turn should help users installing binary packages.

Signed-off-by: Ben Greear <greearb at candelatech.com>

Modified Paths:
--------------
    trunk/xorp/SConstruct
    trunk/xorp/cli/SConscript
    trunk/xorp/cli/cli_command_pipe.hh
    trunk/xorp/policy/backend/instruction.hh
    trunk/xorp/policy/common/SConscript
    trunk/xorp/policy/common/policy_utils.cc
    trunk/xorp/site_scons/config/allconfig.py

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/SConstruct	2010-04-29 15:10:56 UTC (rev 11698)
@@ -379,7 +379,7 @@
     # Additional Boost libraries
     #conf.CheckBoostLibrary('filesystem')
     #conf.CheckBoostLibrary('program_options')
-    conf.CheckBoostLibrary('regex')
+    #conf.CheckBoostLibrary('regex')
     #conf.CheckBoostLibrary('signals')
     #conf.CheckBoostLibrary('thread')
 

Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/cli/SConscript	2010-04-29 15:10:56 UTC (rev 11698)
@@ -58,9 +58,9 @@
     ])
 
 # External libraries.
-env.AppendUnique(LIBS = [
-    'boost_regex'
-])
+#env.AppendUnique(LIBS = [
+#    'boost_regex'
+#])
 
 env.Replace(RPATH = [
     env.Literal(env['xorp_tool_rpath'])

Modified: trunk/xorp/cli/cli_command_pipe.hh
===================================================================
--- trunk/xorp/cli/cli_command_pipe.hh	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/cli/cli_command_pipe.hh	2010-04-29 15:10:56 UTC (rev 11698)
@@ -34,7 +34,16 @@
 #include <string>
 #include <list>
 
-#include <boost/regex.h>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "cli_command.hh"
 

Modified: trunk/xorp/policy/backend/instruction.hh
===================================================================
--- trunk/xorp/policy/backend/instruction.hh	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/backend/instruction.hh	2010-04-29 15:10:56 UTC (rev 11698)
@@ -25,7 +25,16 @@
 
 #include "libxorp/xorp.h"
 
-#include <boost/cregex.hpp>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "policy/common/element_base.hh"
 #include "policy/common/operator_base.hh"

Modified: trunk/xorp/policy/common/SConscript
===================================================================
--- trunk/xorp/policy/common/SConscript	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/common/SConscript	2010-04-29 15:10:56 UTC (rev 11698)
@@ -39,9 +39,9 @@
     ]
 
 # External libraries
-env.AppendUnique(LIBS = [
-    'boost_regex'
-])
+#env.AppendUnique(LIBS = [
+#    'boost_regex'
+#])
 
 is_shared = env.has_key('SHAREDLIBS')
 

Modified: trunk/xorp/policy/common/policy_utils.cc
===================================================================
--- trunk/xorp/policy/common/policy_utils.cc	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/policy/common/policy_utils.cc	2010-04-29 15:10:56 UTC (rev 11698)
@@ -22,7 +22,16 @@
 
 #include "libxorp/xorp.h"
 
-#include <boost/regex.h>
+#ifdef HAVE_REGEX_H
+#  include <regex.h>
+#else // ! HAVE_REGEX_H
+#  ifdef HAVE_PCRE_H
+#    include <pcre.h>
+#  endif
+#  ifdef HAVE_PCREPOSIX_H
+#    include <pcreposix.h>
+#  endif
+#endif // ! HAVE_REGEX_H
 
 #include "policy_utils.hh"
 

Modified: trunk/xorp/site_scons/config/allconfig.py
===================================================================
--- trunk/xorp/site_scons/config/allconfig.py	2010-04-26 03:12:29 UTC (rev 11697)
+++ trunk/xorp/site_scons/config/allconfig.py	2010-04-29 15:10:56 UTC (rev 11698)
@@ -83,10 +83,10 @@
     has_pwd_h = conf.CheckHeader('pwd.h')
     has_mqueue_h = conf.CheckHeader('mqueue.h')
 
-    #prereq_regex_h = []
-    #if has_sys_types_h:
-    #	prereq_regex_h.append('sys/types.h')
-    #has_regex_h = conf.CheckHeader(prereq_regex_h + ['regex.h'])
+    prereq_regex_h = []
+    if has_sys_types_h:
+    	prereq_regex_h.append('sys/types.h')
+    has_regex_h = conf.CheckHeader(prereq_regex_h + ['regex.h'])
 
     has_syslog_h = conf.CheckHeader('syslog.h')
     has_termios_h = conf.CheckHeader('termios.h')
@@ -660,10 +660,10 @@
     ##########
     # pcre posix regexp emulation
     # used by policy for regexps.
-    #has_pcre_h = conf.CheckHeader('pcre.h')
-    #has_pcreposix_h = conf.CheckHeader('pcreposix.h')
-    #has_libpcre = conf.CheckLib('pcre')
-    #has_libpcreposix = conf.CheckLib('pcreposix')
+    has_pcre_h = conf.CheckHeader('pcre.h')
+    has_pcreposix_h = conf.CheckHeader('pcreposix.h')
+    has_libpcre = conf.CheckLib('pcre')
+    has_libpcreposix = conf.CheckLib('pcreposix')
     
     ##########
     # openssl for md5


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.