$NetBSD: patch-aa,v 1.2 2006/10/14 12:16:08 shattered Exp $

--- config/Configure.orig	Thu May  1 21:04:48 2003
+++ config/Configure	Wed Dec 24 06:37:08 2003
@@ -492,6 +492,36 @@
 	echo >>generic.cf "#define HasGetHostIDPrototype 1"	# in <unistd.h>; not true pre Solaris 2.6
 	echo >>generic.cf "#endif"
 
+	if [ "X$PKGSRC_X11BASE" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef X11LibraryPath"
+		echo >>generic.cf "#define X11LibraryPath $PKGSRC_X11BASE/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef X11IncludePath"
+		echo >>generic.cf "#define X11IncludePath $PKGSRC_X11BASE/include"
+		echo >>generic.cf "#endif"		
+	fi
+	
+	if [ "X$PKGSRC_PREFIX" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef InstallBinDir"
+		echo >>generic.cf "#define InstallBinDir $PKGSRC_PREFIX/bin"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallLibDir"
+		echo >>generic.cf "#define InstallLibDir $PKGSRC_PREFIX/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallManDir"
+		echo >>generic.cf "#define InstallManDir $PKGSRC_PREFIX/man"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallIncDir"
+		echo >>generic.cf "#define InstallIncDir $PKGSRC_PREFIX/includes"
+		echo >>generic.cf "#endif"
+	fi
+	
 	echo >>generic.cf "#ifndef X11LibraryPath"
 	echo >>generic.cf "#define X11LibraryPath /usr/openwin/lib"
 	echo >>generic.cf "#endif"
@@ -690,6 +720,37 @@
 
 	# X11LibraryPath may already have been overridden, but ...
 
+	if [ "X$PKGSRC_X11BASE" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef X11LibraryPath"
+		echo >>generic.cf "#define X11LibraryPath $PKGSRC_X11BASE/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef X11IncludePath"
+		echo >>generic.cf "#define X11IncludePath $PKGSRC_X11BASE/include"
+		echo >>generic.cf "#endif"		
+	fi
+	
+	if [ "X$PKGSRC_PREFIX" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef InstallBinDir"
+		echo >>generic.cf "#define InstallBinDir $PKGSRC_PREFIX/bin"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallLibDir"
+		echo >>generic.cf "#define InstallLibDir $PKGSRC_PREFIX/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallManDir"
+		echo >>generic.cf "#define InstallManDir $PKGSRC_PREFIX/man"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallIncDir"
+		echo >>generic.cf "#define InstallIncDir $PKGSRC_PREFIX/includes"
+		echo >>generic.cf "#endif"
+	fi
+	
+	
 	# X11LibraryPath may already have been overridden, but ...
 
 	if [ -f /usr/lib64/libX11.a ]		# They changed it in FC5
@@ -728,6 +789,111 @@
 	echo >>generic.cf "#endif"
 fi
 
+if [ "$osname" = "FreeBSD" ]
+then
+	echo >>generic.cf "#ifndef UseDumbInfinityAndNAN"
+	echo >>generic.cf "#define UseDumbInfinityAndNAN 1"
+	echo >>generic.cf "#endif"
+	
+	echo >>generic.cf "#ifndef HasGetHostIDPrototype"
+	echo >>generic.cf "#define HasGetHostIDPrototype 1"	# in <unistd.h>; not true pre Solaris 2.6
+	echo >>generic.cf "#endif"
+	
+	echo >>generic.cf "#ifndef HasGetHostID"
+	echo >>generic.cf "#define HasGetHostID 1"
+	echo >>generic.cf "#endif"
+	
+	echo >>generic.cf "#ifndef UseOwnLog2"
+	echo >>generic.cf "#define UseOwnLog2 1"
+	echo >>generic.cf "#endif"
+	
+	echo >>generic.cf "#ifndef UseGlibcTimezone"
+	echo >>generic.cf "#define UseGlibcTimezone 1"
+	echo >>generic.cf "#endif"
+
+	if [ "X$PKGSRC_PREFIX" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef InstallBinDir"
+		echo >>generic.cf "#define InstallBinDir $PKGSRC_PREFIX/bin"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallLibDir"
+		echo >>generic.cf "#define InstallLibDir $PKGSRC_PREFIX/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallManDir"
+		echo >>generic.cf "#define InstallManDir $PKGSRC_PREFIX/man"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallIncDir"
+		echo >>generic.cf "#define InstallIncDir $PKGSRC_PREFIX/includes"
+		echo >>generic.cf "#endif"
+	fi
+	
+	if [ "X$PKGSRC_X11BASE" != "X" ]
+	then
+		echo >>generic.cf "#ifndef X11LibraryPath"
+		echo >>generic.cf "#define X11LibraryPath $PKGSRC_X11BASE/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef X11IncludePath"
+		echo >>generic.cf "#define X11IncludePath $PKGSRC_X11BASE/include"
+		echo >>generic.cf "#endif"		
+	fi
+fi
+
+if [ "$osname" = "NetBSD" ]
+then
+	echo >>generic.cf "#ifndef UseDumbInfinityAndNAN"
+	echo >>generic.cf "#define UseDumbInfinityAndNAN 1"
+	echo >>generic.cf "#endif"
+
+	echo >>generic.cf "#ifndef UseOwnLog2"
+	echo >>generic.cf "#define UseOwnLog2 1"
+	echo >>generic.cf "#endif"
+	
+	# please build it on NetBSD and check if this is needed:
+	#echo >>generic.cf "#ifndef UseGlibcTimezone"
+	#echo >>generic.cf "#define UseGlibcTimezone 1"
+	#echo >>generic.cf "#endif"
+	#echo >>generic.cf "#ifndef HasGetHostID"
+	#echo >>generic.cf "#define HasGetHostID 1"
+	#echo >>generic.cf "#endif"
+	#echo >>generic.cf "#ifndef HasGetHostIDPrototype"
+	#echo >>generic.cf "#define HasGetHostIDPrototype 1"	# in <unistd.h>; not true pre Solaris 2.6
+	#echo >>generic.cf "#endif"
+	
+	if [ "X$PKGSRC_PREFIX" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef InstallBinDir"
+		echo >>generic.cf "#define InstallBinDir $PKGSRC_PREFIX/bin"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallLibDir"
+		echo >>generic.cf "#define InstallLibDir $PKGSRC_PREFIX/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallManDir"
+		echo >>generic.cf "#define InstallManDir $PKGSRC_PREFIX/man"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallIncDir"
+		echo >>generic.cf "#define InstallIncDir $PKGSRC_PREFIX/includes"
+		echo >>generic.cf "#endif"
+	fi
+
+	if [ "X$PKGSRC_X11BASE" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef X11LibraryPath"
+		echo >>generic.cf "#define X11LibraryPath $PKGSRC_X11BASE/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef X11IncludePath"
+		echo >>generic.cf "#define X11IncludePath $PKGSRC_X11BASE/include"
+		echo >>generic.cf "#endif"		
+	fi
+fi
+
 if [ "$osname" = "ULTRIX" ]
 then
 	echo 1>&2 "Configure: we are on $osname"
@@ -749,6 +915,36 @@
 if [ "$osname" = "Darwin" ]
 then
 	echo 1>&2 "Configure: we are on $osname ($osmajorversion.$osminorversion)"
+
+	if [ "X$PKGSRC_PREFIX" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef InstallBinDir"
+		echo >>generic.cf "#define InstallBinDir $PKGSRC_PREFIX/bin"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallLibDir"
+		echo >>generic.cf "#define InstallLibDir $PKGSRC_PREFIX/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallManDir"
+		echo >>generic.cf "#define InstallManDir $PKGSRC_PREFIX/man"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef InstallIncDir"
+		echo >>generic.cf "#define InstallIncDir $PKGSRC_PREFIX/includes"
+		echo >>generic.cf "#endif"
+	fi
+	
+	if [ "X$PKGSRC_X11BASE" != "X" ]		# for pkgsrc, see http://www.pkgsrc.org for details
+	then
+		echo >>generic.cf "#ifndef X11LibraryPath"
+		echo >>generic.cf "#define X11LibraryPath $PKGSRC_X11BASE/lib"
+		echo >>generic.cf "#endif"
+		
+		echo >>generic.cf "#ifndef X11IncludePath"
+		echo >>generic.cf "#define X11IncludePath $PKGSRC_X11BASE/include"
+		echo >>generic.cf "#endif"		
+	fi	
 
 	if [ -d /usr/X11R6/lib ]
 	then
