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 9cc0129..6950044 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -26,16 +26,21 @@ top_srcdir  = @abs_top_srcdir@
 datarootdir    = @datarootdir@
 
 MAKE           = @MAKE@
+
+# Makeflags set within the makefile appear to be additive and override
+# flags set on the command line and the environmental variables
+MAKEFLAGS      = @MAKEFLAGS@
+
 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@
@@ -54,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@
@@ -74,37 +75,16 @@ CFLAGS              += $(OPENSSL_INCLUDE)
 LIBREADLINE    = @LIBREADLINE@
 
 #
-#  SQL driver defines
-#
-SQL_ODBC_LIBS = @ODBC_LIBS@
-SQL_ODBC_INCLUDE = @ODBC_INCLUDE@
-
-#
-#  Make version info available to the build targets and linker
+#  Version to use for packaging and other Make related things
 #
-RADIUSD_MAJOR_VERSION  = @RADIUSD_MAJOR_VERSION@
-RADIUSD_MINOR_VERSION  = @RADIUSD_MINOR_VERSION@
-RADIUSD_INCRM_VERSION  = @RADIUSD_INCRM_VERSION@
-RADIUSD_VERSION                = @RADIUSD_VERSION@
-RADIUSD_VERSION_STRING  = @RADIUSD_VERSION_STRING@
-RADIUSD_VERSION_COMMIT  = @RADIUSD_VERSION_COMMIT@
-
-CFLAGS += -DRADIUSD_MAJOR_VERSION=\"${RADIUSD_MAJOR_VERSION}\"
-CFLAGS += -DRADIUSD_MINOR_VERSION=\"${RADIUSD_MINOR_VERSION}\"
-CFLAGS += -DRADIUSD_INCRM_VERSION=\"${RADIUSD_INCRM_VERSION}\"
-CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
-CFLAGS += -DRADIUSD_VERSION_STRING=\"${RADIUSD_VERSION_STRING}\"
-
-ifdef RADIUSD_VERSION_COMMIT
-CFLAGS += -DRADIUSD_VERSION_COMMIT=\"${RADIUSD_VERSION_COMMIT}\"
-endif
+RADIUSD_VERSION_STRING = @RADIUSD_VERSION_STRING@
 
 #
 #  This allows dlopen to do runtime checks for version mistmatches
-#  between what it was originally linked with the the library it's
+#  between what it was originally linked with, and the library it's
 #  actually loading.
 #
-LDFLAGS += -release=$(RADIUSD_VERSION_STRING)
+#LDFLAGS += -release=$(RADIUSD_VERSION_STRING)
 
 MODULES                = @MODULES@
 HOSTINFO       = @HOSTINFO@
@@ -149,7 +129,7 @@ endif
 
 ifneq "$(LIBTOOL)" ""
 COMPILE.c      := $(LIBTOOL) --quiet --mode=compile $(CC) 
-LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) $(LDFLAGS) -rpath $(libdir) -o
+LINK.lib       := $(LIBTOOL) --quiet --mode=link $(CC) -rpath $(libdir) -o
 LO             := lo
 LA             := la
 else
@@ -171,22 +151,3 @@ ifneq "$(findstring Darwin,$(shell uname -a))" ""
 LA             := dylib
 endif
 endif
-
-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
-
-BOILER = @boilermake@