diff options
Diffstat (limited to 'sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch')
-rw-r--r-- | sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch b/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch deleted file mode 100644 index 56f5814e1efa..000000000000 --- a/sci-biology/embassy-meme/files/embassy-meme-4.7.650_fix-build-system.patch +++ /dev/null @@ -1,100 +0,0 @@ - configure.ac | 49 +++++++------------------------------------------ - src/Makefile.am | 6 ++---- - 2 files changed, 9 insertions(+), 46 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 391989f..d921f25 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -635,33 +635,6 @@ AS_CASE([${host_os}], - - - --dnl PCRE library definitions - see the MAJOR and MINOR values --dnl to see which version's configure.in these lines come from -- --dnl Provide the current PCRE version information. Do not use numbers --dnl with leading zeros for the minor version, as they end up in a C --dnl macro, and may be treated as octal constants. Stick to single --dnl digits for minor numbers less than 10. There are unlikely to be --dnl that many releases anyway. -- --PCRE_MAJOR="7" --PCRE_MINOR="9" --PCRE_DATE="11-Apr-2009" --PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}" -- --dnl Default values for miscellaneous macros -- --POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10" -- --dnl Provide versioning information for libtool shared libraries that --dnl are built by default on Unix systems. -- --PCRE_LIB_VERSION="0:1:0" --PCRE_POSIXLIB_VERSION="0:0:0" -- -- -- -- - dnl FIXME: This does no longer seem required with Autoconf 2.67? - dnl Intel MacOSX 10.6 puts X11 in a non-standard place - dnl AS_IF([test "x${with_x}" != "xno"], -@@ -737,21 +710,6 @@ AX_LIB_POSTGRESQL - - - --dnl "Export" these variables for PCRE -- --AC_SUBST([HAVE_MEMMOVE]) --AC_SUBST([HAVE_STRERROR]) --AC_SUBST([PCRE_MAJOR]) --AC_SUBST([PCRE_MINOR]) --AC_SUBST([PCRE_DATE]) --AC_SUBST([PCRE_VERSION]) --AC_SUBST([PCRE_LIB_VERSION]) --AC_SUBST([PCRE_POSIXLIB_VERSION]) --AC_SUBST([POSIX_MALLOC_THRESHOLD]) -- -- -- -- - dnl Test if --enable-localforce given - locallink="no" - embprefix="/usr/local" -@@ -874,6 +832,13 @@ AC_ARG_ENABLE([systemlibs], - AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"]) - - -+AS_IF([test "x${enable_systemlibs}" = "xyes"], -+[ -+dnl using system libraries -+ PKG_CHECK_MODULES([PLPLOT], [plplotd], -+ [],[PKG_CHECK_MODULES([PLPLOT], [plplot])] -+ ) -+]) - - - # Enable the purify tool: --enable-purify, sets CC and LIBTOOL -diff --git a/src/Makefile.am b/src/Makefile.am -index 1600399..9f28162 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -17,9 +17,7 @@ AM_CPPFLAGS = -I../../../nucleus -I../../../ajax/pcre \ - -I../../../ajax/ensembl -I../../../ajax/ajaxdb \ - -I../../../ajax/acd -I../../../plplot - else --AM_CPPFLAGS = -I${embprefix}/include -I${embprefix}/include/eplplot \ -- $(NLINCLUDES) \ -- -I${embprefix}/include/epcre -+AM_CPPFLAGS = -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS) - endif - - if ISSHARED -@@ -60,5 +58,5 @@ LDADD = ../../../nucleus/libnucleus.la ../../../ajax/acd/libacd.la \ - $(XLIB) - else - LDADD = -L${embprefix}/lib -lnucleus -lacd -lajaxdb -lensembl -lajaxg \ -- -lajax -lepcre $(NLADD) -leplplot $(XLIB) -+ -lajax $(NLADD) $(XLIB) - endif |