X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fopenbsd.sh;h=4ae2611b07a9974184c2afba7504e869235673b8;hb=808e46e63f3614cadd44c8187e3ba1ff1a6d7721;hp=4c98ec8587a822a2ee73d2f96f7e74928b80a06a;hpb=dd64f1c34f78dffc99057d229091d8331d2ddf2d;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/openbsd.sh b/hints/openbsd.sh
index 4c98ec8..4ae2611 100644
--- a/hints/openbsd.sh
+++ b/hints/openbsd.sh
@@ -4,6 +4,9 @@
 # Edited to allow Configure command-line overrides by
 #  Andy Dougherty <doughera@lafcol.lafayette.edu>
 #
+# To build with distribution paths, use:
+#	./Configure -des -Dopenbsd_distribution
+#
 
 # OpenBSD has a better malloc than perl...
 test "$usemymalloc" || usemymalloc='n'
@@ -15,10 +18,10 @@ usevfork='true'
 # setre?[ug]id() have been replaced by the _POSIX_SAVED_IDS versions
 # in 4.4BSD.  Configure will find these but they are just emulated
 # and do not have the same semantics as in 4.3BSD.
-d_setregid='undef'
-d_setreuid='undef'
-d_setrgid='undef'
-d_setruid='undef'
+d_setregid=$undef
+d_setreuid=$undef
+d_setrgid=$undef
+d_setruid=$undef
 
 #
 # Not all platforms support shared libs...
@@ -37,15 +40,52 @@ alpha|mips|powerpc|vax)
 	;;
 esac
 
+#
+# Tweaks for various versions of OpenBSD
+#
+case "$osvers" in
+2.5)
+	# OpenBSD 2.5 has broken odbm support
+	i_dbm=$undef
+	;;
+esac
+
 # OpenBSD doesn't need libcrypt but many folks keep a stub lib
 # around for old NetBSD binaries.
 libswanted=`echo $libswanted | sed 's/ crypt / /'`
 
 # Configure can't figure this out non-interactively
-d_suidsafe='define'
+d_suidsafe=$define
 
 # cc is gcc so we can do better than -O
 # Allow a command-line override, such as -Doptimize=-g
 test "$optimize" || optimize='-O2'
 
+# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use threads.
+cat > UU/usethreads.cbu <<'EOCBU'
+case "$usethreads" in
+$define|true|[yY]*)
+	# any openbsd version dependencies with pthreads?
+	libswanted="$libswanted pthread"
+esac
+EOCBU
+
+# When building in the OpenBSD tree we use different paths
+# This is only part of the story, the rest comes from config.over
+case "$openbsd_distribution" in
+''|$undef|false|[nN]*) ;;
+*)
+	# We put things in /usr, not /usr/local
+	prefix='/usr'
+	prefixexp='/usr'
+	sysman='/usr/share/man/man1'
+	# Never look for things in /usr/local
+	glibpth='/usr/lib'
+	libpth='/usr/lib'
+	locincpth=''
+	loclibpth=''
+	;;
+esac
+
 # end