Changeset 3250

Timestamp:

03/29/07 17:48:26 (6 years ago)

Author:

DrewCormier

Message:

improved autofoo configure generation for nodes

Files:

• WaveDev/trunk/WaveDev/wavedev/generate/genNode.py (modified) (2 diffs)

WaveDev/trunk/WaveDev/wavedev/generate/genNode.py

@@ -41 +41 @@
         os.mkdir(self.path + self.node.name)
         
-    if os.path.exists(self.path+self.node.name+'/aclocal.d') == False:   
-        os.mkdir(self.path + self.node.name + '/aclocal.d')
-        
-    for x in os.listdir('generate/aclocal.d/'):
-        if not os.path.isdir(x):
-            shutil.copy('generate/aclocal.d/' + x,self.path + self.node.name + '/aclocal.d')
+    #if os.path.exists(self.path+self.node.name+'/aclocal.d') == False:   
+    #    os.mkdir(self.path + self.node.name + '/aclocal.d')
+        
+    #for x in os.listdir('generate/aclocal.d/'):
+    #    if not os.path.isdir(x):
+    #        shutil.copy('generate/aclocal.d/' + x,self.path + self.node.name + '/aclocal.d')
     
     shutil.copy('generate/reconf',self.path + self.node.name)
@@ -123 +123 @@
      output.write(tstr)
      #tstr = "AC_HAVE_XERCES_C\nAC_CORBA_ORB\nAC_CORBA_OMNIEVENTS\n\n"
-     tstr = "AC_CORBA_ORB\n\n"
-     output.write(tstr)
+     #tstr = "AC_CORBA_ORB\n\n"
+     #output.write(tstr)
+        
+     #begin stuff for improved auto foo (no aclocal.d)
+     tstr = "AC_LANG_PUSH([C++])\n\n"
+     output.write(tstr)
+
+     tstr = "AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORBi4 library])])\n"
+     output.write(tstr)
+tstr = "AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic4 library])])\n"
+     output.write(tstr)
+tstr = "AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])])\n\n"
+     output.write(tstr)
+tstr = "AC_LANG_POP\n\n"
+     output.write(tstr)
+     #end stuff for improved autofoo (no aclocal.d)
+     
+
+
+
+
      tstr = 'export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"\n'
      output.write(tstr)