Changeset 153 for trunk/aclocal.m4

Timestamp:

Jan 11, 2008, 11:47:17 PM (17 years ago)

Author:

katerina

Message:

Use -D_FORTIFY_SOURCE=1 -fstack-protector-all if supported. Compiler warnings fixed.

File:

• trunk/aclocal.m4 (modified) (4 diffs)

trunk/aclocal.m4

@@ -1121 +1121 @@
       ssp_cv_cc,
       [ssp_old_cflags="$CFLAGS"
-       CFLAGS="$CFLAGS -fstack-protector"
+       CFLAGS="$CFLAGS -fstack-protector-all"
        AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
        CFLAGS="$ssp_old_cflags"
       ])
-    if test $ssp_cv_cc = yes; then
-      CFLAGS="$CFLAGS -fstack-protector"
-      AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+    if test $ssp_cv_cc = no; then
+      AC_CACHE_CHECK([whether ${CC} accepts -fstack-protector],
+        ssp_cv_cc,
+        [ssp_old_cflags="$CFLAGS"
+         CFLAGS="$CFLAGS -fstack-protector-all"
+         AC_TRY_COMPILE(,, ssp_cv_cc=yes, ssp_cv_cc=no)
+         CFLAGS="$ssp_old_cflags"
+        ])
+      if test $ssp_cv_cc = yes; then
+        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1 -fstack-protector-all"
+        AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+      fi
+    else
+      if test $ssp_cv_cc = yes; then
+        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1 -fstack-protector"
+        AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.])
+      fi
     fi
   fi
@@ -1704 +1718 @@
                 AC_MSG_CHECKING([whether pthreads work with $flag])
                 PTHREAD_CFLAGS="$flag"
-                PTHREAD_LDFLAGS="$flag"
                 ;;
 
@@ -1730 +1743 @@
         LIBS="$PTHREAD_LIBS $LIBS"
         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LDFLAGS="$LDFLAGS $PTHREAD_LDFLAGS"
+        LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
 
         # Check for various functions.  We must include pthread.h,
@@ -1758 +1771 @@
         PTHREAD_LIBS=""
         PTHREAD_CFLAGS=""
-        PTHREAD_LDFLAGS=""
 done
 fi