[Xorp-hackers] xorp svn VRRP centos

[Ben Greear]

Could you try this patch instead for mroute detection on your system
and let me know if that works?  It compiles fine on my system, but
I'm not hitting that code branch.

I have all the other patches applied to my tree now..so hopefully
soon it will build w/out modification on CentOS 5.


[greearb at ben-dt2 xorp.ct]$ git diff
diff --git a/site_scons/config/allconfig.py b/site_scons/config/allconfig.py
index 917e640..4a39226 100644
--- a/site_scons/config/allconfig.py
+++ b/site_scons/config/allconfig.py
@@ -557,6 +557,21 @@ def DoAllConfig(env, conf, host_os):
      if has_linux_mroute_h:
          prereq_mroute_h = prereq_linux_mroute_h
          mroute_h = linux_mroute_h
+    else:
+        # Try without netinet/in.h, older releases (CentOS 5, for instance) doesn't need it
+        # and break with it.
+        prereq_linux_mroute_h = []
+        if has_sys_types_h:
+            prereq_linux_mroute_h.append('sys/types.h')
+        if has_sys_socket_h:
+            prereq_linux_mroute_h.append('sys/socket.h')
+        if has_linux_types_h:
+            prereq_linux_mroute_h.append('linux/types.h')
+        linux_mroute_h = 'linux/mroute.h'
+        has_linux_mroute_h = conf.CheckHeader(prereq_linux_mroute_h + [ linux_mroute_h ])
+        if has_linux_mroute_h:
+            prereq_mroute_h = prereq_linux_mroute_h
+            mroute_h = linux_mroute_h

      mfcctl2_includes = []
      for s in prereq_mroute_h + [ mroute_h ]:


-- 
Ben Greear <greearb at candelatech.com>
Candela Technologies Inc  http://www.candelatech.com