This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit a23f5aaf7731494d1484f0272a1646643fd459f5 Author: Jim Jagielski <[email protected]> AuthorDate: Mon Aug 3 07:52:10 2026 -0400 Fix libintl.h detection for hunspell's bundled build on Darwin --- ext_libraries/hunspell/makefile.mk | 2 +- main/configure.ac | 7 ++++++- main/set_soenv.in | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ext_libraries/hunspell/makefile.mk b/ext_libraries/hunspell/makefile.mk index 003489cfdc..49959b96f5 100644 --- a/ext_libraries/hunspell/makefile.mk +++ b/ext_libraries/hunspell/makefile.mk @@ -62,7 +62,7 @@ CONFIGURE_FLAGS+= CFLAGS="-xc99=none" CXXFLAGS="-I$(SOLARVER)/$(INPATH)/inc/stl CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)" .ENDIF # "$(EXTRA_CFLAGS)"!="" .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" -CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS) -I$(LIBINTL_PREFIX)/include" --with-libintl-prefix="$(LIBINTL_PREFIX)" .ELIF "$(OS)"=="FREEBSD" # "$(SYSBASE)"!="" CONFIGURE_FLAGS+=CPPFLAGS="-I$(LIBINTL_PREFIX)/include" --with-libintl-prefix="$(LIBINTL_PREFIX)" .ENDIF diff --git a/main/configure.ac b/main/configure.ac index 417c2c2181..b2d1a6ab72 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -6959,7 +6959,7 @@ dnl =================================================================== SYSTEM_GETTEXT=YES AC_SUBST(SYSTEM_GETTEXT) -if test "$_os" = "FreeBSD"; then +if test "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then LIBINTL_PREFIX= for dir in $CPPFLAGS; do if dir=`expr -- $dir : '-I\(.*\)'`; then @@ -6968,6 +6968,11 @@ if test "$_os" = "FreeBSD"; then fi fi done + if test -z "$LIBINTL_PREFIX"; then + for dir in /usr/local /opt/homebrew /opt/local /usr; do + test -f "$dir/include/libintl.h" && LIBINTL_PREFIX=$dir && break + done + fi AC_SUBST(LIBINTL_PREFIX) fi diff --git a/main/set_soenv.in b/main/set_soenv.in index d0218747e2..e0c696e4a9 100644 --- a/main/set_soenv.in +++ b/main/set_soenv.in @@ -1782,6 +1782,7 @@ if ( $platform =~ m/darwin/ ) ToFile( "MACOSX_DEPLOYMENT_TARGET", "@MACOSX_DEPLOYMENT_TARGET@", "e" ); ToFile( "MACOSX_SDK_PATH", "@MACOSX_SDK_PATH@", "e" ); ToFile( "SDKROOT", "@SDKROOT@", "e" ); + ToFile( "LIBINTL_PREFIX", "@LIBINTL_PREFIX@", "e" ); } if ( $platform =~ m/freebsd/ ) {
