Fri, 07 Sep 2012 19:08:07 +0200
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
michael@47 | 1 | Index: Make.inc.in |
michael@306 | 2 | --- Make.inc.in.orig 2010-05-24 07:40:58.000000000 +0200 |
michael@306 | 3 | +++ Make.inc.in 2010-05-24 23:54:11.000000000 +0200 |
michael@47 | 4 | @@ -15,7 +15,7 @@ |
michael@47 | 5 | docdir = @docdir@ |
michael@47 | 6 | mandir = @mandir@ |
michael@47 | 7 | datadir = @datadir@ |
michael@47 | 8 | -dictdir = $(datadir)/freeradius |
michael@47 | 9 | +dictdir = $(datadir) |
michael@47 | 10 | logdir = @logdir@ |
michael@47 | 11 | includedir = @includedir@ |
michael@47 | 12 | raddbdir = @raddbdir@ |
michael@306 | 13 | @@ -49,7 +49,7 @@ |
michael@47 | 14 | |
michael@47 | 15 | LOGDIR = ${logdir} |
michael@47 | 16 | RADDBDIR = ${raddbdir} |
michael@47 | 17 | -RUNDIR = ${localstatedir}/run/radiusd |
michael@47 | 18 | +RUNDIR = ${localstatedir} |
michael@47 | 19 | SBINDIR = ${sbindir} |
michael@47 | 20 | RADIR = ${radacctdir} |
michael@47 | 21 | LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la |
michael@47 | 22 | Index: raddb/radiusd.conf.in |
michael@306 | 23 | --- raddb/radiusd.conf.in.orig 2010-05-24 07:40:58.000000000 +0200 |
michael@306 | 24 | +++ raddb/radiusd.conf.in 2010-05-24 23:54:11.000000000 +0200 |
michael@47 | 25 | @@ -66,7 +66,7 @@ |
michael@47 | 26 | |
michael@47 | 27 | # Location of config and logfiles. |
michael@47 | 28 | confdir = ${raddbdir} |
michael@306 | 29 | -run_dir = ${localstatedir}/run/${name} |
michael@47 | 30 | +run_dir = ${localstatedir} |
michael@47 | 31 | |
michael@47 | 32 | # Should likely be ${localstatedir}/lib/radiusd |
michael@47 | 33 | db_dir = ${raddbdir} |
michael@306 | 34 | Index: src/main/event.c |
michael@306 | 35 | --- src/main/event.c.orig 2010-05-24 07:40:58.000000000 +0200 |
michael@306 | 36 | +++ src/main/event.c 2010-05-25 08:53:57.000000000 +0200 |
michael@306 | 37 | @@ -74,7 +74,9 @@ |
michael@306 | 38 | #define PTHREAD_MUTEX_LOCK if (have_children) pthread_mutex_lock |
michael@306 | 39 | #define PTHREAD_MUTEX_UNLOCK if (have_children) pthread_mutex_unlock |
michael@47 | 40 | |
michael@306 | 41 | +#if defined(HAVE_PTHREAD_H) |
michael@306 | 42 | static pthread_t NO_SUCH_CHILD_PID; |
michael@306 | 43 | +#endif |
michael@306 | 44 | #else |
michael@306 | 45 | /* |
michael@306 | 46 | * This is easier than ifdef's throughout the code. |