cleanup: Rename a few badly-chosen variables.

[tripe] / configure.in

diff --git a/configure.in b/configure.in
index 522ed65692943153bea7910b170f06bc1b6f2bed..972fcf604574a5845ac600076f4405e845a95612 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,18 +25,21 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with TrIPE; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-AC_INIT(tripe.c)
+AC_INIT(server/tripe.c)
 AM_INIT_AUTOMAKE(tripe, 1.0.0pre7)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(common/config.h)
 AC_CANONICAL_HOST
 
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AM_PROG_LIBTOOL
+DIRS="" AC_SUBST([DIRS])
+
 python=no
 mdw_PROG_PYTHON([2.3], 
   [python=yes
-   pyscripts='${PYTHONSCRIPTS}' 
+   pyscripts='${PYTHONSCRIPTS}'
+   DIRS="$DIRS keys"
    pymans='${PYTHONMANS}'])
 AC_SUBST([pyscripts]) AC_SUBST([pymans])
 
@@ -52,6 +55,7 @@ import gtk
   ])
   if test $mdw_cv_pygtk = yes; then
     pygtkscripts='${PYGTKSCRIPTS}'
+    DIRS="$DIRS mon"
     pygtkmans='${PYGTKMANS}'
   fi
 fi
@@ -96,11 +100,10 @@ AC_ARG_WITH([logfile],
 [logfile=$withval],
 [logfile=tripe.log])
 
-DIRS=""
 WIRESHARK_CFLAGS=""
 WIRESHARK_PLUGIN_DIR="unknown"
 AC_ARG_WITH([wireshark],
-[  --with-wireshark         build and install Wireshark plugin],
+[  --with-wireshark        build and install Wireshark plugin],
 [case "$withval" in
    no) wireshark=false requirewireshark=false;;
    yes) wireshark=true; requirewireshark=true;;
@@ -249,9 +252,14 @@ mdw_DEFINE_PATHS([
   AC_SUBST(socketdir) AC_SUBST(configdir) AC_SUBST(logfile) AC_SUBST(pidfile)
   AC_SUBST(initconfig)
 ])
-AC_SUBST(DIRS)
 AC_OUTPUT( \
-       Makefile doc/Makefile wireshark/Makefile \
-       tripe-init tripe-keys tripemon)
+       Makefile \
+       common/Makefile client/Makefile server/Makefile \
+       proxy/Makefile pkstream/Makefile \
+       doc/Makefile \
+       wireshark/Makefile \
+       init/Makefile init/tripe-init \
+       keys/Makefile keys/tripe-keys \
+       mon/Makefile mon/tripemon)
 
 dnl ----- That's all, folks -------------------------------------------------