Przeglądaj źródła

- merge 0.9.0 latest fixes/changes: radius modules makefiles and
libradiusclient/radiusclient-ng selection and various minor compile fixes

Andrei Pelinescu-Onciul 20 lat temu
rodzic
commit
b5a32e1a43
3 zmienionych plików z 42 dodań i 2 usunięć
  1. 5 1
      Makefile
  2. 1 1
      Makefile.defs
  3. 36 0
      Makefile.radius

+ 5 - 1
Makefile

@@ -170,7 +170,8 @@ tar:
 	$(TAR) -C .. \
 		--exclude=$(notdir $(CURDIR))/test* \
 		--exclude=$(notdir $(CURDIR))/tmp* \
-		--exclude=$(notdir $(CURDIR))/debian/ser* \
+		--exclude=$(notdir $(CURDIR))/debian/ser \
+		--exclude=$(notdir $(CURDIR))/debian/ser-* \
 		--exclude=$(notdir $(CURDIR))/ser_tls* \
 		--exclude=CVS* \
 		--exclude=.svn* \
@@ -268,6 +269,9 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)
 			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
 		fi
+		# radius dictionary
+		$(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.ser 
+		$(INSTALL-CFG) etc/dictionary.ser $(cfg-prefix)/$(cfg-dir)
 #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
 
 install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/serunix/serunix

+ 1 - 1
Makefile.defs

@@ -157,7 +157,7 @@ endif
 
 INSTALL-TOUCH = touch          # used to create the file first (good to 
                                #  make solaris install work)
-# INSTALL-CFG = $(INSTALL) -m 644
+INSTALL-CFG = $(INSTALL) -m 644
 INSTALL-BIN = $(INSTALL) -m 755
 INSTALL-MODULES = $(INSTALL) -m 755
 INSTALL-DOC = $(INSTALL) -m 644

+ 36 - 0
Makefile.radius

@@ -0,0 +1,36 @@
+#
+# $Id$
+#
+#
+# Radiusclient library detection comes here
+#
+# (To be included from Makefiles of radius related modules)
+#
+# The purpose of this makefile is to perform radiusclient library
+# detection and setup library and include paths in DEFS and LIBS
+# variables. In addition RADIUSCLIENT_NG_4 will be defined when
+# libradiusclient-ng version 4 is detected. That means the module
+# should include radiusclient.h, otherwise radiusclient-ng.h
+# should be included. Variable RADIUSCLIENT_LIB contains the
+# name of the shared library.
+#
+
+#
+# Radiusclient-ng is often installed from tarballs so we
+# need to look int /usr/local/lib as well
+#
+DEFS+=-I$(LOCALBASE)/include
+LIBS+=-L$(LOCALBASE)/lib
+
+ifneq ($(radiusclient_ng), 4)
+
+# radiusclient-ng 5+
+# DEFS+=-DRADIUSCLIENT_NG_5P
+RADIUSCLIENT_LIB=radiusclient-ng
+
+else
+
+DEFS+=-DRADIUSCLIENT_NG_4
+RADIUSCLIENT_LIB=radiusclient
+
+endif