Try bumping the version number AGAIN in debian/changelog to help Debian 7 .deb files...

[freeradius.git] / Make.inc.in

diff --git a/Make.inc.in b/Make.inc.in
index 219f4a5..a69292e 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -47,11 +47,11 @@ MAKEFLAGS   = @FR_MAKEFLAGS@
 
 CC             = @CC@
 RANLIB         = @RANLIB@
-INCLUDE                = -I${top_srcdir} -I${top_srcdir}/src \
-                 -include ${top_srcdir}/src/freeradius-devel/autoconf.h \
-                 -include ${top_srcdir}/src/freeradius-devel/build.h \
-                 -include ${top_srcdir}/src/freeradius-devel/features.h \
-                 -include ${top_srcdir}/src/freeradius-devel/radpaths.h
+INCLUDE                = -I. -Isrc \
+                 -include src/freeradius-devel/autoconf.h \
+                 -include src/freeradius-devel/build.h \
+                 -include src/freeradius-devel/features.h \
+                 -include src/freeradius-devel/radpaths.h
 CFLAGS         = $(INCLUDE) -fno-strict-aliasing @CFLAGS@
 CPPFLAGS       = @CPPFLAGS@
 LIBPREFIX      = @LIBPREFIX@
@@ -76,6 +76,7 @@ TALLOC_LDFLAGS  = @TALLOC_LDFLAGS@
 
 OPENSSL_LIBS    = @OPENSSL_LIBS@
 OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_CPPFLAGS = @OPENSSL_CPPFLAGS@
 
 PCAP_LIBS      = @PCAP_LIBS@
 PCAP_LDFLAGS    = @PCAP_LDFLAGS@
@@ -107,6 +108,8 @@ bm_static_libs  = @USE_STATIC_LIBS@
 STATIC_MODULES = @STATIC_MODULES@
 LIBREADLINE    = @LIBREADLINE@
 
+WITH_DHCP      = @WITH_DHCP@
+
 #
 #  Version to use for packaging and other Make related things
 #
@@ -129,6 +132,7 @@ HOSTINFO    = @HOSTINFO@
 #
 ifeq "$(WITH_OPENSSL)" "yes"
 CFLAGS         +=  -DWITH_OPENSSL_MD4 -DWITH_OPENSSL_MD5
+CPPFLAGS       := "$(OPENSSL_CPPFLAGS) $(CPPFLAGS)"
 endif
 
 OPENSSL_LIBS   = @OPENSSL_LIBS@
@@ -161,7 +165,7 @@ ANALYZE.c       := @clang_path@
 #
 ifeq "$(USE_SHARED_LIBS)" "yes"
        TESTBINDIR = ./$(BUILD_DIR)/bin/local
-       TESTBIN    = $(JLIBTOOL) --quiet --mode=execute $(TESTBINDIR)
+       TESTBIN    =  FR_LIBRARY_PATH=./build/lib/.libs $(JLIBTOOL) --quiet --mode=execute $(TESTBINDIR)
 else
        TESTBINDIR = ./$(BUILD_DIR)/bin
        TESTBIN    = ./$(BUILD_DIR)/bin