diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-27 03:39:51 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-27 03:39:51 +0000 |
| commit | 27bfafbc11525b11408ea6f5091a0aa88caa3216 (patch) | |
| tree | 037d5fa753631274e8288430d7f247825c26fc9d | |
| parent | de17026cfffde5245544e0e83fa90cbe786a2378 (diff) | |
| download | ATCD-27bfafbc11525b11408ea6f5091a0aa88caa3216.tar.gz | |
ChangeLogTag: Fri Nov 26 19:38:58 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index be568ea2190..868c29632fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 26 19:38:58 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * configure.ac: + * Makefile.am: + + Use AC_SUBST instead of AM_CONDITIONAL for directories that may + be omitted in a distribution. + Fri Nov 26 17:54:32 2004 J.T. Conklin <jtc@acorntoolworks.com> * bin/tao_other_tests.lst: diff --git a/Makefile.am b/Makefile.am index 0961f152d7a..10b94178509 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,15 +24,9 @@ SUBDIRS += \ performance-tests \ protocols \ tests \ - websvcs - -if BUILD_KOKYU -SUBDIRS += Kokyu -endif - -if BUILD_TAO -SUBDIRS += TAO -endif + websvcs \ + @KOKYU@ \ + @TAO@ man_MANS = ace-config.1 diff --git a/configure.ac b/configure.ac index ef7c8532300..d6f827bbae6 100644 --- a/configure.ac +++ b/configure.ac @@ -7476,12 +7476,14 @@ if test -d $srcdir/Kokyu; then Kokyu/tests/EDF/Makefile Kokyu/tests/FIFO/Makefile ]) + AC_SUBST([KOKYU],[Kokyu]) fi AM_CONDITIONAL([BUILD_KOKYU], [test -d $srcdir/Kokyu]) if test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes; then AC_CONFIG_SUBDIRS([TAO]) + AC_SUBST([TAO],[TAO]) fi AM_CONDITIONAL([BUILD_TAO], [test -d $srcdir/TAO -a X$ace_user_with_tao = Xyes]) |