$NetBSD: patch-aa,v 1.14 2009/04/13 12:16:24 rh Exp $

--- configure.orig	2009-06-30 22:47:17.000000000 +0200
+++ configure
@@ -2867,7 +2867,7 @@ echo $ECHO_N "checking the Objective-C r
 if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then
   echo "$as_me:$LINENO: result: NeXT" >&5
 echo "${ECHO_T}NeXT" >&6
-  LIBOBJC='-lobjc'
+  LIBOBJC='-lobjc -lc'
   OBJCFLAGS="-fnext-runtime -DNeXT_RUNTIME"
 elif test "$OBJC_RUNTIME_LIB" = "gnugc"; then
   echo "$as_me:$LINENO: result: GNU" >&5
@@ -2878,7 +2878,7 @@ echo "${ECHO_T}GNU" >&6
 else
   echo "$as_me:$LINENO: result: GNU" >&5
 echo "${ECHO_T}GNU" >&6
-  LIBOBJC='-lobjc'
+  LIBOBJC='-lobjc -lc'
   OBJCFLAGS="-fgnu-runtime"
 fi
 
@@ -2946,6 +2946,11 @@ if test -f "$GNUSTEP_HDIR/objc/objc.h"; 
   fi
 fi
 
+gcc_shared_libobjc=`gcc -print-file-name=libobjc.so`
+if test -f "$gcc_shared_libobjc"; then
+  gs_cv_objc_libdir=`dirname $gcc_shared_libobjc`
+fi
+
 fi
 
 echo "$as_me:$LINENO: result: $gs_cv_objc_libdir" >&5
@@ -4062,7 +4067,8 @@ _ACEOF
 
 CFLAGS="$saved_CFLAGS"
 
-
+ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $LIBS"
 #--------------------------------------------------------------------
 # Check if system has buggy SO_REUSEADDR
 #--------------------------------------------------------------------
@@ -4100,6 +4106,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 reuseaddr_ok=0
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 if test $reuseaddr_ok = 0; then
 
@@ -7568,7 +7575,7 @@ fi
 #	DYNAMIC_LINKER	- cooresponds to the interface that is included
 #		in objc-load.c (i.e. #include "${DYNAMIC_LINKER}-load.h")
 #--------------------------------------------------------------------
-DYNAMIC_LINKER=null
+DYNAMIC_LINKER='ldqnx.so.2'
 if test "${ac_cv_header_dlfcn_h+set}" = set; then
   echo "$as_me:$LINENO: checking for dlfcn.h" >&5
 echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6
@@ -8153,13 +8160,13 @@ echo "${ECHO_T}$DYNAMIC_LINKER" >&6
 
 if test $DYNAMIC_LINKER = simple; then
 
-echo "$as_me:$LINENO: checking for dladdr in -ldl" >&5
-echo $ECHO_N "checking for dladdr in -ldl... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for dladdr in -lc" >&5
+echo $ECHO_N "checking for dladdr in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dladdr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
+LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8222,7 +8229,7 @@ if test $ac_cv_lib_dl_dladdr = yes; then
 #define HAVE_LIBDL 1
 _ACEOF
 
-  LIBS="-ldl $LIBS"
+  LIBS=" $LIBS"
 
 fi
 
@@ -12009,7 +12016,7 @@ _ACEOF
 fi
 
 if test x"$objc_threaded" = x"-pthread"; then
-  LIBS="$LIBS -lpthread"
+  LIBS="$LIBS -lc"
 fi
 
 #--------------------------------------------------------------------
@@ -13768,7 +13775,7 @@ _ACEOF
 
 
 
-for ac_header in libc.h limits.h malloc.h memory.h string.h signal.h         stdlib.h 	sys/signal.h sys/wait.h sys/file.h sys/fcntl.h sys/ioctl.h 	sys/stropts.h unistd.h utime.h stdint.h inttypes.h sys/inttypes.h
+for ac_header in libc.h limits.h malloc.h memory.h string.h signal.h         stdlib.h 	sys/signal.h sys/wait.h sys/file.h fcntl.h sys/ioctl.h 	sys/stropts.h unistd.h utime.h stdint.h inttypes.h sys/inttypes.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -14044,9 +14051,8 @@ _ACEOF
 fi
 
 
-
-
-
+ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $LIBS"
 
 for ac_func in gethostbyaddr_r inet_aton inet_pton inet_ntop sigaction
 do
@@ -14138,6 +14144,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
