From f6f2987fadf9c85a41d44cba4d3e25465cff8ceb Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 8 Jul 1999 14:58:20 +0000 Subject: [PATCH] added bin and java sub directories some more tests git-svn-id: https://svn.code.sf.net/p/jode/code/branches/stable@1057 379699f6-c40d-0410-875b-85095c16579e --- jode/Makefile.am | 2 +- jode/acinclude.m4 | 5 +++-- jode/configure.in | 23 +++++++++++++++++------ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/jode/Makefile.am b/jode/Makefile.am index 304113b..b0ee681 100644 --- a/jode/Makefile.am +++ b/jode/Makefile.am @@ -1,5 +1,5 @@ ## Input file for automake to generate the Makefile.in used by configure -SUBDIRS = jode doc test +SUBDIRS = jode bin doc test EXTRA_DIST = TODO diff --git a/jode/acinclude.m4 b/jode/acinclude.m4 index a7ef9df..8434847 100644 --- a/jode/acinclude.m4 +++ b/jode/acinclude.m4 @@ -6,8 +6,9 @@ dnl dnl JODE_CHECK_JAVA(path) AC_DEFUN(JODE_CHECK_JAVA, [ - AC_PATH_PROG(JAVAC, javac, "", $PATH:$1/bin) - AC_PATH_PROG(JAR, jar, "", $PATH:$1/bin) + AC_PATH_PROG(JAVA, java, "", $1/bin:$1/jre/bin:$PATH) + AC_PATH_PROG(JAVAC, javac, "", $1/bin:$PATH) + AC_PATH_PROG(JAR, jar, "", $1/bin:$PATH) for path in $1/lib $1/jre/lib $1/shared; do for classlib in classes.zip rt.jar; do AC_CHECK_FILES($path/$classlib, diff --git a/jode/configure.in b/jode/configure.in index beb8e1c..75fb50e 100644 --- a/jode/configure.in +++ b/jode/configure.in @@ -108,21 +108,32 @@ JODE_CHECK_CLASS(javax.swing.JFrame, $CLASSPATH:$CLASSLIB, AC_MSG_RESULT($JAVAX_SWING) AC_SUBST(JAVAX_SWING) if test x"$JAVAX_SWING" != x; then - SWING_CLASSES="jode/swingui/Main.class" + SWINGUI="swingui" else AC_MSG_WARN(Swing is not in classpath ... skipping swingui) - SWING_CLASSES="" + SWINGUI="" fi -AC_SUBST(SWING_CLASSES) +AC_SUBST(SWINGUI) AC_SUBST(CLASSPATH) AC_SUBST(JAVAC) AC_OUTPUT(Makefile jode/Makefile -doc/Makefile -test/Makefile +jode/bytecode/Makefile +jode/decompiler/Makefile +jode/expr/Makefile +jode/flow/Makefile +jode/jvm/Makefile +jode/obfuscator/Makefile +jode/swingui/Makefile +jode/type/Makefile +jode/util/Makefile jode/GlobalOptions.java jode/swingui/Main.java -jode/swingui/PackagesTreeModel.java) +jode/swingui/PackagesTreeModel.java +bin/Makefile +bin/jode +doc/Makefile +test/Makefile)