|
 |
206681a |
diff -up EMBOSS-6.3.1/configure.in.system-expat EMBOSS-6.3.1/configure.in
|
|
|
4c174a3 |
--- EMBOSS-6.3.1/configure.in.system-expat 2010-11-09 15:05:50.600682002 -0500
|
|
|
4c174a3 |
+++ EMBOSS-6.3.1/configure.in 2010-11-09 15:06:25.101681999 -0500
|
|
|
4c174a3 |
@@ -424,6 +424,7 @@ AC_ARG_ENABLE(systemlibs,
|
|
|
206681a |
if test "${enable_systemlibs}" = "yes" ; then
|
|
|
206681a |
have_systemlibs=yes
|
|
|
206681a |
AC_CHECK_LIB(pcre, pcre_compile)
|
|
|
206681a |
+ AC_CHECK_LIB(expat, XML_ParserCreate)
|
|
|
206681a |
fi
|
|
|
206681a |
AM_CONDITIONAL(ESYSTEMLIBS, test "$have_systemlibs" = "yes")
|
|
|
206681a |
AC_SUBST(ESYSTEMLIBS)
|
|
|
4c174a3 |
@@ -660,7 +661,7 @@ CHECK_THREADS
|
|
|
4c174a3 |
|
|
|
4c174a3 |
|
|
|
4c174a3 |
AC_OUTPUT([plplot/Makefile plplot/lib/Makefile nucleus/Makefile ajax/Makefile
|
|
|
4c174a3 |
-ajax/expat/Makefile ajax/zlib/Makefile ajax/core/Makefile
|
|
|
4c174a3 |
+ajax/zlib/Makefile ajax/core/Makefile
|
|
|
4c174a3 |
ajax/graphics/Makefile ajax/ensembl/Makefile ajax/ajaxdb/Makefile
|
|
|
4c174a3 |
ajax/acd/Makefile
|
|
|
4c174a3 |
emboss/Makefile emboss/acd/Makefile test/Makefile test/data/Makefile
|
|
|
206681a |
diff -up EMBOSS-6.3.1/configure.system-expat EMBOSS-6.3.1/configure
|
|
|
4c174a3 |
--- EMBOSS-6.3.1/configure.system-expat 2010-11-09 15:05:50.603682002 -0500
|
|
|
4c174a3 |
+++ EMBOSS-6.3.1/configure 2010-11-09 15:06:59.620682003 -0500
|
|
|
4c174a3 |
@@ -14946,6 +14946,51 @@ _ACEOF
|
|
|
206681a |
|
|
|
206681a |
fi
|
|
|
206681a |
|
|
|
206681a |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
|
|
|
206681a |
+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
|
|
|
206681a |
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
|
|
|
206681a |
+ $as_echo_n "(cached) " >&6
|
|
|
206681a |
+else
|
|
|
206681a |
+ ac_check_lib_save_LIBS=$LIBS
|
|
|
206681a |
+LIBS="-lexpat $LIBS"
|
|
|
206681a |
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
206681a |
+/* end confdefs.h. */
|
|
|
206681a |
+
|
|
|
206681a |
+/* Override any GCC internal prototype to avoid an error.
|
|
|
206681a |
+ Use char because int might match the return type of a GCC
|
|
|
206681a |
+ builtin and then its argument prototype would still apply. */
|
|
|
206681a |
+#ifdef __cplusplus
|
|
|
206681a |
+extern "C"
|
|
|
206681a |
+#endif
|
|
|
206681a |
+char XML_ParserCreate ();
|
|
|
206681a |
+int
|
|
|
206681a |
+main ()
|
|
|
206681a |
+{
|
|
|
206681a |
+return XML_ParserCreate ();
|
|
|
206681a |
+ ;
|
|
|
206681a |
+ return 0;
|
|
|
206681a |
+}
|
|
|
206681a |
+_ACEOF
|
|
|
206681a |
+if ac_fn_c_try_link "$LINENO"; then :
|
|
|
206681a |
+ ac_cv_lib_expat_XML_ParserCreate=yes
|
|
|
206681a |
+else
|
|
|
206681a |
+ ac_cv_lib_expat_XML_ParserCreate=no
|
|
|
206681a |
+fi
|
|
|
206681a |
+rm -f core conftest.err conftest.$ac_objext \
|
|
|
206681a |
+ conftest$ac_exeext conftest.$ac_ext
|
|
|
206681a |
+LIBS=$ac_check_lib_save_LIBS
|
|
|
206681a |
+fi
|
|
|
206681a |
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
|
|
|
206681a |
+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
|
|
|
206681a |
+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
|
|
|
206681a |
+ cat >>confdefs.h <<_ACEOF
|
|
|
206681a |
+#define HAVE_LIBEXPAT 1
|
|
|
206681a |
+_ACEOF
|
|
|
206681a |
+
|
|
|
206681a |
+ LIBS="-lexpat $LIBS"
|
|
|
206681a |
+
|
|
|
206681a |
+fi
|
|
|
206681a |
+
|
|
|
206681a |
fi
|
|
|
206681a |
if test "$have_systemlibs" = "yes"; then
|
|
|
206681a |
ESYSTEMLIBS_TRUE=
|
|
|
4c174a3 |
@@ -15299,7 +15344,7 @@ fi
|
|
|
4c174a3 |
|
|
|
4c174a3 |
|
|
|
4c174a3 |
|
|
|
4c174a3 |
-ac_config_files="$ac_config_files plplot/Makefile plplot/lib/Makefile nucleus/Makefile ajax/Makefile ajax/expat/Makefile ajax/zlib/Makefile ajax/core/Makefile ajax/graphics/Makefile ajax/ensembl/Makefile ajax/ajaxdb/Makefile ajax/acd/Makefile emboss/Makefile emboss/acd/Makefile test/Makefile test/data/Makefile test/embl/Makefile test/genbank/Makefile test/pir/Makefile test/swiss/Makefile test/swnew/Makefile test/testdb/Makefile emboss/data/Makefile emboss/data/AAINDEX/Makefile emboss/data/CODONS/Makefile emboss/data/REBASE/Makefile emboss/data/JASPAR_CORE/Makefile emboss/data/JASPAR_FAM/Makefile emboss/data/JASPAR_PHYLOFACTS/Makefile emboss/data/JASPAR_CNE/Makefile emboss/data/JASPAR_POLII/Makefile emboss/data/JASPAR_SPLICE/Makefile emboss/data/JASPAR_PBM/Makefile emboss/data/JASPAR_PBM_HLH/Makefile emboss/data/JASPAR_PBM_HOMEO/Makefile emboss/data/PRINTS/Makefile emboss/data/PROSITE/Makefile doc/Makefile doc/manuals/Makefile doc/tutorials/Makefile doc/programs/Makefile doc/programs/html/Makefile doc/programs/text/Makefile jemboss/Makefile jemboss/images/Makefile jemboss/lib/Makefile jemboss/lib/axis/Makefile jemboss/resources/Makefile jemboss/utils/Makefile Makefile"
|
|
|
4c174a3 |
+ac_config_files="$ac_config_files plplot/Makefile plplot/lib/Makefile nucleus/Makefile ajax/Makefile ajax/zlib/Makefile ajax/core/Makefile ajax/graphics/Makefile ajax/ensembl/Makefile ajax/ajaxdb/Makefile ajax/acd/Makefile emboss/Makefile emboss/acd/Makefile test/Makefile test/data/Makefile test/embl/Makefile test/genbank/Makefile test/pir/Makefile test/swiss/Makefile test/swnew/Makefile test/testdb/Makefile emboss/data/Makefile emboss/data/AAINDEX/Makefile emboss/data/CODONS/Makefile emboss/data/REBASE/Makefile emboss/data/JASPAR_CORE/Makefile emboss/data/JASPAR_FAM/Makefile emboss/data/JASPAR_PHYLOFACTS/Makefile emboss/data/JASPAR_CNE/Makefile emboss/data/JASPAR_POLII/Makefile emboss/data/JASPAR_SPLICE/Makefile emboss/data/JASPAR_PBM/Makefile emboss/data/JASPAR_PBM_HLH/Makefile emboss/data/JASPAR_PBM_HOMEO/Makefile emboss/data/PRINTS/Makefile emboss/data/PROSITE/Makefile doc/Makefile doc/manuals/Makefile doc/tutorials/Makefile doc/programs/Makefile doc/programs/html/Makefile doc/programs/text/Makefile jemboss/Makefile jemboss/images/Makefile jemboss/lib/Makefile jemboss/lib/axis/Makefile jemboss/resources/Makefile jemboss/utils/Makefile Makefile"
|
|
|
4c174a3 |
|
|
|
4c174a3 |
cat >confcache <<\_ACEOF
|
|
|
4c174a3 |
# This file is a shell script that caches the results of configure
|
|
|
4c174a3 |
@@ -16357,7 +16402,6 @@ do
|
|
|
4c174a3 |
"plplot/lib/Makefile") CONFIG_FILES="$CONFIG_FILES plplot/lib/Makefile" ;;
|
|
|
4c174a3 |
"nucleus/Makefile") CONFIG_FILES="$CONFIG_FILES nucleus/Makefile" ;;
|
|
|
4c174a3 |
"ajax/Makefile") CONFIG_FILES="$CONFIG_FILES ajax/Makefile" ;;
|
|
|
4c174a3 |
- "ajax/expat/Makefile") CONFIG_FILES="$CONFIG_FILES ajax/expat/Makefile" ;;
|
|
|
4c174a3 |
"ajax/zlib/Makefile") CONFIG_FILES="$CONFIG_FILES ajax/zlib/Makefile" ;;
|
|
|
4c174a3 |
"ajax/core/Makefile") CONFIG_FILES="$CONFIG_FILES ajax/core/Makefile" ;;
|
|
|
4c174a3 |
"ajax/graphics/Makefile") CONFIG_FILES="$CONFIG_FILES ajax/graphics/Makefile" ;;
|