ChangeLogTag: Wed Nov 22 16:48:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 41 insertions, 12 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index dbd975073a4..47483db2f2e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,26 @@
+Wed Nov 22 16:48:58 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * Makefile.am:
+
+          Hand tweak, HTBP tests depend on Test_Output library.  This
+          requires changing the build order so that the protocols dir
+          is built after tests.
+
+        * apps/gperf/tests/Makefile.am:
+
+          Hand tweak to find gperf executable on automake builds.  Chad
+          has given me info to make MPC generation work, which I'll add
+          in the near future.
+
+        * m4/ace.m4:
+
+          Placeholder for a BUILD_WXWINDOWS feature test.  For now it
+          always returns false.
+
+        * configure.ac:
+
+          Configure examples/ConfigViewer/Makefile.
+
 Wed Nov 22 15:34:12 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * ace/Version.h:
diff --git a/ACE/Makefile.am b/ACE/Makefile.am
index 340e2a53ff1..b659276338c 100644
--- a/ACE/Makefile.am
+++ b/ACE/Makefile.am
@@ -19,8 +19,7 @@ endif
 SUBDIRS += \
         apps \
         bin \
-        netsvcs \
-        protocols 
+        netsvcs
 
 if BUILD_EXAMPLES
 SUBDIRS += examples
@@ -32,6 +31,7 @@ SUBDIRS += tests
 endif
 
 SUBDIRS += \
+        protocols \
         websvcs \
 	@KOKYU@ \
 	@TAO@
diff --git a/ACE/apps/gperf/tests/Makefile.am b/ACE/apps/gperf/tests/Makefile.am
index 763debfda15..027d848b869 100644
--- a/ACE/apps/gperf/tests/Makefile.am
+++ b/ACE/apps/gperf/tests/Makefile.am
@@ -26,7 +26,7 @@ CLEANFILES += \
   ada.cpp
 
 ada.cpp: $(srcdir)/ada.gperf
-	$(ACE_ROOT)/bin/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp
+	../src/gperf -a -k1,4,$$ $(srcdir)/ada.gperf > ada.cpp
 
 noinst_PROGRAMS += aout
 
@@ -54,7 +54,7 @@ CLEANFILES += \
   c.cpp
 
 c.cpp: $(srcdir)/c.gperf
-	$(ACE_ROOT)/bin/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp
+	../src/gperf -a -p -c -l -S1 -o $(srcdir)/c.gperf > c.cpp
 
 noinst_PROGRAMS += cout
 
@@ -82,7 +82,7 @@ CLEANFILES += \
   cpp.cpp
 
 cpp.cpp: $(srcdir)/cpp.gperf
-	$(ACE_ROOT)/bin/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp
+	../src/gperf -a -D $(srcdir)/cpp.gperf > cpp.cpp
 
 noinst_PROGRAMS += cppout
 
@@ -110,7 +110,7 @@ CLEANFILES += \
   idl.cpp
 
 idl.cpp: $(srcdir)/idl.gperf
-	$(ACE_ROOT)/bin/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp
+	../src/gperf -m -M -c -C -D -S1 -E -T -a -o -p $(srcdir)/idl.gperf > idl.cpp
 
 noinst_PROGRAMS += iout
 
@@ -139,7 +139,7 @@ CLEANFILES += \
 
 iout2_gen/idl.cpp: $(srcdir)/idl.gperf
 	mkdir -p iout2_gen
-	$(ACE_ROOT)/bin/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp
+	../src/gperf -m -M -c -C -D -E -T -a -o -p $(srcdir)/idl.gperf > iout2_gen/idl.cpp
 
 noinst_PROGRAMS += iout2
 
@@ -167,7 +167,7 @@ CLEANFILES += \
   modula3.cpp
 
 modula3.cpp: $(srcdir)/modula3.gperf
-	$(ACE_ROOT)/bin/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp
+	../src/gperf -a -k1,2,$$ $(srcdir)/modula3.gperf > modula3.cpp
 
 noinst_PROGRAMS += m3out
 
@@ -195,7 +195,7 @@ CLEANFILES += \
   pascal.cpp
 
 pascal.cpp: $(srcdir)/pascal.gperf
-	$(ACE_ROOT)/bin/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp
+	../src/gperf -a -o -S2 -p $(srcdir)/pascal.gperf > pascal.cpp
 
 noinst_PROGRAMS += pout
 
@@ -223,7 +223,7 @@ CLEANFILES += \
   adadefs.cpp
 
 adadefs.cpp: $(srcdir)/adadefs.gperf
-	$(ACE_ROOT)/bin/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp
+	../src/gperf -a -p -D -k1,$$ -s 2 -o $(srcdir)/adadefs.gperf > adadefs.cpp
 
 noinst_PROGRAMS += preout
 
@@ -251,7 +251,7 @@ CLEANFILES += \
   tao.cpp
 
 tao.cpp: $(srcdir)/tao.gperf
-	$(ACE_ROOT)/bin/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp
+	../src/gperf -c -C -D -E -f 0 -a -o $(srcdir)/tao.gperf > tao.cpp
 
 noinst_PROGRAMS += taoout
 
@@ -279,7 +279,7 @@ CLEANFILES += \
   corba.cpp
 
 corba.cpp: $(srcdir)/corba.gperf
-	$(ACE_ROOT)/bin/gperf -a -o $(srcdir)/corba.gperf > corba.cpp
+	../src/gperf -a -o $(srcdir)/corba.gperf > corba.cpp
 
 noinst_PROGRAMS += tout
 
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 659297b3181..4718b6c70cd 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -7902,6 +7902,7 @@ if test $ace_build_examples = yes; then
     examples/Bounded_Packet_Relay/Makefile
     examples/C++NPv1/Makefile
     examples/C++NPv2/Makefile
+    examples/ConfigViewer/Makefile
     examples/Connection/Makefile
     examples/Connection/blocking/Makefile
     examples/Connection/misc/Makefile
diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4
index 96b7d334767..1c854152de2 100644
--- a/ACE/m4/ace.m4
+++ b/ACE/m4/ace.m4
@@ -487,6 +487,9 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
  ACE_ENABLE_TK_REACTOR
  ACE_ENABLE_XT_REACTOR
 
+ # placeholder for WxWindows/wxWidgets support
+ AM_CONDITIONAL([BUILD_WXWINDOWS], false)
+
  AC_ARG_ENABLE([gperf],
   AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]),
   [
@@ -1417,3 +1420,5 @@ AM_CONDITIONAL([BUILD_ACE_XTREACTOR],
 AM_CONDITIONAL([BUILD_TAO_XTRESOURCE],
                [test X$ace_user_enable_xt_reactor = Xyes])
 ])
+
+