Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed both configure scripts.

  • Loading branch information...
commit bdbed5e5548d4cd1d4fb86f8eb57ce3601cda22a 1 parent ee0bb8e
@cataphract authored
Showing with 1 addition and 5 deletions.
  1. +1 −1  config.m4
  2. +0 −4 config.w32
View
2  config.m4
@@ -15,6 +15,6 @@ if test "$PHP_DISCOUNT" != "no"; then
AC_DEFINE(HAVE_DISCOUNT, 1, [Whether you have discount markdown support])
PHP_SUBST(DISCOUNT_SHARED_LIBADD)
- PHP_NEW_EXTENSION(discount, discount.c markdowndoc_class.c markdowndoc_meth_callbacks.c markdowndoc_meth_document.c markdowndoc_meth_header.c markdowndoc_meth_input.c markdowndoc_meth_misc.c markdowndoc_meth_parts.c $discountlib_sources, $ext_shared,,-DUSE_DISCOUNT_DL=1 -DUSE_EXTRA_DL=1 -DTABSTOP=4 -Wall -I@ext_srcdir@/lib)
+ PHP_NEW_EXTENSION(discount, discount.c markdowndoc_class.c markdowndoc_meth_callbacks.c markdowndoc_meth_document.c markdowndoc_meth_header.c markdowndoc_meth_input.c markdowndoc_meth_misc.c markdowndoc_meth_parts.c $discountlib_sources, $ext_shared,,-DUSE_DISCOUNT_DL=1 -DUSE_EXTRA_DL=1 -DTABSTOP=4 -Wall)
PHP_ADD_BUILD_DIR($ext_builddir/lib)
fi
View
4 config.w32
@@ -11,11 +11,7 @@ if (PHP_DISCOUNT != "no") {
generate.c html5.c markdown.c \
mkdio.c resource.c tags.c \
toc.c version.c xml.c \
-<<<<<<< HEAD
- xmlpage.c", "discount");
-=======
xmlpage.c setup.c", "discount");
->>>>>>> 2ba9082cee8f2c7bdf6c93a67ff6438ee4af1a58
AC_DEFINE("HAVE_DISCOUNT", 1, "Discount markdown support");
}
Please sign in to comment.
Something went wrong with that request. Please try again.