diff -Naur EMBOSS-2.7.1/emboss/cirdna.c EMBOSS-2.7.1-patched/emboss/cirdna.c --- EMBOSS-2.7.1/emboss/cirdna.c Fri May 23 15:41:32 2003 +++ EMBOSS-2.7.1-patched/emboss/cirdna.c Sat Nov 1 13:58:37 2003 @@ -25,6 +25,11 @@ #include #include #include + +#include +#include +#include + #define MAXGROUPS 20 #define MAXLABELS 10000 @@ -134,6 +139,7 @@ static AjPStr Style[MAXGROUPS][MAXLABELS]; static AjPStr Name[MAXGROUPS][MAXLABELS]; +static void newmain(int argc, char **argv); /* @prog cirdna *************************************************************** ** @@ -143,6 +149,21 @@ int main(int argc, char **argv) { + struct rlimit rlim; + + if ( getrlimit(RLIMIT_STACK, &rlim) == 0 ) + { + rlim.rlim_cur = rlim.rlim_max; + setrlimit (RLIMIT_STACK, &rlim); + } + + newmain( argc, argv ); + + return 0; +} + +static void newmain(int argc, char **argv) +{ AjPGraph graph; ajint i; ajint j; @@ -196,7 +217,6 @@ float charsize; float minsize; - /* read the ACD file for graphical programs */ ajGraphInit("cirdna", argc, argv); @@ -440,7 +460,6 @@ ajGraphCloseWin(); ajExit(); - return 0; } diff -Naur EMBOSS-2.7.1/emboss/lindna.c EMBOSS-2.7.1-patched/emboss/lindna.c --- EMBOSS-2.7.1/emboss/lindna.c Fri May 23 15:41:32 2003 +++ EMBOSS-2.7.1-patched/emboss/lindna.c Sat Nov 1 14:38:49 2003 @@ -26,6 +26,10 @@ #include #include +#include +#include +#include + #define MAXGROUPS 20 #define MAXLABELS 10000 @@ -134,6 +138,7 @@ /* static float lindna_VerTextSeqLength(float postext, ajint NumNames); */ +static void newmain(int argc, char **argv); @@ -146,6 +151,21 @@ ******************************************************************************/ int main(int argc, char **argv) +{ + struct rlimit rlim; + + if ( getrlimit(RLIMIT_STACK, &rlim) == 0 ) + { + rlim.rlim_cur = rlim.rlim_max; + setrlimit (RLIMIT_STACK, &rlim); + } + + newmain( argc, argv ); + + return 0; +} + +static void newmain(int argc, char **argv) { AjPGraph graph; ajint i; diff -Naur EMBOSS-2.7.1/jemboss/Makefile.in EMBOSS-2.7.1-patched/jemboss/Makefile.in --- EMBOSS-2.7.1/jemboss/Makefile.in Tue Jun 3 08:40:04 2003 +++ EMBOSS-2.7.1-patched/jemboss/Makefile.in Wed Oct 29 17:19:32 2003 @@ -497,12 +497,12 @@ fi install-exec-hook: - rm -f $(bindir)/runJemboss.csh; \ - echo "#!/bin/csh" >> $(bindir)/runJemboss.csh; \ - echo "setenv LD_LIBRARY_PATH $(libdir)" >> $(bindir)/runJemboss.csh; \ - echo "setenv CLASSPATH $(prefix)/share/$(PACKAGE)/jemboss/lib/JembossAlignment.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/xerces.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/mail.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/activation.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jakarta-regexp-1.2.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jalview.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jcert.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jnet.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jsse.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/axis-ant.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/axis.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/commons-discovery.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/commons-logging.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/jaxrpc.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/log4j-1.2.4.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/saaj.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/wsdl4j.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/servlet.jar:$(prefix)/share/$(PACKAGE)/jemboss" >> $(bindir)/runJemboss.csh; \ - echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(bindir)/runJemboss.csh; \ - chmod 755 $(bindir)/runJemboss.csh; + rm -f $(DESTDIR)$(bindir)/runJemboss.csh; \ + echo "#!/bin/csh" >> $(DESTDIR)$(bindir)/runJemboss.csh; \ + echo "setenv LD_LIBRARY_PATH $(libdir)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \ + echo "setenv CLASSPATH $(prefix)/share/$(PACKAGE)/jemboss/lib/JembossAlignment.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/xerces.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/mail.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/activation.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jakarta-regexp-1.2.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jalview.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jcert.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jnet.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/jsse.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/axis-ant.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/axis.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/commons-discovery.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/commons-logging.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/jaxrpc.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/log4j-1.2.4.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/saaj.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/wsdl4j.jar:$(prefix)/share/$(PACKAGE)/jemboss/lib/axis/servlet.jar:$(prefix)/share/$(PACKAGE)/jemboss" >> $(DESTDIR)$(bindir)/runJemboss.csh; \ + echo "(cd $(prefix)/share/$(PACKAGE)/jemboss; java org/emboss/jemboss/Jemboss &)" >> $(DESTDIR)$(bindir)/runJemboss.csh; \ + chmod 755 $(DESTDIR)$(bindir)/runJemboss.csh; # tar to pick up the other directories # then remove any CVS subdirectories diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/Makefile.in Tue Jun 3 08:40:07 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/Makefile.in Wed Oct 29 17:19:33 2003 @@ -476,9 +476,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/Makefile.in Tue Jun 3 08:40:07 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/Makefile.in Wed Oct 29 17:19:33 2003 @@ -482,9 +482,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/filetree/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/filetree/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/filetree/Makefile.in Tue Jun 3 08:40:07 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/filetree/Makefile.in Wed Oct 29 17:19:33 2003 @@ -327,9 +327,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/filetree; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/filetree; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/form/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/form/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/form/Makefile.in Tue Jun 3 08:40:07 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/form/Makefile.in Wed Oct 29 17:19:33 2003 @@ -329,9 +329,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/form; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/form; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/sequenceChooser/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/sequenceChooser/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/sequenceChooser/Makefile.in Tue Jun 3 08:40:07 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/sequenceChooser/Makefile.in Wed Oct 29 17:19:33 2003 @@ -327,9 +327,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/sequenceChooser; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/sequenceChooser; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/startup/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/startup/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/gui/startup/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/gui/startup/Makefile.in Wed Oct 29 17:19:33 2003 @@ -324,9 +324,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/startup; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/gui/startup; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/parser/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/parser/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/parser/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/parser/Makefile.in Wed Oct 29 17:19:33 2003 @@ -479,9 +479,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/parser; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/parser; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/parser/acd/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/parser/acd/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/parser/acd/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/parser/acd/Makefile.in Wed Oct 29 17:19:33 2003 @@ -324,9 +324,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/parser/acd; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/parser/acd; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/programs/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/programs/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/programs/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/programs/Makefile.in Wed Oct 29 17:19:33 2003 @@ -327,9 +327,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/programs; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/programs; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/server/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/server/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/server/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/server/Makefile.in Wed Oct 29 17:19:33 2003 @@ -327,9 +327,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/server; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ if test -f JembossServer.class ; then \ - ${INSTALL_DATA} *.class $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/server; \ + ${INSTALL_DATA} *.class $(DESTDIR)$(pkgdatadir); \ fi \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/org/emboss/jemboss/soap/Makefile.in EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/soap/Makefile.in --- EMBOSS-2.7.1/jemboss/org/emboss/jemboss/soap/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/org/emboss/jemboss/soap/Makefile.in Wed Oct 29 17:19:33 2003 @@ -331,9 +331,9 @@ @if test "${JAVA_OK}" != "yes" ; then \ echo "No class files to copy"; \ else \ - $(top_srcdir)/mkinstalldirs $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/soap; \ + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir); \ for i in *.class; do \ - ${INSTALL_DATA} $$i $(prefix)/share/$(PACKAGE)/jemboss/org/emboss/jemboss/soap; \ + ${INSTALL_DATA} $$i $(DESTDIR)$(pkgdatadir); \ done; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Naur EMBOSS-2.7.1/jemboss/resources/Makefile.in EMBOSS-2.7.1-patched/jemboss/resources/Makefile.in --- EMBOSS-2.7.1/jemboss/resources/Makefile.in Tue Jun 3 08:40:08 2003 +++ EMBOSS-2.7.1-patched/jemboss/resources/Makefile.in Wed Oct 29 17:19:33 2003 @@ -323,14 +323,14 @@ install-exec-hook: @if test "${JAVA_OK}" = "yes" ; then \ - (if test -d $(prefix)/share/$(PACKAGE)/jemboss/resources; then \ + (if test -d $(DESTDIR)$(pkgdatadir); then \ echo "resources exists"; \ else \ - mkdir $(prefix)/share/$(PACKAGE)/jemboss/resources; \ + mkdir $(DESTDIR)$(pkgdatadir); \ fi); \ - rm -f $(prefix)/share/$(PACKAGE)/jemboss/resources/acdstore.jar; \ + rm -f $(DESTDIR)$(pkgdatadir)/acdstore.jar; \ cd $(EMBOSS_TOP)/emboss/acd; \ - jar cvf $(prefix)/share/$(PACKAGE)/jemboss/resources/acdstore.jar *.acd; \ + jar cvf $(DESTDIR)$(pkgdatadir)/acdstore.jar *.acd; \ fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.