mirror of
https://git.freebsd.org/ports.git
synced 2025-06-24 22:20:35 -04:00
a4eadd0644
modified LOCALBASE. - This port should now also build on OSVERSIONs before OpenSSL was imported (untested). - Bumped PORTREVISION. PR: 34052 Submitted by: Thomas Hurst <freaky@aagh.net>
55 lines
2.2 KiB
Text
55 lines
2.2 KiB
Text
--- configure.in.orig Thu Dec 27 19:40:55 2001
|
|
+++ configure.in Thu Jan 24 11:02:57 2002
|
|
@@ -799,12 +799,10 @@
|
|
|
|
if test ".${GDBM_ROOT}" != .; then
|
|
AC_MSG_CHECKING([for the GNU Database Manager Library gdbm (required package)])
|
|
- if test -d $GDBM_ROOT &&
|
|
- test -r $GDBM_ROOT/libgdbm.a &&
|
|
- test -r $GDBM_ROOT/gdbm.h; then
|
|
+ if test 1; then
|
|
GDBM_ROOT=`cd ${GDBM_ROOT} && pwd`
|
|
- CORELIBS="${CORELIBS} -L$GDBM_ROOT -lgdbm"
|
|
- INCS="${INCS} -I$GDBM_ROOT"
|
|
+ CORELIBS="${CORELIBS} -L$GDBM_ROOT/lib -lgdbm"
|
|
+ INCS="${INCS} -I$GDBM_ROOT/include"
|
|
AC_DEFINE(HAVE_GDBM_H)
|
|
AC_MSG_RESULT([found in $GDBM_ROOT])
|
|
else
|
|
@@ -873,16 +871,11 @@
|
|
dnl>
|
|
dnl> user defined directory passed as option at configuration time
|
|
dnl>
|
|
- if test ".${GDCHART_ROOT}" != .; then
|
|
- if test -d $GDCHART_ROOT &&
|
|
- test -r $GDCHART_ROOT/libgdchart.a &&
|
|
- test -r $GDCHART_ROOT/gdc.h &&
|
|
- test -r $GDCHART_ROOT/gd-1.8.3/libgd.a &&
|
|
- test -r $GDCHART_ROOT/gd-1.8.3/gd.h &&
|
|
- test -r $GDCHART_ROOT/zlib-1.1.3/libz.a; then
|
|
+ if test 1; then
|
|
+ if test -d $GDCHART_ROOT; then
|
|
GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
|
|
- MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng -L$GDCHART_ROOT/zlib-1.1.3 -lz"
|
|
- INCS="${INCS} -I$GDCHART_ROOT"
|
|
+ MORELIBS="${MORELIBS} -L${prefix}/lib -lgdchart -lgd -lpng -lz"
|
|
+ INCS="${INCS} -I${prefix}/include/gd"
|
|
AC_DEFINE(HAVE_GDCHART)
|
|
AC_MSG_RESULT([found in $GDCHART_ROOT])
|
|
else
|
|
@@ -936,12 +929,10 @@
|
|
if test ".$ac_disable_openssl" = ".no"; then
|
|
AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)])
|
|
if test ".${OSSL_ROOT}" != .; then
|
|
- if test -d $OSSL_ROOT &&
|
|
- test -r $OSSL_ROOT/libssl.a &&
|
|
- test -r $OSSL_ROOT/openssl/ssl.h; then
|
|
+ if test 1; then
|
|
OSSL_ROOT=`cd ${OSSL_ROOT} && pwd`
|
|
- MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl"
|
|
- INCS="${INCS} -I$OSSL_ROOT"
|
|
+ MORELIBS="${MORELIBS} -L$OSSL_ROOT/crypto -lssl"
|
|
+ INCS="${INCS} -I$OSSL_ROOT/include"
|
|
AC_DEFINE(HAVE_OPENSSL)
|
|
AC_MSG_RESULT([found in $OSSL_ROOT])
|
|
elif test -d $OSSL_ROOT &&
|