2013-09-26 17:14:40 +02:00

33 lines
1.2 KiB
Plaintext

$NetBSD: patch-aa,v 1.2 2013/01/23 17:27:48 wiz Exp $
First chunk: automake-1.13 compat.
--- configure.ac.orig 2008-03-20 13:55:45.000000000 +0000
+++ configure.ac
@@ -1,7 +1,7 @@
AC_INIT([libfprint], [0.0.6])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([libfprint/core.c])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
AC_PREREQ([2.50])
AC_PROG_CC
@@ -89,9 +89,15 @@ if test "x$debug_log_enabled" != "xno";
AC_DEFINE([ENABLE_DEBUG_LOGGING], 1, [Debug message logging])
fi
+# Restore gnu89 inline semantics on gcc 4.3 and newer
+saved_cflags="$CFLAGS"
+CFLAGS="$CFLAGS -fgnu89-inline"
+AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), inline_cflags="-fgnu89-inline", inline_cflags="")
+CFLAGS="$saved_cflags"
+
AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility])
-AM_CFLAGS="-std=gnu99 -fgnu89-inline -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
+AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow"
AC_SUBST(AM_CFLAGS)
AC_CONFIG_FILES([libfprint.pc] [Makefile] [libfprint/Makefile] [examples/Makefile] [doc/Makefile])