use HOSTINFO and RADIUS_VERSION variables

	use OPENSSL_LIBS and OPENSSL_INCLUDES variables

diff --git a/Make.inc.in b/Make.inc.in
index 7759bb8..fcf028e 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -1,4 +1,4 @@
-#
+# -*- makefile -*-
 # Make.inc.in
 #
 # Version:     $Id$
@@ -18,7 +18,7 @@ dictdir               = $(datadir)/freeradius
 logdir         = @logdir@
 raddbdir       = @raddbdir@
 radacctdir     = @radacctdir@
-top_builddir   = @top_builddir@
+top_builddir   = @abs_top_builddir@
 top_srcdir     = @top_srcdir@
 
 MAKE           = @MAKE@
@@ -59,6 +59,9 @@ STATIC_MODULES        = @STATIC_MODULES@
 SNMP_INCLUDE   = @SNMP_INCLUDE@
 SNMP_LIBS      = @SNMP_LIBS@
 
+OPENSSL_LIBS   = @OPENSSL_LIBS@
+OPENSSL_INCLUDE = @OPENSSL_INCLUDE@
+
 #
 #  SQL driver defines
 #
@@ -70,3 +73,4 @@ RADIUSD_MINOR_VERSION = @RADIUSD_MINOR_VERSION@
 RADIUSD_VERSION                = @RADIUSD_VERSION@
 
 MODULES                        = @MODULES@
+HOSTINFO               = @HOSTINFO@
\ No newline at end of file

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index bfc25ab..ae21136 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -10,7 +10,10 @@ SERVER_OBJS  = radiusd.o files.o util.o acct.o nas.o log.o valuepair.o \
                  radius_snmp.o client.o request_list.o mainconfig.o
 INCLUDES       = ../include/radiusd.h ../include/radius.h ../include/libradius.h ../include/conf.h ../include/autoconf.h
 
-CFLAGS         += -I../include $(SNMP_INCLUDE) 
+CFLAGS         += -I../include 
+CFLAGS         += -DHOSTINFO=\"${HOSTINFO}\"
+CFLAGS          += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
+CFLAGS          += $(SNMP_INCLUDE) 
 LDFLAGS                += -L../lib
 MODULE_LIBS    = $(STATIC_MODULES)
 MODULE_OBJS    =
@@ -27,7 +30,7 @@ ifneq ($(USE_SHARED_LIBS),yes)
 #  For static linking...
 #
 MODULES += rlm_eap_md5  rlm_eap_leap rlm_eap_tls rlm_eap_ttls rlm_eap_sim
-LIBS += $(OPENSSL_LIB) -lcrypto -lssl -lcrypto -lssl -L../modules/rlm_eap/libeap -leap
+LIBS += -L$(OPENSSL_LIBS) -L../modules/rlm_eap/libeap -leap -lcrypto -lssl -lcrypto -lssl 
 #
 MODULE_LIBS    += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo -dlpreopen ../modules/$$x/$$x.la;done)
 MODULE_LIBS    += $(shell for x in $(MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
@@ -43,8 +46,8 @@ all:  $(BINARIES)
 radiusd: $(SERVER_OBJS) ../lib/libradius.a $(MODULE_OBJS)
        $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
                $(CFLAGS) $(LDFLAGS) -o $@ \
-               $(SERVER_OBJS) $(LCRYPT) $(LIBS) \
-               $(PTHREADLIB) $(LIBLTDL) $(MODULE_LIBS) 
+               $(SERVER_OBJS) $(LCRYPT) $(MODULE_LIBS) $(LIBS) \
+               $(PTHREADLIB) $(LIBLTDL) 
 
 radiusd.o: radiusd.c $(INCLUDES)  ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
        $(CC) $(CFLAGS) -c radiusd.c