(said redirection required when run).
After checking using cvsweb, removed the offending conflict.
Rebuilt configure using autoconf, and it now works fine.
# ... more stuff removed ...
-# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $
+# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/05 10:18:43 peter Exp $
# PGAC_PATH_FLEX
#
# Autoconf macros for configuring the build of Python extension modules
#
-# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $
+# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/05 10:18:43 peter Exp $
#
# PGAC_PROG_PYTHON
# the build of the shared module. Future project.
# PGAC_PATH_PYTHONDIR
-# $Header: /cvsroot/pgsql/configure,v 1.112 2001/03/05 09:38:55 peter Exp $
+# $Header: /cvsroot/pgsql/configure,v 1.113 2001/03/05 10:18:43 peter Exp $
# Autoconf macros to check for Tcl related things
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=
|| { echo "configure: error: failed" 1>&2; exit 1; }
echo "$ac_t""done" 1>&6
fi
->>>>>>> 1.104
fi
trap '' 1 2 15
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)
|| AC_MSG_ERROR(failed)
AC_MSG_RESULT(done)
fi
->>>>>>> 1.104
fi
AC_OUTPUT(
<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
* Note: Because it's designed for standalone use, if this window is closed,
* the JVM is terminated. Do not use for normal application use.
*
- * $Id: StandaloneApp.java,v 1.1 2001/03/05 09:15:36 peter Exp $
+ * $Id: StandaloneApp.java,v 1.2 2001/03/05 10:18:48 peter Exp $
*
* @author
* @version 1.0
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);