diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2001-03-11 15:29:48 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2001-03-11 15:29:48 +0000 |
| commit | 80fbae31e631c3c5fef0d16d65480467dce71eea (patch) | |
| tree | 51709076757083d33f133ad147846aee3b1e5604 /www | |
| parent | Remove libxode. It's not used anymore now that jabber-1.4 has this (diff) | |
- Fix SNMP support by adding OpenSSL libs (net-snmp has an hidden
dependency to OpenSSL)
- USE_OPENSSL for PostgreSQL and SNMP support
Notes
Notes:
svn path=/head/; revision=39591
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_php4/scripts/configure.php | 11 | ||||
| -rw-r--r-- | www/mod_php5/scripts/configure.php | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index 10fbfbec5abb..664c7de99291 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -107,8 +107,9 @@ while [ "$1" ]; do \"PostgreSQL\") echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}/pgsql" - if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres | /usr/bin/grep -q "libssl"; then - LIBS="-lcrypto -lssl" + if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then + echo "USE_OPENSSL= yes" + LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" fi ;; \"SybaseDB\") @@ -143,12 +144,10 @@ while [ "$1" ]; do fi ;; \"SNMP\") - echo "SNMP is DISABLED for now. Ignoring." > /dev/stderr - ;; - \"nothing\") - echo "LIB_DEPENDS+= snmp.4:\${PORTSDIR}/net/net-snmp" echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack" + echo "USE_OPENSSL= yes" + LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" ;; \"XML\") echo "BUILD_DEPENDS+= \${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat" diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index 10fbfbec5abb..664c7de99291 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -107,8 +107,9 @@ while [ "$1" ]; do \"PostgreSQL\") echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}/pgsql" - if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres | /usr/bin/grep -q "libssl"; then - LIBS="-lcrypto -lssl" + if /usr/bin/ldd ${PREFIX}/pgsql/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then + echo "USE_OPENSSL= yes" + LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" fi ;; \"SybaseDB\") @@ -143,12 +144,10 @@ while [ "$1" ]; do fi ;; \"SNMP\") - echo "SNMP is DISABLED for now. Ignoring." > /dev/stderr - ;; - \"nothing\") - echo "LIB_DEPENDS+= snmp.4:\${PORTSDIR}/net/net-snmp" echo "CONFIGURE_ARGS+=--with-snmp=\${PREFIX} --enable-ucd-snmp-hack" + echo "USE_OPENSSL= yes" + LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl" ;; \"XML\") echo "BUILD_DEPENDS+= \${PREFIX}/lib/libexpat.a:\${PORTSDIR}/textproc/expat" |