diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-17 16:56:28 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-17 16:56:28 +0000 |
| commit | 109e10fa412205ad3533553305ada9ce987c3e7c (patch) | |
| tree | 0c23f1e3736da03c678c22a6a57f2978153d805b | |
| parent | 97caa77773bbb37d850d77292814d0fa727d551c (diff) | |
| download | ATCD-109e10fa412205ad3533553305ada9ce987c3e7c.tar.gz | |
ChangeLogTag: Wed Nov 17 08:53:11 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | ace/Makefile.am | 1 | ||||
| -rw-r--r-- | ace/ace.mpc | 1 | ||||
| -rw-r--r-- | configure.ac | 23 |
5 files changed, 40 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 1d55e1cc4ab..32de0f68087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Wed Nov 17 08:53:11 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/Makefile.am: + + Updated. + + * ace/ace.mpc: + + Added Memory_Pool.h to Header_Files. + + * Makefile.am: + * configure.ac: + + Changed to configure/build ACEXML only if --with-acexml (the + default) was specified. + Tue Nov 16 07:09:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/RB_Tree.cpp: diff --git a/Makefile.am b/Makefile.am index 02101e372ea..0961f152d7a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,8 +10,13 @@ SUBDIRS = \ ace \ - ASNMP \ - ACEXML \ + ASNMP + +if BUILD_ACEXML +SUBDIRS += ACEXML +endif + +SUBDIRS += \ apps \ bin \ examples \ @@ -31,7 +36,7 @@ endif man_MANS = ace-config.1 -bin_scripts = ace-config +bin_SCRIPTS = ace-config ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = -I m4 diff --git a/ace/Makefile.am b/ace/Makefile.am index 06c58dc5ae7..ed8a0ebdc19 100644 --- a/ace/Makefile.am +++ b/ace/Makefile.am @@ -545,6 +545,7 @@ nobase_include_HEADERS = \ Map_Manager.h \ Map_T.h \ Mem_Map.h \ + Memory_Pool.h \ Message_Block.h \ Message_Block_T.h \ Message_Queue.h \ diff --git a/ace/ace.mpc b/ace/ace.mpc index 7e3f5571fb2..debfc277490 100644 --- a/ace/ace.mpc +++ b/ace/ace.mpc @@ -429,6 +429,7 @@ project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token, Log_Priority.h Malloc_Base.h Method_Object.h + Memory_Pool.h Min_Max.h Null_Barrier.h Null_Condition.h diff --git a/configure.ac b/configure.ac index 707eb1b6f92..ef7c8532300 100644 --- a/configure.ac +++ b/configure.ac @@ -7304,15 +7304,6 @@ AC_CONFIG_FILES([ ASNMP/examples/trap/Makefile ASNMP/examples/walk/Makefile ASNMP/tests/Makefile - ACEXML/Makefile - ACEXML/common/Makefile - ACEXML/parser/Makefile - ACEXML/parser/parser/Makefile - ACEXML/apps/Makefile - ACEXML/apps/svcconf/Makefile - ACEXML/examples/Makefile - ACEXML/examples/SAXPrint/Makefile - ACEXML/tests/Makefile apps/Makefile apps/Gateway/Makefile apps/Gateway/Gateway/Makefile @@ -7463,6 +7454,20 @@ AC_CONFIG_FILES([ ]) dnl Configure subdirectories if they are present. +if test -d $srcdir/ACEXML -a X$ace_user_with_acexml = Xyes; then + AC_CONFIG_FILES([ + ACEXML/Makefile + ACEXML/common/Makefile + ACEXML/parser/Makefile + ACEXML/parser/parser/Makefile + ACEXML/apps/Makefile + ACEXML/apps/svcconf/Makefile + ACEXML/examples/Makefile + ACEXML/examples/SAXPrint/Makefile + ACEXML/tests/Makefile + ]) +fi + if test -d $srcdir/Kokyu; then AC_CONFIG_FILES([ Kokyu/Makefile |