]> git.pld-linux.org Git - packages/freeradius.git/blame - freeradius-ac.patch
projects / packages / freeradius.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 1 for ac (baggins)
[packages/freeradius.git] / freeradius-ac.patch
CommitLineData
041912e5
JB		 1--- freeradius-0.9.3/configure.in.orig 2003-11-20 21:15:47.000000000 +0100
2+++ freeradius-0.9.3/configure.in 2003-11-27 22:11:37.079670416 +0100
3@@ -68,20 +68,8 @@
4 dnl libltdl is installable
5 AC_LIBLTDL_INSTALLABLE
6
7-dnl use system-wide libtool, if it exists
8-AC_ARG_WITH(system-libtool,
9-[ --with-system-libtool try to use libtool installed in your system [default=use our own]],
10-[ AC_PATH_PROG(LIBTOOL, libtool,,$PATH:/usr/local/bin) ],
11-[
12- LIBTOOL="`pwd`/libtool"
13- AC_SUBST(LIBTOOL)
14- dnl ensure that we're looking for dlopen
15- AC_LIBTOOL_DLOPEN
16-
17- dnl Figure out how to build shared libraries
18- AC_PROG_LIBTOOL
19-])
20-
21+AC_PROG_LIBTOOL
22+AC_LIBTOOL_DLOPEN
23
24 dnl Put this in later, when all distributed modules use autoconf.
25 dnl AC_ARG_WITH(disablemodulefoo,
26@@ -388,15 +376,15 @@
27 fi
28
29 dnl Check if we need -lsocket
30-AC_CHECK_LIB(socket, getsockname)
31+AC_SEARCH_LIBS(getsockname, socket)
32
33 dnl Check for -lresolv
34 dnl This library may be needed later.
35-AC_CHECK_LIB(resolv, inet_aton)
36+AC_SEARCH_LIBS(inet_aton, resolv)
37
38 dnl Check if we need -lnsl. Usually if we want to
39 dnl link against -lsocket we need to include -lnsl as well.
40-AC_CHECK_LIB(nsl, inet_ntoa)
41+AC_SEARCH_LIBS(inet_ntoa, nsl)
42
43 dnl #############################################################
44 dnl #
45@@ -889,7 +878,7 @@
46 AC_SUBST(RADIUSD_VERSION)
47 export CFLAGS LIBS
48
49-AC_OUTPUT(\
50+AC_CONFIG_FILES(\
51 ./Make.inc \
52 ./src/include/build-radpaths-h \
53 ./src/main/Makefile \
54@@ -906,14 +895,15 @@
55 ./raddb/radiusd.conf
56 )
57
58-AC_OUTPUT_COMMANDS([echo timestamp > src/include/stamp-h])
59-AC_OUTPUT_COMMANDS([(cd ./src/include && /bin/sh ./build-radpaths-h)])
60-AC_OUTPUT_COMMANDS([(cd ./src/main && chmod +x checkrad.pl radlast radtest)])
61-AC_OUTPUT_COMMANDS([(cd ./scripts && chmod +x rc.radiusd radwatch check-radiusd-config radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])
62-AC_OUTPUT_COMMANDS([
63+AC_CONFIG_COMMANDS(c1,[echo timestamp > src/include/stamp-h])
64+AC_CONFIG_COMMANDS(c2,[(cd ./src/include && /bin/sh ./build-radpaths-h)])
65+AC_CONFIG_COMMANDS(c3,[(cd ./src/main && chmod +x checkrad.pl radlast radtest)])
66+AC_CONFIG_COMMANDS(c4,[(cd ./scripts && chmod +x rc.radiusd radwatch check-radiusd-config radiusd.cron.daily radiusd.cron.monthly cryptpasswd)])
67+AC_CONFIG_COMMANDS(c5,[
68 cat >> src/include/autoconf.h <<EOF
69
70 #define HOSTINFO "$host"
71 #define RADIUSD_VERSION "$RADIUSD_VERSION"
72 EOF
73 ],host=$host)
74+AC_OUTPUT
75--- freeradius-0.9.3/src/modules/rlm_ippool/configure.in.orig 1970-01-01 01:00:00.000000000 +0100
76+++ freeradius-0.9.3/src/modules/rlm_ippool/configure.in 2003-11-27 22:33:07.000000000 +0100
77@@ -0,0 +1,72 @@
78+AC_INIT(rlm_ippool.c)
79+AC_REVISION($Revision$)
80+AC_DEFUN(modname,[rlm_ippool])
81+
82+if test x$with_[]modname != xno; then
83+
84+ AC_PROG_CC
85+ AC_PROG_CPP
86+
87+ AC_SMART_CHECK_INCLUDE(gdbm.h)
88+ AC_SMART_CHECK_LIB(gdbm, gdbm_open)
89+ if test "x$ac_cv_lib_gdbm_gdbm_open" != "xyes"; then
90+ fail="$fail libgdbm"
91+ fi
92+
93+ if test "x$fail" = "x"; then
94+ AC_MSG_CHECKING(to see GDBM_SYNC status)
95+ AC_EGREP_CPP(found-gdbm-sync, [
96+#include <gdbm.h>
97+#ifdef GDBM_SYNC
98+ found-gdbm-sync!
99+#else
100+ not found. this version must use sync by default.
101+#endif
102+ ], [
103+ AC_DEFINE(NEED_GDBM_SYNC, yes)
104+ AC_MSG_RESULT(needs it.)
105+ ], [
106+ AC_MSG_RESULT(SYNCs by default.)
107+ ]
108+ )
109+ fi
110+
111+ old_LIBS=$LIBS
112+ LIBS="$LIBS $SMART_LIBS"
113+ AC_CHECK_FUNC(gdbm_fdesc)
114+ if test "x$ac_cv_func_gdbm_fdesc" = "xyes";
115+ then
116+ AC_DEFINE(HAVE_GDBM_FDESC)
117+ fi
118+ LIBS=$old_LIBS
119+
120+ targetname=modname
121+else
122+ targetname=
123+ echo \*\*\* module modname is disabled.
124+fi
125+
126+if test x"$fail" != x""; then
127+ if test x"${enable_strict_dependencies}" = x"yes"; then
128+ AC_MSG_ERROR([set --without-]modname[ to disable it explicitly.])
129+ else
130+ AC_MSG_WARN([silently not building ]modname[.])
131+ AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]);
132+ targetname=""
133+ fi
134+fi
135+
136+if test x"$targetname" != x""; then
137+ ippool_utils="rlm_ippool_tool"
138+ ippool_install="rlm_ippool_install"
139+fi
140+
141+ippool_ldflags=$SMART_LIBS
142+ippool_cflags=$SMART_CFLAGS
143+AC_SUBST(ippool_ldflags)
144+AC_SUBST(ippool_cflags)
145+AC_SUBST(targetname)
146+AC_SUBST(ippool_utils)
147+AC_SUBST(ippool_install)
148+AC_CONFIG_HEADER(config.h)
149+AC_OUTPUT(Makefile)
150--- freeradius-0.9.3/Make.inc.in.orig 2003-01-27 19:21:28.000000000 +0100
151+++ freeradius-0.9.3/Make.inc.in 2003-11-27 22:57:52.773700784 +0100
152@@ -49,7 +49,7 @@
153 RADIR = ${radacctdir}
154
155 LIBLTDL = @LIBLTDL@
156-LIBLTDLPATH = @LIBLTDLPATH@
157+LIBLTDLPATH =
158 INCLTDL = @INCLTDL@
159
160 USE_SHARED_LIBS = @USE_SHARED_LIBS@
161--- freeradius-0.9.3/src/lib/Makefile.orig 2003-11-28 20:18:57.678459104 +0100
162+++ freeradius-0.9.3/src/lib/Makefile 2003-11-28 20:20:25.055175824 +0100
163@@ -33,8 +33,8 @@
164
165
166 $(TARGET).a: $(STATIC_OBJS)
167- $(LIBTOOL) --mode=link $(LD) \
168- -module -static $(CFLAGS) $^ -o $@
169+ $(LIBTOOL) --mode=link $(CC) \
170+ -avoid-version -static $(CFLAGS) $^ -o $@
171
172
173 ifneq ($(USE_SHARED_LIBS),yes)
174@@ -43,7 +43,7 @@
175
176 $(TARGET).la: $(DYNAMIC_OBJS)
177 $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
178- -module $(LINK_MODE) $(CFLAGS) -o $@ -rpath $(libdir) $^
179+ -avoid-version $(LINK_MODE) $(CFLAGS) -o $@ -rpath $(libdir) $^ -lcrypt
180
181 static: $(TARGET).a
182
183--- freeradius-0.9.3/src/modules/rules.mak.orig 2003-07-09 17:19:53.000000000 +0200
184+++ freeradius-0.9.3/src/modules/rules.mak 2003-11-27 23:54:25.378946392 +0100
185@@ -69,7 +69,7 @@
186 #
187 #######################################################################
188 $(TARGET).a: $(STATIC_OBJS)
189- $(LIBTOOL) --mode=link $(LD) \
190+ $(LIBTOOL) --mode=link $(CC) \
191 -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@
192
193 #
194--- freeradius-0.9.3/src/modules/rlm_dbm/Makefile.in.orig 2001-10-26 18:59:38.000000000 +0200
195+++ freeradius-0.9.3/src/modules/rlm_dbm/Makefile.in 2003-11-28 19:54:12.484242944 +0100
196@@ -8,10 +8,10 @@
197
198 include ../rules.mak
199
200-rlm_dbm_parser: rlm_dbm_parser.o ../../lib/libradius.a
201+rlm_dbm_parser: rlm_dbm_parser.o ../../lib/libradius.la
202 $(LIBTOOL) --mode=link $(CC) $^ $(LIBS) $(RLM_LIBS) -o $@
203
204-rlm_dbm_cat: rlm_dbm_cat.o ../../lib/libradius.a
205+rlm_dbm_cat: rlm_dbm_cat.o ../../lib/libradius.la
206 $(LIBTOOL) --mode=link $(CC) $^ $(LIBS) $(RLM_LIBS) -o $@
207
208 #
209--- freeradius-0.9.3/src/modules/rlm_mschap/Makefile.orig 2003-03-26 23:58:09.000000000 +0100
210+++ freeradius-0.9.3/src/modules/rlm_mschap/Makefile 2003-11-28 19:55:21.097812096 +0100
211@@ -13,8 +13,8 @@
212 $(DYNAMIC_OBJS): $(HEADERS)
213
214 smbencrypt: smbencrypt.o $(HEADERS)
215- $(CC) -I../../include $(LDFLAGS) -o smbencrypt smbencrypt.o ../../lib/libradius.a
216+ $(LIBTOOL) --mode=link $(CC) -I../../include $(LDFLAGS) -o smbencrypt smbencrypt.o ../../lib/libradius.la
217
218 smbencrypt-install:
219 $(INSTALL) -d -m 755 $(R)$(bindir)
220- $(INSTALL) -m 755 $(INSTALLSTRIP) smbencrypt $(R)$(bindir)
221+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) smbencrypt $(R)$(bindir)
222--- freeradius-0.9.3/src/modules/rlm_sql/drivers/rules.mak.orig 2003-06-05 22:16:54.000000000 +0200
223+++ freeradius-0.9.3/src/modules/rlm_sql/drivers/rules.mak 2003-11-28 20:31:56.277094120 +0100
224@@ -67,7 +67,7 @@
225 #
226 #######################################################################
227 $(TARGET).a: $(STATIC_OBJS)
228- $(LIBTOOL) --mode=link $(LD) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $^ -o $@
229+ $(LIBTOOL) --mode=link $(CC) -module -static $(CFLAGS) $(RLM_SQL_CFLAGS) $^ -o $@
230
231 #
232 # If the module is in the list of static modules, then the "dynamic"
233--- freeradius-0.9.3/src/main/Makefile.in.orig 2003-05-01 20:57:23.000000000 +0200
234+++ freeradius-0.9.3/src/main/Makefile.in 2003-11-28 21:00:46.608043832 +0100
235@@ -12,7 +12,7 @@
236
237 CFLAGS += -I../include $(SNMP_INCLUDE)
238 LDFLAGS += -L../lib
239-LIBS += -lradius $(SNMP_LIBS)
240+LIBS += ../lib/libradius.la $(SNMP_LIBS)
241 MODULE_LIBS = $(STATIC_MODULES)
242 MODULE_OBJS =
243 VFLAGS = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
244@@ -30,7 +30,7 @@
245
246 all: $(BINARIES)
247
248-radiusd: $(SERVER_OBJS) ../lib/libradius.a $(MODULE_OBJS)
249+radiusd: $(SERVER_OBJS) ../lib/libradius.la $(MODULE_OBJS)
250 $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
251 $(CFLAGS) $(LDFLAGS) -o $@ \
252 $(SERVER_OBJS) $(LCRYPT) $(LIBS) \
253@@ -102,14 +102,14 @@
254 radius_snmp.o: radius_snmp.c $(INCLUDES)
255 $(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c
256
257-radclient: radclient.o ../lib/libradius.a
258- $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS)
259+radclient: radclient.o ../lib/libradius.la
260+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS)
261
262 radclient.o: radclient.c $(INCLUDES)
263 $(CC) $(CFLAGS) -c radclient.c
264
265-radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.a
266- $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
267+radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.la
268+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
269
270 radrelay.o: radrelay.c $(INCLUDES)
271 $(CC) $(CFLAGS) -c radrelay.c
272@@ -118,24 +118,24 @@
273 $(CC) $(CFLAGS) -c radwho.c
274
275 radwho: radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o
276- $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
277+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o radwho radwho.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS)
278
279 radzap.o: radzap.c $(INCLUDES)
280 $(CC) $(CFLAGS) -c radzap.c
281
282 radzap: radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o
283- $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
284+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o radzap radzap.o mainconfig.o util.o nas.o log.o client.o conffile.o files.o xlat.o $(LIBS)
285
286 clean:
287 rm -rf *.o *.so *~ $(BINARIES) .libs
288
289 install:
290 $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd $(R)$(sbindir)
291- $(INSTALL) -m 755 $(INSTALLSTRIP) radwho $(R)$(bindir)
292- $(INSTALL) -m 755 $(INSTALLSTRIP) radzap $(R)$(bindir)
293+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radwho $(R)$(bindir)
294+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radzap $(R)$(bindir)
295 $(INSTALL) -m 755 radlast $(R)$(bindir)
296- $(INSTALL) -m 755 radclient $(R)$(bindir)
297- $(INSTALL) -m 755 radrelay $(R)$(bindir)
298+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 radclient $(R)$(bindir)
299+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 radrelay $(R)$(bindir)
300 $(INSTALL) -m 755 radtest $(R)$(bindir)
301 $(INSTALL) -d -m 755 $(R)$(logdir)
302 $(INSTALL) -d -m 755 $(R)$(radacctdir)
303--- freeradius-0.9.3/Make.inc.in.orig 2003-11-27 22:58:15.000000000 +0100
304+++ freeradius-0.9.3/Make.inc.in 2003-11-27 23:07:23.083000592 +0100
305@@ -18,8 +18,8 @@
306 logdir = @logdir@
307 raddbdir = @raddbdir@
308 radacctdir = @radacctdir@
309-top_builddir = @top_builddir@
310-top_srcdir = @top_srcdir@
311+top_builddir = @xxx_top_builddir@
312+top_srcdir = @top_srcdir@
313
314 MAKE = @MAKE@
315 CC = @CC@
316--- freeradius-0.9.3/configure.in.orig 2003-11-27 22:58:15.000000000 +0100
317+++ freeradius-0.9.3/configure.in 2003-11-27 23:08:10.301822240 +0100
318@@ -795,7 +795,8 @@
319 top_builddir=`pwd`
320 export top_builddir
321 AC_MSG_RESULT([top_builddir=$top_builddir])
322-AC_SUBST(top_builddir)
323+xxx_top_builddir="$top_builddir"
324+AC_SUBST(xxx_top_builddir)
325 AC_SUBST(LIBLTDL)
326 AC_SUBST(INCLTDL)
327
Unnamed repository; edit this file 'description' to name the repository.
This page took 0.060931 seconds and 4 git commands to generate.