$NetBSD: patch-ac,v 1.7 2007/03/08 19:24:24 rillig Exp $

--- configure.orig	2000-04-15 08:13:01.000000000 -0700
+++ configure
@@ -884,6 +884,16 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+case $host in
+*-*-darwin*)
+  EXTRA_OBJS=osx_interface.o
+  EXTRA_LIBS="-framework CoreFoundation -framework IOKit"
+  ;;
+*)
+  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
+  EXTRA_LIBS=
+  ;;
+esac
 
 if test -z "$GCC"; then
 	DEBUG="-g"
@@ -893,6 +903,12 @@ else
 	i?86-*-linux*)
 		DEBUG="-g -Wall -fsigned-char"
 		OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
+	i?86-*-netbsd*)
+		DEBUG="-g -Wall -fsigned-char"
+		OPT="-O2 -ffast-math -fsigned-char -finline-functions";;
+	*-netbsd*)
+		DEBUG="-g -Wall"
+		OPT="-O";;
 	*)
 		DEBUG="-g -Wall -fsigned-char"
 		OPT="-O20 -fsigned-char";;
@@ -1084,7 +1100,6 @@ EOF
 fi
 
 
-CFLAGS=""
 
 TYPESIZES="" 
 
@@ -1476,6 +1491,143 @@ else
 fi
 done
 
+for ac_hdr in util.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1489: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1494 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ echo $ac_n "checking for getrawpartition in -lutil""... $ac_c" 1>&6
+echo "configure:1520: checking for getrawpartition in -lutil" >&5
+ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lutil  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1528 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char getrawpartition();
+
+int main() {
+getrawpartition()
+; return 0; }
+EOF
+if { (eval echo configure:1539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  RAWPART="-DHAVE_GETRAWPARTITION='1' " LIBUTIL="-lutil"
+  
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+for ac_func in getopt_long
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:1570: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1575 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ GETOPT_LONG="-DGETOPT_LONG='1' "
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
 echo "configure:1482: checking whether ${MAKE-make} sets \${MAKE}" >&5
@@ -1736,6 +1892,8 @@ s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
+s%@EXTRA_OBJS@%$EXTRA_OBJS%g
+s%@EXTRA_LIBS@%$EXTRA_LIBS%g
 s%@CC@%$CC%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
@@ -1744,9 +1902,12 @@ s%@CPP@%$CPP%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@SBPCD_H@%$SBPCD_H%g
 s%@UCDROM_H@%$UCDROM_H%g
+s%@GETOPT_LONG@%$GETOPT_LONG%g
+s%@RAWPART@%$RAWPART%g
 s%@TYPESIZES@%$TYPESIZES%g
 s%@OPT@%$OPT%g
 s%@DEBUG@%$DEBUG%g
+s%@LIBUTIL@%$LIBUTIL%g
 
 CEOF
 EOF
