From 82907de8663eaee274a3853c18f38a2787b90f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Fri, 3 Mar 2023 09:30:00 -0500 Subject: [PATCH] build: fix flags for Fedora packages Change-Id: I35d51deb450a265fd7541bad2735b8dd4ca465c5 --- configure.ac | 8 +++++--- src/Makefile.am | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1d46bd98c3..451c5e0d64 100644 --- a/configure.ac +++ b/configure.ac @@ -669,9 +669,11 @@ AC_CONFIG_FILES([Makefile \ dnl Transfer the Automake variables set here to Makefile.in. echo DAEMONCPPFLAGS=$DAEMONCPPFLAGS -CXXFLAGS="$DAEMONCXXFLAGS" -OBJCXX="$CXX $DAEMONCXXFLAGS" -OBJCXXFLAG="$CXX $DAEMONCXXFLAGS" +AS_IF([test "${HAVE_OSX}" = "1"], + [CXXFLAGS="$DAEMONCXXFLAGS" + OBJCXX="$CXX $DAEMONCXXFLAGS" + OBJCXXFLAG="$CXX $DAEMONCXXFLAGS"] + []) AC_SUBST([AM_CPPFLAGS], [$DAEMONCPPFLAGS]) AC_SUBST([AM_CFLAGS], [$DAEMONCFLAGS]) AC_SUBST([AM_CXXFLAGS], [$DAEMONCXXFLAGS]) diff --git a/src/Makefile.am b/src/Makefile.am index ada230cc7e..014fd42d8b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,7 +43,6 @@ libjami_la_LIBADD += \ $(LIBSSL_LIBS) \ $(LIBCRYPTO_LIBS) \ $(ARCHIVE_LIBS) \ - $(ARCHIVE_LIBS) \ $(ZLIB_LIBS) if ENABLE_PLUGIN -- GitLab