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
4 dnl libltdl is installable
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) ],
12 - LIBTOOL="`pwd`/libtool"
14 - dnl ensure that we're looking for dlopen
17 - dnl Figure out how to build shared libraries
24 dnl Put this in later, when all distributed modules use autoconf.
25 dnl AC_ARG_WITH(disablemodulefoo,
29 dnl Check if we need -lsocket
30 -AC_CHECK_LIB(socket, getsockname)
31 +AC_SEARCH_LIBS(getsockname, socket)
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)
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)
43 dnl #############################################################
46 AC_SUBST(RADIUSD_VERSION)
52 ./src/include/build-radpaths-h \
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)])
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
70 #define HOSTINFO "$host"
71 #define RADIUSD_VERSION "$RADIUSD_VERSION"
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
78 +AC_INIT(rlm_ippool.c)
79 +AC_REVISION($Revision$)
80 +AC_DEFUN(modname,[rlm_ippool])
82 +if test x$with_[]modname != xno; then
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"
93 + if test "x$fail" = "x"; then
94 + AC_MSG_CHECKING(to see GDBM_SYNC status)
95 + AC_EGREP_CPP(found-gdbm-sync, [
100 + not found. this version must use sync by default.
103 + AC_DEFINE(NEED_GDBM_SYNC, yes)
104 + AC_MSG_RESULT(needs it.)
106 + AC_MSG_RESULT(SYNCs by default.)
112 + LIBS="$LIBS $SMART_LIBS"
113 + AC_CHECK_FUNC(gdbm_fdesc)
114 + if test "x$ac_cv_func_gdbm_fdesc" = "xyes";
116 + AC_DEFINE(HAVE_GDBM_FDESC)
123 + echo \*\*\* module modname is disabled.
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.])
130 + AC_MSG_WARN([silently not building ]modname[.])
131 + AC_MSG_WARN([FAILURE: ]modname[ requires: $fail.]);
136 +if test x"$targetname" != x""; then
137 + ippool_utils="rlm_ippool_tool"
138 + ippool_install="rlm_ippool_install"
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)
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
153 RADIR = ${radacctdir}
156 -LIBLTDLPATH = @LIBLTDLPATH@
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
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 $@
173 ifneq ($(USE_SHARED_LIBS),yes)
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
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
187 #######################################################################
188 $(TARGET).a: $(STATIC_OBJS)
189 - $(LIBTOOL) --mode=link $(LD) \
190 + $(LIBTOOL) --mode=link $(CC) \
191 -module -static $(CFLAGS) $(RLM_CFLAGS) $^ -o $@
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
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 $@
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 $@
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
212 $(DYNAMIC_OBJS): $(HEADERS)
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
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
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 $@
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
237 CFLAGS += -I../include $(SNMP_INCLUDE)
239 -LIBS += -lradius $(SNMP_LIBS)
240 +LIBS += ../lib/libradius.la $(SNMP_LIBS)
241 MODULE_LIBS = $(STATIC_MODULES)
243 VFLAGS = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
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
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)
262 radclient.o: radclient.c $(INCLUDES)
263 $(CC) $(CFLAGS) -c radclient.c
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)
270 radrelay.o: radrelay.c $(INCLUDES)
271 $(CC) $(CFLAGS) -c radrelay.c
272 @@ -118,24 +118,24 @@
273 $(CC) $(CFLAGS) -c radwho.c
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)
279 radzap.o: radzap.c $(INCLUDES)
280 $(CC) $(CFLAGS) -c radzap.c
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)
287 rm -rf *.o *.so *~ $(BINARIES) .libs
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
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@
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
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)