ttls: return channel bindings on half round trip success

[freeradius.git] / Make.inc.in

diff --git a/Make.inc.in b/Make.inc.in
index 9bb9831..6950044 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -35,12 +35,12 @@ CC          = @CC@
 RANLIB         = @RANLIB@
 IMACROS                = -imacros ${top_srcdir}/src/freeradius-devel/autoconf.h -imacros ${top_srcdir}/src/freeradius-devel/features.h
 INCLUDE                = -I${top_srcdir} -I${top_srcdir}/src
-CFLAGS         = $(IMACROS) $(INCLUDE) @CFLAGS@
+CFLAGS         = $(IMACROS) $(INCLUDE) -fno-strict-aliasing @CFLAGS@
 CPPFLAGS       = @CPPFLAGS@
 LIBPREFIX      = @LIBPREFIX@
 EXEEXT         = @EXEEXT@
 
-LIBTOOL                = @LIBTOOL@
+LIBTOOL                = JLIBTOOL
 ACLOCAL                = @ACLOCAL@
 AUTOCONF       = @AUTOCONF@
 AUTOHEADER     = @AUTOHEADER@
@@ -59,11 +59,7 @@ RADDBDIR     = ${raddbdir}
 RUNDIR         = ${localstatedir}/run/radiusd
 SBINDIR                = ${sbindir}
 RADIR          = ${radacctdir}
-LIBRADIUS      = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
-
-LIBLTDL                = @LIBLTDL@
-INCLTDL                = @INCLTDL@
-CFLAGS         += $(INCLTDL)
+LIBRADIUS      = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la -l talloc
 
 #USE_SHARED_LIBS = @USE_SHARED_LIBS@
 #USE_STATIC_LIBS = @USE_STATIC_LIBS@
@@ -79,12 +75,6 @@ CFLAGS               += $(OPENSSL_INCLUDE)
 LIBREADLINE    = @LIBREADLINE@
 
 #
-#  SQL driver defines
-#
-SQL_ODBC_LIBS = @ODBC_LIBS@
-SQL_ODBC_INCLUDE = @ODBC_INCLUDE@
-
-#
 #  Version to use for packaging and other Make related things
 #
 RADIUSD_VERSION_STRING = @RADIUSD_VERSION_STRING@
@@ -139,7 +129,7 @@ endif
 
 ifneq "$(LIBTOOL)" ""
 COMPILE.c      := $(LIBTOOL) --quiet --mode=compile $(CC) 
-LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) -release=$(RADIUSD_VERSION_STRING) -rpath $(libdir) -o
+LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) -rpath $(libdir) -o
 LO             := lo
 LA             := la
 else
@@ -161,25 +151,3 @@ ifneq "$(findstring Darwin,$(shell uname -a))" ""
 LA             := dylib
 endif
 endif
-
-
-BOILER = @boilermake@
-
-ifneq "$(BOILER)" "yes"
-all: $(top_srcdir)/scripts/jlibtool
-
-$(top_srcdir)/scripts/jlibtool: $(top_srcdir)/scripts/jlibtool.c
-       $(CC) $^ -o $@
-
-# Add -module for normal libtool.  It doesn't like building "foo.la"
-# as a library unless you tell it to shut up, yes, I KNOW this is a module
-ifeq "$(findstring jlibtool,$(LIBTOOL))" ""
-  RLM_MOD = -module
-else
-  MOD_RPATH = -rpath $(libdir)
-endif
-
-ifeq "$(LIBTOOL)" ""
-$(error Building FreeRADIUS requires libtool)
-endif
-endif