Changeset View
Changeset View
Standalone View
Standalone View
net/collabora-online/files/patch-configure.ac
- This file was added.
| --- configure.ac.orig 2026-01-27 20:27:38 UTC | |||||
| +++ configure.ac | |||||
| @@ -48,10 +48,7 @@ COOLWSD_VERSION_HASH="$COOLWSD_VERSION" | |||||
| # try to add a git hash for a version if we're developing | |||||
| COOLWSD_VERSION_HASH="$COOLWSD_VERSION" | |||||
| -git_hash=`cd ${srcdir} && ( cat dist_git_hash 2> /dev/null || git log -1 --format=%h --abbrev=10 2> /dev/null )` | |||||
| -if test "z$git_hash" != "z"; then | |||||
| - COOLWSD_VERSION_HASH=$git_hash | |||||
| -fi | |||||
| +COOLWSD_VERSION_HASH=e808afa229 | |||||
| AC_SUBST([COOLWSD_VERSION_HASH]) | |||||
| AC_DEFINE_UNQUOTED([COOLWSD_VERSION_HASH],[["$COOLWSD_VERSION_HASH"]],[Collabora Online git hash if present]) | |||||
| @@ -1494,10 +1491,13 @@ fi | |||||
| if test "$host_os" != "emscripten"; then | |||||
| LIBS="$LIBS -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}" | |||||
| fi | |||||
| +AS_IF([test "$ENABLE_SSL" = "true"], [ | |||||
| + PKG_CHECK_MODULES([OPENSSL], [openssl], | |||||
| + [LIBS="$LIBS $OPENSSL_LIBS" | |||||
| + CFLAGS="$CFLAGS $OPENSSL_CFLAGS"], | |||||
| + [AC_MSG_ERROR([OpenSSL requested but not found])]) | |||||
| +]) | |||||
| -AS_IF([test "$ENABLE_SSL" = "true"], | |||||
| - [LIBS="$LIBS -lssl -lcrypto"]) | |||||
| - | |||||
| AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true" -a "$host_os" != "emscripten"], | |||||
| [AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h], | |||||
| [], | |||||