You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
147 lines
3.9 KiB
147 lines
3.9 KiB
--- a/ckit/Makefile.am
|
|
+++ b/ckit/Makefile.am
|
|
@@ -2,7 +2,7 @@
|
|
|
|
lib_LTLIBRARIES = libckit.la
|
|
|
|
-AM_CPPFLAGS = -I../h
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/h
|
|
|
|
CKITSRC = datafiles.c next.c seqentry.c strings.c gcg.c pir.c \
|
|
seqspec.c ttyinterface.c nextseqentry.c \
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -635,33 +635,6 @@
|
|
|
|
|
|
|
|
-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 @@
|
|
|
|
|
|
|
|
-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 @@
|
|
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
|
|
@@ -1000,17 +965,13 @@
|
|
|
|
|
|
|
|
-dnl emnu and mse only: uses curses
|
|
-dnl Test if --with-curses is given
|
|
-AC_ARG_WITH([curses],
|
|
- [AS_HELP_STRING([--with-curses],
|
|
- [curses (or ncurses)])])
|
|
-if test "${with_curses}" ; then
|
|
-AC_MSG_CHECKING([for curses])
|
|
-CPPFLAGS="$CPPFLAGS -I${with_curses}/include -I${with_curses}/include/ncurses"
|
|
-LDFLAGS="$LDFLAGS -L${with_curses}/lib"
|
|
-fi
|
|
-AC_CHECK_LIB(ncurses, main, LIBS="$LIBS -lncurses", LIBS="$LIBS -lcurses")
|
|
+dnl Test if --enable-curses is given
|
|
+AC_ARG_ENABLE([curses],
|
|
+[AS_HELP_STRING([--enable-curses], [curses])])
|
|
+
|
|
+AS_IF([test "x$enable_curses" = "xyes"], [
|
|
+ PKG_CHECK_MODULES([NCURSES], [ncurses])
|
|
+])
|
|
|
|
|
|
|
|
--- a/emboss_acd/Makefile.am
|
|
+++ b/emboss_acd/Makefile.am
|
|
@@ -1,3 +1,3 @@
|
|
|
|
-pkgdata_DATA = *.acd
|
|
+pkgdata_DATA = $(srcdir)/*.acd
|
|
pkgdatadir=$(prefix)/share/EMBOSS/acd
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -18,9 +18,7 @@
|
|
-I../../../ajax/ensembl -I../../../ajax/ajaxdb \
|
|
-I../../../ajax/acd -I../../../plplot
|
|
else
|
|
-AM_CPPFLAGS = -I../h -I${embprefix}/include \
|
|
- -I${embprefix}/include/eplplot -I${embprefix}/include/epcre \
|
|
- $(NLINCLUDES)
|
|
+AM_CPPFLAGS = -I$(top_srcdir)/h -I${embprefix}/include $(NLINCLUDES) $(PLPLOT_CFLAGS) $(NCURSES_CFLAGS)
|
|
endif
|
|
|
|
if ISSHARED
|
|
@@ -35,7 +33,7 @@
|
|
-lnucleus -lacd -lajaxdb -lensembl -lajaxg -lajax -lepcre \
|
|
$(NLAIXLIBS) -leplplot
|
|
else
|
|
-AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -L${embprefix}/lib -lnucleus -lacd \
|
|
+AIX_CFLAGS = -Wl,-bdynamic -Wl,-brtl -lnucleus -lacd \
|
|
-lajaxdb -lensembl -lajaxg -lajax -lepcre $(NLAIXLIBS) -leplplot
|
|
endif
|
|
endif
|
|
@@ -59,6 +57,6 @@
|
|
../../../plplot/libeplplot.la \
|
|
$(XLIB)
|
|
else
|
|
-LDADD = ../ckit/libckit.la -L${embprefix}/lib -lnucleus -lacd -lajaxdb \
|
|
- -lensembl -lajaxg -lajax -lepcre $(NLADD) -leplplot $(XLIB)
|
|
+LDADD = ../ckit/libckit.la -lnucleus -lacd -lajaxdb \
|
|
+ -lensembl -lajaxg -lajax $(NLADD) $(NCURSES_LIBS) $(XLIB)
|
|
endif
|