[libmicrohttpd] branch master updated (1907cc2b -> 03c29b63)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 1907cc2b MHD_Connection: added 'const' qualifiers to some unmodifiable 
members
     new 7570030f Configure: minor results print clarification
     new 03c29b63 configure: improved usage of 'pie' mode for hardening

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 29eaf7db..50f3055e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,33 +313,30 @@ AS_VAR_IF([enable_compiler_hardening],["yes"],
     
MHD_FIND_ADD_CC_CFLAG([CFLAGS_ac],[-fstack-protector-strong],[-fstack-protector-all],[-fstack-protector])
     MHD_CHECK_ADD_CC_CFLAGS([-fstack-clash-protection 
-ftrivial-auto-var-init=pattern],[CFLAGS_ac])
     CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
-    AS_VAR_IF([pic_mode],["no"],[],
+    AS_IF([test "x${enable_static}" = "xyes" && test "x${pic_mode}" != "xyes"],
       [
-        AS_VAR_IF([enable_shared],["yes"],[],
+        # PIE static lib can be used within non-PIE application, but
+        # PIE static lib cannot be used in non-PIE shared lib. Let's assume
+        # that static lib will not be used in shared lib
+        # All "pie" flags will be used automatically by libtool only
+        # for static library objects.
+        CFLAGS="${user_CFLAGS}"
+        # Perform tests here with "-pie" enabled
+        LDFLAGS="${LDFLAGS_ac} -pie ${user_LDFLAGS}"
+        MHD_CHECK_ADD_CC_CFLAG([-fPIE],[CFLAGS_ac],
           [
-            # PIE cannot be used for shared lib
-            # PIE static lib can be used within non-PIE application, but
-            # PIE static lib cannot be used in non-PIE shared lib. Let's assume
-            # that static lib will not be used in shared lib
-            CFLAGS="${user_CFLAGS}"
-            # Perform tests with "-pie" enabled
-            LDFLAGS="${LDFLAGS_ac} -pie ${user_LDFLAGS}"
-            MHD_CHECK_ADD_CC_CFLAG([-fPIE],[CFLAGS_ac],
+            MHD_APPEND_FLAG_TO_VAR([LDFLAGS_ac],[-pie])
+          ],
+          [
+            MHD_CHECK_ADD_CC_CFLAG([-fpie],[CFLAGS_ac],
               [
                 MHD_APPEND_FLAG_TO_VAR([LDFLAGS_ac],[-pie])
-              ],
-              [
-                MHD_CHECK_CC_CFLAG([-fpie],[CFLAGS_ac],
-                  [
-                    MHD_APPEND_FLAG_TO_VAR([LDFLAGS_ac],[-pie])
-                  ]
-                )
               ]
             )
-            CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
-            LDFLAGS="${LDFLAGS_ac} ${user_LDFLAGS}"
           ]
         )
+        CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
+        LDFLAGS="${LDFLAGS_ac} ${user_LDFLAGS}"
       ]
     )
     CFLAGS="${CFLAGS_ac} ${user_CFLAGS}"
@@ -3689,7 +3686,7 @@ MHD_PREPEND_FLAG_TO_VAR([fin_lib_CFLAGS],[$CFLAGS_ac])
 MHD_PREPEND_FLAG_TO_VAR([fin_lib_LDFLAGS],[$LDFLAGS_ac])
 AC_MSG_NOTICE([Toolchain flags:
   CC=$CC
-  User/system flags:
+  User/system/default flags:
     CPPFLAGS="$user_CPPFLAGS"
     CFLAGS=  "$user_CFLAGS"
     LDFLAGS= "$user_LDFLAGS"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.