apply espie's SILC_ADD_CC_FLAGS autoconf fix to irssi-silc

This commit is contained in:
sthen 2017-04-16 20:50:06 +00:00
parent cefdc910e1
commit ab385c0db9

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.2 2009/08/03 21:29:47 martynas Exp $
--- configure.ac.orig Sat Aug 1 09:53:41 2009
+++ configure.ac Sun Aug 2 22:20:58 2009
$OpenBSD: patch-configure_ac,v 1.3 2017/04/16 20:50:06 sthen Exp $
--- configure.ac.orig Sat Aug 1 07:53:41 2009
+++ configure.ac Sun Apr 16 21:39:20 2017
@@ -51,7 +51,7 @@ case "$target" in
check_threads=true
;;
@ -20,7 +20,25 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/08/03 21:29:47 martynas Exp $
AC_PROG_CC
AC_C_INLINE
AC_C_CONST
@@ -471,59 +468,9 @@ fi
@@ -166,12 +163,13 @@ AC_DEFUN([SILC_ADD_CFLAGS],
# Function to check if compiler flag works, destination specifiable
# Usage: SILC_ADD_CC_FLAGS(VAR, FLAGS, [ACTION-IF-FAILED])
AC_DEFUN([SILC_ADD_CC_FLAGS],
-[ tmp_CFLAGS="$1_CFLAGS"
- $1_CFLAGS="${$1_CFLAGS} $2"
+[ tmp_CFLAGS="$CFLAGS"
+ CFLAGS="${$1_CFLAGS} $2"
AC_MSG_CHECKING(whether $CC accepts $2 flag)
- AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
- $1_CFLAGS="$tmp_CFLAGS"
+ AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)
+ $1_CFLAGS="$CFLAGS"], [AC_MSG_RESULT(no)
$3])
+ CFLAGS="$tmp_CFLAGS"
unset tmp_CFLAGS
])
@@ -471,59 +469,9 @@ fi
## Compiler and compiler flag checks
##
@ -82,7 +100,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2009/08/03 21:29:47 martynas Exp $
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
@@ -616,8 +563,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
@@ -616,8 +564,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
else
# pkg-config check