summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>2002-04-27 15:03:34 +0000
committerBrian Somers <brian@FreeBSD.org>2002-04-27 15:03:34 +0000
commit934f51c4214daf806e70ca986b6c0066a9358080 (patch)
tree0828ad2071465e80c34caa10241caae64591bc20 /net
parentupgrade to 0425 (diff)
Hand off library & include information from the menu to configure properly.
No response from: maintainer
Notes
Notes: svn path=/head/; revision=58233
Diffstat (limited to 'net')
-rw-r--r--net/gnu-radius/Makefile7
-rw-r--r--net/gnu-radius/scripts/configure10
2 files changed, 12 insertions, 5 deletions
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 14e6b7d1d1cf..8f1704bbf12a 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -17,8 +17,6 @@ MAINTAINER= lance@evitel.net
USE_SUBMAKE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-include-path="${LOCALBASE}/include/" \
- --with-lib-path="${LOCALBASE}/lib/"
MAN1= radgrep.1 radlast.1 raduse.1 radwho.1
MAN8= builddbm.8 radctl.8 radiusd.8 radping.8 radzap.8
@@ -29,7 +27,10 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
STARTUP_FILE= ${PREFIX}/etc/rc.d/gnu-radius.sh
-.if !defined(BATCH)
+.if defined(BATCH)
+CONFIGURE_ARGS+=--with-include-path="${LOCALBASE}/include/" \
+ --with-lib-path="${LOCALBASE}/lib/"
+.else
post-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
.endif
diff --git a/net/gnu-radius/scripts/configure b/net/gnu-radius/scripts/configure
index dbfb5a312f20..78e961fee908 100644
--- a/net/gnu-radius/scripts/configure
+++ b/net/gnu-radius/scripts/configure
@@ -40,6 +40,9 @@ fi
exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+INCLUDE_PATH=${LOCALBASE}/include/
+LIB_PATH=${LOCALBASE}/lib/
+
while [ "$1" ]; do
case $1 in
\"Client\")
@@ -52,12 +55,12 @@ while [ "$1" ]; do
\"MySQL\")
echo "LIB_DEPENDS+= mysqlclient.10:\${PORTSDIR}/databases/mysql323-client:install"
echo "CONFIGURE_ARGS+= --with-mysql"
- echo "CONFIGURE_ARGS+= --with-lib-path=${LOCALBASE}/lib/mysql/"
+ LIB_PATH="$LIB_PATH:${LOCALBASE}/lib/mysql/"
;;
\"PostgreSQL\")
echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7:install"
echo "CONFIGURE_ARGS+= --with-postgres"
- echo "CONFIGURE_ARGS+= --with-include-path=${LOCALBASE}/include/pgsql/"
+ INCLUDE_PATH="$INCLUDE_PATH:${LOCALBASE}/include/pgsql/"
;;
\"SNMP\")
echo "CONFIGURE_ARGS+= --enable-snmp"
@@ -74,6 +77,9 @@ while [ "$1" ]; do
shift
done
+echo "CONFIGURE_ARGS+= --with-include-path=\"$INCLUDE_PATH\""
+echo "CONFIGURE_ARGS+= --with-lib-path=\"$LIB_PATH\""
+
if [ -z $GUILE ]; then
echo "CONFIGURE_ARGS+= --without-guile"
echo ${PLIST}