Browse code

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

Andrei Pelinescu-Onciul authored on 30/06/2005 21:29:31
Showing 3 changed files
... ...
@@ -170,7 +170,8 @@ tar:
170 170
 	$(TAR) -C .. \
171 171
 		--exclude=$(notdir $(CURDIR))/test* \
172 172
 		--exclude=$(notdir $(CURDIR))/tmp* \
173
-		--exclude=$(notdir $(CURDIR))/debian/ser* \
173
+		--exclude=$(notdir $(CURDIR))/debian/ser \
174
+		--exclude=$(notdir $(CURDIR))/debian/ser-* \
174 175
 		--exclude=$(notdir $(CURDIR))/ser_tls* \
175 176
 		--exclude=CVS* \
176 177
 		--exclude=.svn* \
... ...
@@ -268,6 +269,9 @@ install-cfg: $(cfg-prefix)/$(cfg-dir)
268 269
 			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
269 270
 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
270 271
 		fi
272
+		# radius dictionary
273
+		$(INSTALL-TOUCH) $(cfg-prefix)/$(cfg-dir)/dictionary.ser 
274
+		$(INSTALL-CFG) etc/dictionary.ser $(cfg-prefix)/$(cfg-dir)
271 275
 #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
272 276
 
273 277
 install-bin: $(bin-prefix)/$(bin-dir) utils/gen_ha1/gen_ha1 utils/serunix/serunix
... ...
@@ -157,7 +157,7 @@ endif
157 157
 
158 158
 INSTALL-TOUCH = touch          # used to create the file first (good to 
159 159
                                #  make solaris install work)
160
-# INSTALL-CFG = $(INSTALL) -m 644
160
+INSTALL-CFG = $(INSTALL) -m 644
161 161
 INSTALL-BIN = $(INSTALL) -m 755
162 162
 INSTALL-MODULES = $(INSTALL) -m 755
163 163
 INSTALL-DOC = $(INSTALL) -m 644
164 164
new file mode 100644
... ...
@@ -0,0 +1,36 @@
1
+#
2
+# $Id$
3
+#
4
+#
5
+# Radiusclient library detection comes here
6
+#
7
+# (To be included from Makefiles of radius related modules)
8
+#
9
+# The purpose of this makefile is to perform radiusclient library
10
+# detection and setup library and include paths in DEFS and LIBS
11
+# variables. In addition RADIUSCLIENT_NG_4 will be defined when
12
+# libradiusclient-ng version 4 is detected. That means the module
13
+# should include radiusclient.h, otherwise radiusclient-ng.h
14
+# should be included. Variable RADIUSCLIENT_LIB contains the
15
+# name of the shared library.
16
+#
17
+
18
+#
19
+# Radiusclient-ng is often installed from tarballs so we
20
+# need to look int /usr/local/lib as well
21
+#
22
+DEFS+=-I$(LOCALBASE)/include
23
+LIBS+=-L$(LOCALBASE)/lib
24
+
25
+ifneq ($(radiusclient_ng), 4)
26
+
27
+# radiusclient-ng 5+
28
+# DEFS+=-DRADIUSCLIENT_NG_5P
29
+RADIUSCLIENT_LIB=radiusclient-ng
30
+
31
+else
32
+
33
+DEFS+=-DRADIUSCLIENT_NG_4
34
+RADIUSCLIENT_LIB=radiusclient
35
+
36
+endif