Ticket #43231: patch-configure.ac.diff

configure.ac

@@ -517 +517 @@
 LIBS=$old_LIBS
 
 dnl ***************************************************************************
+dnl linker properties
+dnl ***************************************************************************
+
+ac_save_LDFLAGS=$LDFLAGS
+AC_CACHE_CHECK(whether $LD supports --whole-archive,
+        ac_cv_prog_ld_whole_archive,
+        [ac_cv_prog_ld_whole_archive=no
+         LDFLAGS="$LDFLAGS -Wl,--whole-archive -Wl,--no-whole-archive"
+         _AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+                [ac_cv_prog_ld_whole_archive=yes], [])
+         dnl AC_TRY_LINK(, [return 0], [ac_cv_prog_ld_whole_archive=yes], [])
+        ])
+LDFLAGS=$ac_save_LDFLAGS
+
+if test "x$ac_cv_prog_ld_whole_archive" = "xno"; then
+  AC_CACHE_CHECK(whether $LD supports -all_libs,
+          ac_cv_prog_ld_all_libs,
+          [ac_cv_prog_ld_all_libs=no
+           LDFLAGS="$LDFLAGS -Wl,-all_libs"
+           _AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+                  [ac_cv_prog_ld_all_libs=yes], [])
+          ])
+  LDFLAGS=$ac_save_LDFLAGS
+fi
+
+if test "x$ac_cv_prog_ld_whole_archive" = "xyes"; then
+   LD_WHOLE_ARCHIVE="-Wl,--whole-archive"
+   LD_NO_WHOLE_ARCHIVE="-Wl,--no-whole-archive"
+fi
+
+if test "x$ac_cv_prog_ld_all_libs" = "xyes"; then
+   LD_WHOLE_ARCHIVE="-Wl,-all_libs"
+   LD_NO_WHOLE_ARCHIVE=""
+fi
+
+dnl ***************************************************************************
 dnl libevtlog headers/libraries
 dnl ***************************************************************************
 PKG_CHECK_MODULES(EVTLOG, eventlog >= $EVTLOG_MIN_VERSION,,)
@@ -813 +849 @@
                 # these can only be used in lib as it assumes
                 # the current directory just one below ivykis
 
-                IVYKIS_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src -livykis  -Wl,--no-whole-archive"
+                IVYKIS_LIBS="${LD_WHOLE_ARCHIVE} -L\$(top_builddir)/lib/ivykis/src -livykis  ${LD_NO_WHOLE_ARCHIVE}"
                 IVYKIS_CFLAGS="-I\$(top_srcdir)/lib/ivykis/src/include -I\$(top_builddir)/lib/ivykis/src/include"
                 IVYKIS_SUBDIRS=lib/ivykis
                 INTERNAL_IVYKIS_CFLAGS="-I\${includedir}/syslog-ng/ivykis"
 
                 # LIBS to use when libtool is not applicable (when linking the main syslog-ng executable in mixed linking mode)
-                IVYKIS_NO_LIBTOOL_LIBS="-Wl,--whole-archive -L\$(top_builddir)/lib/ivykis/src/.libs -livykis -Wl,--no-whole-archive"
+                IVYKIS_NO_LIBTOOL_LIBS="${LD_WHOLE_ARCHIVE} -L\$(top_builddir)/lib/ivykis/src/.libs -livykis ${LD_NO_WHOLE_ARCHIVE}"
         else
                 AC_MSG_ERROR([Internal ivykis sources not found in lib/ivykis. This is a hard dependency, unable to build syslog-ng without them.])
         fi
@@ -1156 +1192 @@
         SYSLOGNG_LINK='$(LINK)'
 else
         SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC -Wl,--whole-archive $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS -Wl,--no-whole-archive $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
+        SYSLOGNG_DEPS_LIBS="$LIBS $BASE_LIBS $RESOLV_LIBS $LD_START_STATIC ${LD_WHOLE_ARCHIVE} $GLIB_LIBS $EVTLOG_LIBS $PCRE_LIBS $REGEX_LIBS ${LD_NO_WHOLE_ARCHIVE} $IVYKIS_NO_LIBTOOL_LIBS $LD_END_STATIC $LIBCAP_LIBS $DL_LIBS "
         TOOL_DEPS_LIBS="$LIBS $BASE_LIBS $GLIB_LIBS $EVTLOG_LIBS $RESOLV_LIBS $LIBCAP_LIBS $PCRE_LIBS $REGEX_LIBS $IVYKIS_LIBS $DL_LIBS"
         CORE_DEPS_LIBS=""