note recent changes

[freeradius.git] / Make.inc.in

diff --git a/Make.inc.in b/Make.inc.in
index e1716c8..5464b2e 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -21,13 +21,14 @@ includedir  = @includedir@
 raddbdir       = @raddbdir@
 radacctdir     = @radacctdir@
 top_builddir   = @abs_top_builddir@
+top_build_prefix=@abs_top_builddir@/
 top_srcdir     = @abs_top_srcdir@
 datarootdir    = @datarootdir@
 
 MAKE           = @MAKE@
 CC             = @CC@
 RANLIB         = @RANLIB@
-INCLUDE                =
+INCLUDE                = -I${top_srcdir} -I${top_srcdir}/src
 CFLAGS         = $(INCLUDE) @CFLAGS@
 CPPFLAGS       = @CPPFLAGS@
 LIBPREFIX      = @LIBPREFIX@
@@ -57,6 +58,7 @@ LIBRADIUS     = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la
 LIBLTDL                = @LIBLTDL@
 INCLTDL                = @INCLTDL@
 LTDL_SUBDIRS   = @LTDL_SUBDIRS@
+CFLAGS         += $(INCLTDL)
 
 USE_SHARED_LIBS        = @USE_SHARED_LIBS@
 USE_STATIC_LIBS = @USE_STATIC_LIBS@
@@ -75,7 +77,10 @@ SQL_ODBC_INCLUDE = @ODBC_INCLUDE@
 
 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@
 
 MODULES                        = @MODULES@
 HOSTINFO               = @HOSTINFO@
@@ -100,10 +105,13 @@ endif
 
 #  http://clang.llvm.org/StaticAnalysis.html
 #
-#  $ make scan | sed "s/.*Run '//;s/'.*//" > scan.sh
-#  $ ./scan.sh
+#  $ make SCAN=/path/to/checker/ 
 #
-SCAN_BUILD     = /path/to/checker-0.167/scan-build
-ifeq ($(SCAN),yes)
-CC             := $(SCAN_BUILD) gcc -DFR_SCAN_BUILD
+ifneq ($(SCAN),)
+CC             := $(SCAN)/scan-build gcc -DFR_SCAN_BUILD
+LIBTOOL                := 
+endif
+
+ifeq "$(LIBTOOL)" ""
+$(error Building FreeRADIUS requires libtool)
 endif