From 4800699534e5f3b489d3da9ef4941e68b7dab705 Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 16 Aug 2002 03:16:32 +0000
Subject: [PATCH] Add NetBSD

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14287 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog    |  5 +++++
 configure    | 24 ++++++++++--------------
 configure.ac | 24 ++++++++++--------------
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d282a10..4e16196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-15  Adam Fedor  <fedor@gnu.org>
+
+	* configure.ac: Add NetBSD header/ldflag support (Patch from
+	Peter Cooper). Cleanup freebsd support.
+
 2002-08-06  Adam Fedor  <fedor@gnu.org>
 
 	* Source/x11/XGServerEvent.m ([XGServer
diff --git a/configure b/configure
index bd436ad..5a434c7 100755
--- a/configure
+++ b/configure
@@ -2105,6 +2105,16 @@ fi
 CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 
+#--------------------------------------------------------------------
+# Add target OS directories as necessary
+#--------------------------------------------------------------------
+case "$target_os" in
+  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+  netbsd*)    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+esac
+
 #--------------------------------------------------------------------
 # Look for WindowMaker's wraster library
 #--------------------------------------------------------------------
@@ -4561,13 +4571,6 @@ else
   with_jpeg_include=
 fi;
 
-if test "$with_jpeg_library" = ""; then
-  case "$target_os" in
-    freebsd*)	with_jpeg_include="/usr/local/include"
-		with_jpeg_library="/usr/local/lib";;
-  esac
-fi
-
 if test -n "$with_jpeg_library"; then
   with_jpeg_library="-L$with_jpeg_library"
 fi
@@ -4709,13 +4712,6 @@ else
   with_tiff_include=
 fi;
 
-if test "$with_tiff_library" = ""; then
-  case "$target_os" in
-    freebsd*)	with_tiff_include="/usr/local/include"
-		with_tiff_library="/usr/local/lib";;
-  esac
-fi
-
 if test -n "$with_tiff_library"; then
   with_tiff_library="-L$with_tiff_library"
 fi
diff --git a/configure.ac b/configure.ac
index 823fcd4..8a8d030 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,16 @@ fi
 CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
 
+#--------------------------------------------------------------------
+# Add target OS directories as necessary
+#--------------------------------------------------------------------
+case "$target_os" in
+  freebsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+  netbsd*)    CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+              LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+esac
+
 #--------------------------------------------------------------------
 # Look for WindowMaker's wraster library
 #--------------------------------------------------------------------
@@ -210,13 +220,6 @@ AC_ARG_WITH(jpeg_include,
 	[  --with-jpeg-include=DIR JPEG include files are in DIR], ,
         with_jpeg_include=)
 
-if test "$with_jpeg_library" = ""; then
-  case "$target_os" in
-    freebsd*)	with_jpeg_include="/usr/local/include"
-		with_jpeg_library="/usr/local/lib";;
-  esac
-fi
-
 if test -n "$with_jpeg_library"; then
   with_jpeg_library="-L$with_jpeg_library"
 fi
@@ -263,13 +266,6 @@ AC_ARG_WITH(tiff_include,
 	[  --with-tiff-include=DIR TIFF include files are in DIR], ,
         with_tiff_include=)
 
-if test "$with_tiff_library" = ""; then
-  case "$target_os" in
-    freebsd*)	with_tiff_include="/usr/local/include"
-		with_tiff_library="/usr/local/lib";;
-  esac
-fi
-
 if test -n "$with_tiff_library"; then
   with_tiff_library="-L$with_tiff_library"
 fi