Changeset 4342

Timestamp:

07/12/07 11:25:45 (6 years ago)

Author:

jgaeddert

Message:

changing OWD-generated configure.ac file to improve automake utilities

Files:

• WaveDev/trunk/WaveDev/wavedev/generate/templates/custom_ports/genStructure.py (modified) (4 diffs)

WaveDev/trunk/WaveDev/wavedev/generate/templates/custom_ports/genStructure.py

@@ -241 +241 @@
      #output.write(tstr)
 
-     #begin changes made when removing aclocal.d
      tstr = 'AC_LANG_PUSH([C++])\n\n'
      output.write(tstr)
@@ -247 +246 @@
      tstr = 'AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORBi4 library])])\n'
      output.write(tstr)
+     tstr = 'AC_CHECK_LIB([omnithread], [main], [], [AC_MSG_ERROR([cannot find omnithread library])])\n'
+     output.write(tstr)
      tstr = 'AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic4 library])])\n'
      output.write(tstr)
@@ -252 +253 @@
      output.write(tstr)
 
+     # TODO: only include standard interfacesi AC_CHECK lines for components
+     if True:
+        tstr = 'AC_CHECK_LIB([standardInterfaces], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces])])\n'
+        output.write(tstr)
+        tstr = 'AC_CHECK_HEADERS([standardinterfaces/complexShort.h], [], [AC_MSG_ERROR([cannot find standardInterfaces header files])])\n\n'
+        output.write(tstr)
+
+     # TODO: Add support for sigproc
+     if False:
+         tstr = 'AC_CHECK_LIB([sigproc], [main], [], [AC_MSG_ERROR([cannot find sigproc library])])\n'
+         output.write(tstr)
+         tstr = 'AC_CHECK_HEADERS([sigproc/SigProc.h], [], [AC_MSG_ERROR([cannot find sigproc library header files])])\n\n'
+         output.write(tstr)
+
      tstr = 'AC_LANG_POP\n\n'
      output.write(tstr)
-
-
-     #end changes made when removing aclocal.d
-
-
-
 
      tstr = 'export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"\n'
@@ -274 +283 @@
          tstr = tstr + 'AC_SUBST(ACE_CFLAGS)\nAC_SUBST(ACE_LIBS)\nLIBS="$LIBS $ACE_LIBS"\n\n'
          output.write(tstr)
-     
-     tstr = 'PKG_CHECK_MODULES(SI, standardInterfaces >= 0.0.1,,exit)\n'
-     output.write(tstr)
-     tstr = 'SI_PATH=`pkg-config --variable=includedir standardInterfaces`\n'
-     output.write(tstr)
-     tstr = 'AC_SUBST(SI_PATH)\n\n'
-     output.write(tstr)
      
      tstr = "AC_CONFIG_FILES(Makefile"