Hmmm, a conflict with V1.104 of configure.in remained and broke configure

(said redirection required when run).

After checking using cvsweb, removed the offending conflict.
Rebuilt configure using autoconf, and it now works fine.

diff --git a/configure b/configure
index 1bb525b46737994b00c0d9764fddd2476882a9d8..4d9a5deccc8ba7bbd7225fee06c91a94468bb3c9 100755 (executable)
--- a/configure
+++ b/configure
@@ -8085,26 +8085,13 @@ done
 
 fi
 
-<<<<<<< configure.in
-
-# Finally ready to produce output files ...
-=======
-
 # check whether 'test -ef' works
 if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
   test_ef_works=yes
 else
   test_ef_works=no
 fi
->>>>>>> 1.104
 
-<<<<<<< configure.in
-if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
-  echo $ac_n "preparing build tree... $ac_c" 1>&6
-  /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \
-    || { echo "configure: error: failed" 1>&2; exit 1; }
-  echo "$ac_t""done" 1>&6
-=======
 abs_top_srcdir=
 
 
@@ -8117,7 +8104,6 @@ if test "$test_ef_works" = yes ; then
       || { echo "configure: error: failed" 1>&2; exit 1; }
     echo "$ac_t""done" 1>&6
   fi
->>>>>>> 1.104
 fi
 
 trap '' 1 2 15

diff --git a/configure.in b/configure.in
index e57571957d83c5fb2b5deff453ec7d831495bae8..61bbd77a8d7c2a68df2af05f9f6a75ad7cc36c49 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1145,26 +1145,13 @@ if test -n "$NSGMLS"; then
   AC_CHECK_PROGS(SGMLSPL, sgmlspl)
 fi
 
-<<<<<<< configure.in
-
-# Finally ready to produce output files ...
-=======
-
 # check whether 'test -ef' works
 if (test "$srcdir" -ef "$srcdir") >/dev/null 2>&1 ; then
   test_ef_works=yes
 else
   test_ef_works=no
 fi
->>>>>>> 1.104
-
-<<<<<<< configure.in
-if test x"$abs_top_srcdir" != x"$abs_top_builddir"; then
-  echo $ac_n "preparing build tree... $ac_c" 1>&6
-  /bin/sh "$srcdir/config/prep_buildtree" "$abs_top_srcdir" "$abs_top_builddir" \
-    || AC_MSG_ERROR(failed)
-  AC_MSG_RESULT(done)
-=======
+
 abs_top_srcdir=
 AC_SUBST(abs_top_srcdir)
 
@@ -1177,7 +1164,6 @@ if test "$test_ef_works" = yes ; then
       || AC_MSG_ERROR(failed)
     AC_MSG_RESULT(done)
   fi
->>>>>>> 1.104
 fi
 
 AC_OUTPUT(

diff --git a/contrib/retep/retep.jpx b/contrib/retep/retep.jpx
index 746137dd3066736bf2c347bb5495dbf2e0985c9b..dcf68ac8ceb5689b1c85f3e6f99ef92acc2343fe 100644 (file)
--- a/contrib/retep/retep.jpx
+++ b/contrib/retep/retep.jpx
@@ -40,7 +40,6 @@
   <property category="sys" name="Version" value="1.0" />\r
   <property category="sys" name="VersionLabel" value="@version" />\r
   <property category="sys" name="WorkingDirectory" value="." />\r
-  <node type="Package" name="uk.org.retep.app" />\r
   <node type="Package" name="uk.org.retep.dtu" />\r
   <node type="Package" name="uk.org.retep.tools" />\r
   <node type="Package" name="uk.org.retep.util" />\r

diff --git a/contrib/retep/uk/org/retep/util/StandaloneApp.java b/contrib/retep/uk/org/retep/util/StandaloneApp.java
index 71ac35b73589bc1a6761b4d736bc4f9bcd6f168e..e067963555071c32de62a10fce1beb025d39b439 100644 (file)
--- a/contrib/retep/uk/org/retep/util/StandaloneApp.java
+++ b/contrib/retep/uk/org/retep/util/StandaloneApp.java
@@ -44,7 +44,13 @@ public abstract class StandaloneApp extends JFrame
     Globals.getInstance().parseArguments(aArgs);
 
     // Now initialise this tool (init is overidden)
-    JComponent tool = init();
+    JComponent tool = null;
+    try {
+      tool = init();
+    } catch(Exception ex) {
+      ex.printStackTrace();
+      System.exit(1);
+    }
 
     // Now add to this frame
     this.getContentPane().add(tool, BorderLayout.CENTER);