$NetBSD: patch-at,v 1.7 2005/11/29 07:02:47 joerg Exp $ --- configure.orig 2005-01-24 09:22:46.000000000 -0600 +++ configure @@ -481,7 +481,7 @@ mksharedlibrpath='' if test $withsharedlibs = "yes"; then case "$host" in - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*) + *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-dragonfly*) sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared -o" bytecclinkopts="$bytecclinkopts -Wl,-E" @@ -569,10 +569,12 @@ case "$host" in sparc*-*-linux*) arch=sparc; system=linux;; i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; + i[3456]86-*-dragonfly*) arch=i386; system=bsd_`sh ./runtest elf.c`;; i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) arch=i386; system=solaris;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; + i[3456]86-*-interix3*) arch=i386; system=interix3;; mips-*-irix6*) arch=mips; system=irix;; hppa1.1-*-hpux*) arch=hppa; system=hpux;; hppa2.0*-*-hpux*) arch=hppa; system=hpux;; @@ -657,6 +659,7 @@ case "$arch,$model,$system" in profiling='prof' case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; amd64,*,linux) profiling='prof';; + power,*,bsd) profiling='prof';; *) profiling='noprof';; esac @@ -1077,6 +1080,7 @@ if test "$pthread_wanted" = "yes"; then case "$host" in *-*-solaris*) pthread_link="-lpthread -lposix4";; *-*-freebsd*) pthread_link="-pthread";; + *-*-dragonfly*) pthread_link="-pthread";; *-*-openbsd*) pthread_link="-pthread";; *) pthread_link="-lpthread";; esac @@ -1123,6 +1127,7 @@ fi x11_include="not found" x11_link="not found" +if test "$disable_x11" != "yes"; then for dir in \ $x11_include_dir \ \ @@ -1169,6 +1174,7 @@ do break fi done +fi if test "$x11_include" = "not found"; then x11_try_lib_dir='' @@ -1258,31 +1264,8 @@ dbm_include="not found" dbm_link="not found" use_gdbm_ndbm=no -for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do - if test -f $dir/ndbm.h; then - dbm_include=$dir - if sh ./hasgot dbm_open; then - dbm_link="" - elif sh ./hasgot -lndbm dbm_open; then - dbm_link="-lndbm" - elif sh ./hasgot -ldb1 dbm_open; then - dbm_link="-ldb1" - elif sh ./hasgot -lgdbm dbm_open; then - dbm_link="-lgdbm" - elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi - if test -f $dir/gdbm-ndbm.h; then - dbm_include=$dir - use_gdbm_ndbm=yes - if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi -done +dbm_include=/usr/include +dbm_link=${BDB_LIBS} if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then echo "NDBM not found, the \"dbm\" library will not be supported." else @@ -1294,8 +1277,8 @@ else fi echo "DBM_INCLUDES=$dbm_include" >> Makefile echo "DBM_LINK=$dbm_link" >> Makefile - if test "$use_gdbm_ndbm" = "yes"; then - echo "#define DBM_USES_GDBM_NDBM" >> s.h + if test ${BDB_BUILTIN} != "yes"; then + echo "#define DBM_USES_DB" >> s.h fi otherlibraries="$otherlibraries dbm" fi