build: fix flags for Fedora packages

Change-Id: I35d51deb450a265fd7541bad2735b8dd4ca465c5
savoirfairelinux · Mar 4, 2023 · 82907de · 82907de
1 parent 75e4a5d
commit 82907de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -43,7 +43,6 @@ libjami_la_LIBADD += \
 	$(LIBSSL_LIBS) \
 	$(LIBCRYPTO_LIBS) \
 	$(ARCHIVE_LIBS) \
-        $(ARCHIVE_LIBS) \
 	$(ZLIB_LIBS)
 
 if ENABLE_PLUGIN