Skip to content

Update configure.ac for macOS /opt and updates #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MarioG-X wants to merge 2 commits into from
Closed

Update configure.ac for macOS /opt and updates #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87fdaf9
Update configure.ac for macOS /opt and updates
MarioG-X Jun 15, 2025
2d3703a
Update configure.ac remove /opt default for macOS
MarioG-X Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 28 additions & 37 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
esac
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
case "$host" in
# older Xcode test for darwin, Xcode 4/5 use clang above
*darwin*)
SOLINK="-dynamic -bundle -force-flat-namespace"
;;
*-solaris2*)
SOLINK="-shared -Xlinker"
;;
Expand Down Expand Up @@ -428,15 +424,6 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
fi
if test "${enable_64}" = "yes"; then
case "$host" in
*darwin*)
osxvrm=`sw_vers -productVersion` # Get version.release.modlevel
osxrel=`echo $osxvrm | cut -d. -f2` # Get release only
if test "$osxrel" -ge 4; then # 10.4 and up are x64
APR_ADDTO(CFLAGS, -arch x86_64)
APR_ADDTO(LDFLAGS, -arch x86_64)
APR_ADDTO(CXXFLAGS, -arch x86_64)
fi
;;
*-solaris2*)
APR_ADDTO(CFLAGS, -m64)
APR_ADDTO(LDFLAGS, -m64)
Expand Down Expand Up @@ -653,8 +640,10 @@ path_push_unique () {
AC_PATH_PROG([PG_CONFIG], [pg_config], [no])
AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])

# These 2 x86 libraries are not required on macOS 15 Sequoia on x86 as of June 2025. Not needed on aarch64 systems.
# They are left here since they are likely required on older macOS systems.
case $host in
*-darwin*)
x86_64-apple-darwin*)
path_push_unique PKG_CONFIG_PATH /usr/local/opt/libpq/lib/pkgconfig
path_push_unique PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig
;;
Expand Down Expand Up @@ -735,33 +724,33 @@ PLATFORM_CORE_LIBS=
# tweak platform specific flags
case "$host" in
*darwin*)
# Common Apple Darwin settings
case "$host" in
aarch64-apple-darwin*)
# Homebrew package required libraries on Apple Silicon
APR_ADDTO(CPPFLAGS, -I/opt/homebrew/include)
APR_ADDTO(LDFLAGS, -L/opt/homebrew/lib)
;;
*)
# Default package libraries on Apple x86_64
# The following 4 x86_64 libraries are not required on macOS 15 Sequoia as of June 2025.
# They are left here since they are likely required on older macOS systems.
APR_ADDTO(CPPFLAGS, -I/usr/local/include) # Xcode 6 drops std lib search, add it to clang
APR_ADDTO(LDFLAGS, -L/usr/local/lib) # Xcode 6 drops std lib search, add it to clang
APR_ADDTO(CPPFLAGS, -I/usr/local/opt/openssl/include)
APR_ADDTO(LDFLAGS, -L/usr/local/opt/openssl/lib)
;;
esac
# Common Apple Clang flags
APR_ADDTO(CFLAGS, -pipe)
APR_ADDTO(LDFLAGS, -pipe)
APR_ADDTO(CXXFLAGS, -pipe)
# Common Apple Darwin settings
APR_ADDTO(SWITCH_AM_CFLAGS, -DMACOSX)
APR_REMOVEFROM(SWITCH_AM_CFLAGS, -fPIC)
APR_ADDTO(CPPFLAGS, -I/usr/local/opt/openssl/include)
APR_ADDTO(LDFLAGS, -L/usr/local/opt/openssl/lib)
APR_ADDTO(CPPFLAGS, -I/opt/homebrew/include)
APR_ADDTO(LDFLAGS, -L/opt/homebrew/lib)
if test "x$enable_core_odbc_support" != "xno"; then
APR_ADDTO([PLATFORM_CORE_LDFLAGS], [--framework CoreFoundation])
fi
APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl])
# Get OSX and clang version
osxvrm=`sw_vers -productVersion` # Get version.release.modlevel
osxrel=`echo $osxvrm | cut -d. -f2` # Get release only
clangvers="`clang -v 2>&1 >/dev/null | grep version | sed -e 's/.*version \([[0-9]]*\).*$/\1/'`"
if test "$clangvers" -ge 6; then # Xcode 6 drops std lib search, add it to clang
APR_ADDTO(LDFLAGS, -L/usr/local/lib)
APR_ADDTO(CPPFLAGS, -I/usr/local/include)
fi
if test "$clangvers" -ge 4; then # Xcode 4 / 10.7 and up
APR_ADDTO(CFLAGS, -Wno-deprecated-declarations)
fi
if test "$osxrel" -ge 6; then # 10.6 and up
APR_ADDTO(CFLAGS, -pipe -no-cpp-precomp)
APR_ADDTO(LDFLAGS, -pipe -bind_at_load)
APR_ADDTO(CXXFLAGS, -pipe)
fi
;;
*-solaris2*)
if test "${enable_64}" = "yes"; then
Expand Down Expand Up @@ -1261,13 +1250,15 @@ GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
AC_SUBST(GETSOUNDS)

case $host in
aarch64-apple-darwin*)
path_push_unique PKG_CONFIG_PATH /opt/homebrew/opt/pkgconf/
path_push_unique PKG_CONFIG_PATH /opt/homebrew/opt/sqlite/lib/pkgconfig/
;;
*-darwin*)
path_push_unique PKG_CONFIG_PATH /usr/local/opt/curl/lib/pkgconfig
path_push_unique PKG_CONFIG_PATH /usr/local/opt/sqlite/lib/pkgconfig/
path_push_unique PKG_CONFIG_PATH /usr/local/opt/ldns/lib/pkgconfig/
path_push_unique PKG_CONFIG_PATH /usr/local/opt/ffmpeg/lib/pkgconfig/
path_push_unique PKG_CONFIG_PATH /opt/homebrew/lib/pkgconfig/
path_push_unique PKG_CONFIG_PATH /opt/homebrew/opt/sqlite/lib/pkgconfig/
;;
esac

Expand Down
Loading