waf-module-find.patch
author Hajime Tazaki <tazaki@nict.go.jp>
Thu, 20 Jun 2013 09:56:26 +0900
changeset 26 0fca5307fd86
permissions -rw-r--r--
update a lot
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     1
diff --git a/ns3waf/__init__.py b/ns3waf/__init__.py
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     2
--- a/ns3waf/__init__.py
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     3
+++ b/ns3waf/__init__.py
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     4
@@ -149,8 +149,23 @@
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     5
                                 args='--cflags --libs', mandatory=mandatory,
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     6
                                 msg="Checking for ns3-%s" % module.lower(),
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     7
                                 uselib_store='NS3_%s' % module.upper())
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     8
+
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
     9
         if not retval is None:
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    10
             found.append(module)
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    11
+        # else:
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    12
+        #     import glob
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    13
+        #     retry_found = False
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    14
+        #     conf.start_msg(" Rechecking for ns3-%s" % module.lower())
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    15
+        #     for lib in glob.glob(conf.env['NS3_DIR'] + '/libns3-dev-%s-%s.so'  % (module.lower() , conf.env['LIB_SUFFIX'])):
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    16
+        #         conf.end_msg("found")
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    17
+        #         found.append(module)
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    18
+        #         retry_found = True
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    19
+
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    20
+        #     if retry_found is False:
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    21
+        #         conf.end_msg("not found")
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    22
+        #         if mandatory:
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    23
+        #             conf.fatal('The configuration failed')
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    24
+
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    25
     import copy
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    26
     if not 'NS3_MODULES_FOUND' in conf.env:
0fca5307fd86 update a lot
Hajime Tazaki <tazaki@nict.go.jp>
parents:
diff changeset
    27
         conf.env['NS3_MODULES_FOUND'] = []