$NetBSD: patch-aa,v 1.5 2008/08/03 05:17:40 obache Exp $ --- configure.orig 2002-02-11 19:14:06.000000000 +0000 +++ configure @@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared" LDFLAGS="$LDFLAGS" LIBS="$LIBS" XLDFLAGS="$XLDFLAGS " -JHOME=`pwd` +JHOME=${PKG_SYSCONFDIR} +WRKSRC="`cat .wrksrc-freebsd`" ## # Print a cool header @@ -45,7 +46,7 @@ printf "========================\n\n" ## if [ $WANT_SSL -eq 1 ]; then printf "Searching for SSL..."; - for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + for dir in ${SSLBASE}; do ssldir="$dir" if test -f "$dir/include/openssl/ssl.h"; then found_ssl="yes"; @@ -76,31 +77,19 @@ fi; ## # Pth check ## -printf "Getting pth settings..." -PTH_CFLAGS=`pth-config --cflags` -PTH_LDFLAGS=`pth-config --ldflags` -PTH_LIBS=`pth-config --libs` -PTH_LIBDIR=`pth-config --libdir` -if [ -n "$PTH_CFLAGS" ]; then - CFLAGS="$CFLAGS $PTH_CFLAGS"; - LDFLAGS="$LDFLAGS $PTH_LDFLAGS"; - LIBS="$LIBS $PTH_LIBS"; - SLIBS="$SLIBS $PTH_LIBDIR/libpth.a"; - printf " Done.\n"; -else - if [ -d "jabberd/pth-1.4.0" ]; then - opwd=`pwd` - cd jabberd/pth-1.4.0; - ./configure || (printf "Error Configuring pth"; exit 1); - cd $opwd; - PSUBDIR="pth-1.4.0"; - PTHP=`pwd`"/jabberd/pth-1.4.0"; - PLINK="$PTHP/pth_*.o"; - CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0"; - else - printf " Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/"; - fi -fi +echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible" +opwd=`pwd` +cd jabberd/pth-1.4.0; +echo "Configuring jabber pth-1.4.0..." +./configure || (echo "Error Configuring pth"; exit 1); +echo "Building pth-1.4.0..." +gmake +cd $opwd; +PSUBDIR="pth-1.4.0"; +PTHP="`pwd`/jabberd/pth-1.4.0"; +PLINK="$PTHP/pth_*.o"; +CFLAGS="$CFLAGS -I${PTHP}"; +LDFLAGS="$LDFLAGS -L${PTHP}"; @@ -123,10 +112,11 @@ case $hosttype in CFLAGS="$CFLAGS -fPIC -D_REENTRANT" SLIBS="$SLIBS /usr/lib/libresolv.a"; LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";; - FreeBSD) + FreeBSD|DragonFly) CFLAGS="$CFLAGS -fPIC" XLDFLAGS="$XLDFLAGS -Wl,-E";; NetBSD) + CFLAGS="$CFLAGS -fPIC" LIBS="$LIBS -lresolv" SLIBS="$SLIBS /usr/lib/libresolv.a"; XLDFLAGS="$XLDFLAGS -Wl,--export-dynamic";;