From 0e9857d448faeaa3963ec838a03152c7e0b26d98 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 11 Jul 2014 03:43:24 -0500 Subject: [PATCH 1/2] put CPP defines in CPPFLAGS --- Makefile.am.common | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am.common b/Makefile.am.common index 7c8b280..9586e15 100644 --- a/Makefile.am.common +++ b/Makefile.am.common @@ -1,2 +1,4 @@ AM_CPPFLAGS = -I$(top_srcdir)/include AM_CPPFLAGS += -DOPENSSL_NO_ASM +AM_CPPFLAGS += -DHAVE_CRYPTODEV +AM_CPPFLAGS += -DLIBRESSL_INTERNAL diff --git a/configure.ac b/configure.ac index 549f303..7aec0b7 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_SUBST([USER_CFLAGS], "-O2 $CFLAGS") -CFLAGS="$CFLAGS -Wall -Werror -std=c99 -g -Wno-pointer-sign -DHAVE_CRYPTODEV -DLIBRESSL_INTERNAL" +CFLAGS="$CFLAGS -Wall -Werror -std=c99 -g -Wno-pointer-sign" case $target_os in *darwin*) From e1e636db22ed502c80e3434de235ad68ae8f0c6b Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 11 Jul 2014 03:55:48 -0500 Subject: [PATCH 2/2] prefer symlinks rather than hardlinks for manpages ok beck@ --- configure.ac | 1 - update.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7aec0b7..2e00982 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ AC_PROG_CC AC_PROG_LIBTOOL AC_PROG_CC_STDC AM_PROG_CC_C_O -AC_PROG_LN_S AC_CHECK_FUNC(strlcpy,[AC_SEARCH_LIBS(strlcpy,, [NO_STRLCPY=], [NO_STRLCPY=yes])], [NO_STRLCPY=yes]) diff --git a/update.sh b/update.sh index a775a1a..3fc5d07 100755 --- a/update.sh +++ b/update.sh @@ -413,6 +413,6 @@ crypto_excludes=( source links for i in $MLINKS; do IFS=","; set $i; unset IFS - echo " \$(LN_S) -f \$(DESTDIR)\$(mandir)/man3/$1 \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am + echo " ln -f \$(DESTDIR)\$(mandir)/man3/$1 \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am done )