From 514079bbfc1482fa22b046565c7d741ba77df898 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 18 Mar 2021 18:08:26 -0400
Subject: [PATCH] configure: host specific config

Align host specific configuration style with our other autotools
projects.

This is part of an effort to standardise our autotools setup across
project to simplify maintenance.

Change-Id: I413b4425f9027dfcce74b40292e13df604b602a3
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 configure.ac    | 17 ++++++++++++-----
 src/Makefile.am |  5 +----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index c36a9fd..30d2056 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,16 @@ AM_MAINTAINER_MODE([enable])
 # Enable silent rules by default
 AM_SILENT_RULES([yes])
 
+
+##                               ##
+## OS and Arch specific defaults ##
+##                               ##
+
+AS_CASE([$host],
+  [*-cygwin*], [LT_NO_UNDEFINED="-no-undefined"]
+)
+
+
 AH_TEMPLATE([CONFIG_RCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.])
 AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.])
 AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.])
@@ -139,11 +149,6 @@ AC_CHECK_HEADERS([ \
 	sys/time.h \
 ])
 
-AS_CASE([$host],[*-cygwin*],
-	[AM_CONDITIONAL(USE_CYGWIN, true)],
-	[AM_CONDITIONAL(USE_CYGWIN, false)]
-)
-
 # Search for clock_gettime
 AC_SEARCH_LIBS([clock_gettime], [rt], [
 	AC_DEFINE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [1])
@@ -283,6 +288,8 @@ AC_CHECK_FUNCS([sched_setaffinity],[
 # Library versions for libtool
 AC_SUBST([URCU_LIBRARY_VERSION], [urcu_lib_version])
 
+AC_SUBST(LT_NO_UNDEFINED)
+
 AM_CPPFLAGS="-include config.h"
 AC_SUBST(AM_CPPFLAGS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f95b37f..215f09c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,10 +2,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)
 
 #Add the -version-info directly here since we are only building
 # library that use the version-info
-AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)
-if USE_CYGWIN
-AM_LDFLAGS+=-no-undefined
-endif
+AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION) $(LT_NO_UNDEFINED)
 
 dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h \
 	compat-rand.h urcu-utils.h
-- 
2.34.1