Merge pull request #16 from remicollet/issue-submodule

use git submodule for library sources

.github/workflows/ci.yml

@@ -5,19 +5,36 @@ jobs:
     strategy:
       matrix:
           version: ['8.0', '8.1', '8.2', '8.3', '8.4']
+          library:
+            - ''
+            - 'system'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout md4c
         uses: actions/checkout@v4
+      - name: Checkout submodules
+        run: |
+          git submodule update --init --recursive
+        if: ${{ ! matrix.library }}
+      - name: Install library
+        run: |
+          sudo apt-get install -y "automake" "libtool" "libmd4c-dev" "libmd4c-html0-dev"
+        if: ${{ matrix.library }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{matrix.version}}
           tools: phpize
       - name: phpize
         run: phpize
-      - name: configure
-        run: ./configure --enable-md4c
+      - name: configure with bundled library
+        run: |
+          ./configure --enable-md4c
+        if: ${{ ! matrix.library }}
+      - name: configure with library
+        run: |
+          ./configure --enable-md4c --enable-system-libmd4c
+        if: ${{ matrix.library }}
       - name: make
         run: make
       - name: test
@@ -36,6 +53,8 @@ jobs:
     steps:
       - name: Checkout md4c
         uses: actions/checkout@v4
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
       - name: Setup PHP
         id: setup-php
         uses: php/[email protected]

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "md4c"]
-	path = md4c
+[submodule "libmd4c"]
+	path = libmd4c
 	url = https://github.com/mity/md4c

config.m4

@@ -4,21 +4,44 @@ PHP_ARG_ENABLE(md4c, [whether to enable MD4C support],
 	[AS_HELP_STRING([--enable-md4c], [Enable MD4C support])], [yes], [yes])
 
 PHP_ARG_ENABLE(system-libmd4c, [whether to enable system libmd4c library],
-	[AS_HELP_STRING([--enable-system-md4c], [Enable system libmd4c])], [no], [no])
+	[AS_HELP_STRING([--disable-system-libmd4c], [Disable system libmd4c])], [auto], [no])
 
 if test "$PHP_MD4C" != "no"; then
-	if test "$PHP_SYSTEM_LIBMD4C" = "yes"; then
-		AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+	AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+	dnl by default (auto mode) use system library if available
+	if test "$PHP_SYSTEM_LIBMD4C" = "auto"; then
+		AC_MSG_CHECKING([libmd4c])
+		if pkg-config --exists md4c-html; then
+			AC_MSG_RESULT([use available system library])
+			PHP_SYSTEM_LIBMD4C="yes"
+		else
+			AC_MSG_RESULT([use bundled library])
+		fi
+	fi
 
+	if test "$PHP_SYSTEM_LIBMD4C" = "yes"; then
+		dnl use system library
 		PKG_CHECK_MODULES([LIBMD4C_HTML], [md4c-html])
 		PHP_EVAL_INCLINE($LIBMD4C_HTML_CFLAGS)
 		PHP_EVAL_LIBLINE($LIBMD4C_HTML_LIBS, MD4C_SHARED_LIBADD)
 		AC_DEFINE([HAVE_LIBMD4C], 1, [With system libmd4c library])
 
 		LIBMD4C_VERSION=`$PKG_CONFIG md4c-html --modversion`
 		AC_DEFINE_UNQUOTED([PHP_LIBMD4C_VERSION], ["$LIBMD4C_VERSION"], [With system libmd4c library])
+
+		PHP_NEW_EXTENSION(md4c, php_md4c.c, $ext_shared)
+	else
+		dnl use bundled library
+		LIBMD4C_SOURCES="$EXT_SOURCES \
+			libmd4c/src/entity.c \
+			libmd4c/src/md4c.c \
+			libmd4c/src/md4c-html.c \
+		"
+		PHP_NEW_EXTENSION(md4c, php_md4c.c $LIBMD4C_SOURCES, $ext_shared)
+		PHP_ADD_INCLUDE([$ext_srcdir/libmd4c/src])
+		PHP_ADD_BUILD_DIR([$ext_builddir/libmd4c/src])
 	fi
 	PHP_SUBST(MD4C_SHARED_LIBADD)
 	AC_DEFINE(HAVE_MD4C, 1, [ ])
-	PHP_NEW_EXTENSION(md4c, md4c.c, $ext_shared)
 fi

config.w32

@@ -1,5 +1,12 @@
 ARG_ENABLE('md4c', 'Enable the md4c extension', 'no');
 
 if (PHP_MD4C != 'no') {
-    EXTENSION('md4c', 'md4c.c');
+    EXTENSION('md4c', 'php_md4c.c');
+    ADD_SOURCES(configure_module_dirname + "/libmd4c/src", "\
+        entity.c \
+        md4c.c \
+        md4c-html.c",
+        "md4c"
+    );
+    CHECK_HEADER_ADD_INCLUDE("md4c-html.h", "CFLAGS_MD4C", "libmd4c/src/");
 }