Try to further reduce the PORT dependencies.

Essentially, config.h now includes an 'os.h', which is created via
configure by linking a "port.h" file from the port directory to the
include directory.

Going to try to merge backend/port in similar ways

diff --git a/src/configure b/src/configure
index e0b8f933e9aaeb79918a56c9a9445c3b664247a0..ea3e8311d2596ae31e6a1fd6214b2f9cbd0f7cae 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -572,7 +572,7 @@ case "$host_os" in
         esac ;;
    linux*) PORTNAME='linux' ;;
     bsdi*) PORTNAME='bsdi' ;;
- freebsd*|netbsd*) PORTNAME='BSD44_derived' ;;
+ freebsd*|netbsd*) PORTNAME='BSD44_derived';;
     dgux*) PORTNAME='dgux';;
      aix*) PORTNAME='aix';;
 nextstep*) PORTNAME='nextstep';;
@@ -594,10 +594,11 @@ esac
 
 
 
+
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:601: checking for $ac_word" >&5
+echo "configure:602: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -626,7 +627,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:630: checking for $ac_word" >&5
+echo "configure:631: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -674,7 +675,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:678: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:679: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -684,11 +685,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <
-#line 688 "configure"
+#line 689 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -708,12 +709,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:713: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:717: checking whether we are using GNU C" >&5
+echo "configure:718: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -722,7 +723,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -737,7 +738,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:741: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:742: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -765,7 +766,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:769: checking how to run the C preprocessor" >&5
+echo "configure:770: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -780,13 +781,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <
-#line 784 "configure"
+#line 785 "configure"
 #include "confdefs.h"
 #include 
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -797,13 +798,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <
-#line 801 "configure"
+#line 802 "configure"
 #include "confdefs.h"
 #include 
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -832,7 +833,7 @@ HAVECXX='HAVE_Cplusplus=false'
 # Extract the first word of "install", so it can be a program name with args.
 set dummy install; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:836: checking for $ac_word" >&5
+echo "configure:837: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_INSTALL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -864,7 +865,7 @@ fi
 # Extract the first word of "bsdinst", so it can be a program name with args.
 set dummy bsdinst; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:868: checking for $ac_word" >&5
+echo "configure:869: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BSDINST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -927,7 +928,7 @@ fi
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:931: checking for $ac_word" >&5
+echo "configure:932: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -960,7 +961,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:964: checking for yywrap in -l$ac_lib" >&5
+echo "configure:965: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -968,7 +969,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <
-#line 972 "configure"
+#line 973 "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
@@ -979,7 +980,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1002,7 +1003,7 @@ fi
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1006: checking whether ln -s works" >&5
+echo "configure:1007: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1023,7 +1024,7 @@ else
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1027: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1028: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1052,7 +1053,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1056: checking for $ac_word" >&5
+echo "configure:1057: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1081,7 +1082,7 @@ fi
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1085: checking for $ac_word" >&5
+echo "configure:1086: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_find'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1112,7 +1113,7 @@ fi
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1116: checking for $ac_word" >&5
+echo "configure:1117: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_tar'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1143,7 +1144,7 @@ fi
 # Extract the first word of "split", so it can be a program name with args.
 set dummy split; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1147: checking for $ac_word" >&5
+echo "configure:1148: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_split'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1174,7 +1175,7 @@ fi
 # Extract the first word of "etags", so it can be a program name with args.
 set dummy etags; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1178: checking for $ac_word" >&5
+echo "configure:1179: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_etags'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1205,7 +1206,7 @@ fi
 # Extract the first word of "xargs", so it can be a program name with args.
 set dummy xargs; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1209: checking for $ac_word" >&5
+echo "configure:1210: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_xargs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1236,7 +1237,7 @@ fi
 # Extract the first word of "ipcs", so it can be a program name with args.
 set dummy ipcs; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1240: checking for $ac_word" >&5
+echo "configure:1241: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ipcs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1267,7 +1268,7 @@ fi
 # Extract the first word of "ipcrm", so it can be a program name with args.
 set dummy ipcrm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1271: checking for $ac_word" >&5
+echo "configure:1272: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ipcrm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1297,7 +1298,7 @@ fi
 
 
 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:1301: checking for main in -lcurses" >&5
+echo "configure:1302: checking for main in -lcurses" >&5
 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1305,14 +1306,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <
-#line 1309 "configure"
+#line 1310 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1340,7 +1341,7 @@ else
 fi
 
 echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
-echo "configure:1344: checking for main in -ltermcap" >&5
+echo "configure:1345: checking for main in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1348,14 +1349,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap  $LIBS"
 cat > conftest.$ac_ext <
-#line 1352 "configure"
+#line 1353 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1383,7 +1384,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6
-echo "configure:1387: checking for main in -lhistory" >&5
+echo "configure:1388: checking for main in -lhistory" >&5
 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1391,14 +1392,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lhistory  $LIBS"
 cat > conftest.$ac_ext <
-#line 1395 "configure"
+#line 1396 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1426,7 +1427,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6
-echo "configure:1430: checking for main in -lreadline" >&5
+echo "configure:1431: checking for main in -lreadline" >&5
 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1434,14 +1435,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <
-#line 1438 "configure"
+#line 1439 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1469,7 +1470,7 @@ else
 fi
 
 echo $ac_n "checking for write_history in -lreadline""... $ac_c" 1>&6
-echo "configure:1473: checking for write_history in -lreadline" >&5
+echo "configure:1474: checking for write_history in -lreadline" >&5
 ac_lib_var=`echo readline'_'write_history | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1477,7 +1478,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <
-#line 1481 "configure"
+#line 1482 "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
@@ -1488,7 +1489,7 @@ int main() {
 write_history()
 ; return 0; }
 EOF
-if { (eval echo configure:1492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1512,7 +1513,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:1516: checking for main in -lm" >&5
+echo "configure:1517: checking for main in -lm" >&5
 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1520,14 +1521,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <
-#line 1524 "configure"
+#line 1525 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1555,7 +1556,7 @@ else
 fi
 
 echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:1559: checking for main in -ldl" >&5
+echo "configure:1560: checking for main in -ldl" >&5
 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1563,14 +1564,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <
-#line 1567 "configure"
+#line 1568 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1598,7 +1599,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:1602: checking for main in -lsocket" >&5
+echo "configure:1603: checking for main in -lsocket" >&5
 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1606,14 +1607,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <
-#line 1610 "configure"
+#line 1611 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1641,7 +1642,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:1645: checking for main in -lnsl" >&5
+echo "configure:1646: checking for main in -lnsl" >&5
 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1649,14 +1650,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <
-#line 1653 "configure"
+#line 1654 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1684,7 +1685,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
-echo "configure:1688: checking for main in -lipc" >&5
+echo "configure:1689: checking for main in -lipc" >&5
 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1692,14 +1693,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <
-#line 1696 "configure"
+#line 1697 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1727,7 +1728,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6
-echo "configure:1731: checking for main in -lIPC" >&5
+echo "configure:1732: checking for main in -lIPC" >&5
 ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1735,14 +1736,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lIPC  $LIBS"
 cat > conftest.$ac_ext <
-#line 1739 "configure"
+#line 1740 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1770,7 +1771,7 @@ else
 fi
 
 echo $ac_n "checking for main in -llc""... $ac_c" 1>&6
-echo "configure:1774: checking for main in -llc" >&5
+echo "configure:1775: checking for main in -llc" >&5
 ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1778,14 +1779,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-llc  $LIBS"
 cat > conftest.$ac_ext <
-#line 1782 "configure"
+#line 1783 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1813,7 +1814,7 @@ else
 fi
 
 echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6
-echo "configure:1817: checking for main in -ldld" >&5
+echo "configure:1818: checking for main in -ldld" >&5
 ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1821,14 +1822,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldld  $LIBS"
 cat > conftest.$ac_ext <
-#line 1825 "configure"
+#line 1826 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1856,7 +1857,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lln""... $ac_c" 1>&6
-echo "configure:1860: checking for main in -lln" >&5
+echo "configure:1861: checking for main in -lln" >&5
 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1864,14 +1865,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lln  $LIBS"
 cat > conftest.$ac_ext <
-#line 1868 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1899,7 +1900,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
-echo "configure:1903: checking for main in -lbsd" >&5
+echo "configure:1904: checking for main in -lbsd" >&5
 ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1907,14 +1908,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <
-#line 1911 "configure"
+#line 1912 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1942,7 +1943,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lld""... $ac_c" 1>&6
-echo "configure:1946: checking for main in -lld" >&5
+echo "configure:1947: checking for main in -lld" >&5
 ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1950,14 +1951,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lld  $LIBS"
 cat > conftest.$ac_ext <
-#line 1954 "configure"
+#line 1955 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1985,7 +1986,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6
-echo "configure:1989: checking for main in -lcompat" >&5
+echo "configure:1990: checking for main in -lcompat" >&5
 ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1993,14 +1994,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcompat  $LIBS"
 cat > conftest.$ac_ext <
-#line 1997 "configure"
+#line 1998 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2028,7 +2029,7 @@ else
 fi
 
 echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6
-echo "configure:2032: checking for main in -lBSD" >&5
+echo "configure:2033: checking for main in -lBSD" >&5
 ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2036,14 +2037,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lBSD  $LIBS"
 cat > conftest.$ac_ext <
-#line 2040 "configure"
+#line 2041 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2072,12 +2073,12 @@ fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2076: checking for ANSI C header files" >&5
+echo "configure:2077: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2081 "configure"
+#line 2082 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2085,7 +2086,7 @@ else
 #include 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2102,7 +2103,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <
-#line 2106 "configure"
+#line 2107 "configure"
 #include "confdefs.h"
 #include 
 EOF
@@ -2120,7 +2121,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <
-#line 2124 "configure"
+#line 2125 "configure"
 #include "confdefs.h"
 #include 
 EOF
@@ -2141,7 +2142,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <
-#line 2145 "configure"
+#line 2146 "configure"
 #include "confdefs.h"
 #include 
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2152,7 +2153,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2176,12 +2177,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2180: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2181: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2185 "configure"
+#line 2186 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2197,7 +2198,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2221,17 +2222,17 @@ for ac_hdr in limits.h unistd.h termios.h values.h sys/select.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2225: checking for $ac_hdr" >&5
+echo "configure:2226: 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 <
-#line 2230 "configure"
+#line 2231 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2261,17 +2262,17 @@ for ac_hdr in readline.h history.h dld.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2265: checking for $ac_hdr" >&5
+echo "configure:2266: 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 <
-#line 2270 "configure"
+#line 2271 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2299,12 +2300,12 @@ done
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2303: checking for working const" >&5
+echo "configure:2304: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2308 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2353,7 +2354,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2374,12 +2375,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2378: checking for uid_t in sys/types.h" >&5
+echo "configure:2379: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2383 "configure"
+#line 2384 "configure"
 #include "confdefs.h"
 #include 
 EOF
@@ -2408,21 +2409,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2412: checking for inline" >&5
+echo "configure:2413: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <
-#line 2419 "configure"
+#line 2420 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2448,12 +2449,12 @@ EOF
 esac
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2452: checking for mode_t" >&5
+echo "configure:2453: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2457 "configure"
+#line 2458 "configure"
 #include "confdefs.h"
 #include 
 #if STDC_HEADERS
@@ -2481,12 +2482,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2485: checking for off_t" >&5
+echo "configure:2486: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2490 "configure"
+#line 2491 "configure"
 #include "confdefs.h"
 #include 
 #if STDC_HEADERS
@@ -2514,12 +2515,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2518: checking for size_t" >&5
+echo "configure:2519: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2523 "configure"
+#line 2524 "configure"
 #include "confdefs.h"
 #include 
 #if STDC_HEADERS
@@ -2547,12 +2548,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2551: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2552: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2556 "configure"
+#line 2557 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2561,7 +2562,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2582,12 +2583,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2586: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2587: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2591 "configure"
+#line 2592 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2595,7 +2596,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:2599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -2617,16 +2618,16 @@ fi
 
 
 echo $ac_n "checking for int timezone""... $ac_c" 1>&6
-echo "configure:2621: checking for int timezone" >&5
+echo "configure:2622: checking for int timezone" >&5
 cat > conftest.$ac_ext <
-#line 2623 "configure"
+#line 2624 "configure"
 #include "confdefs.h"
 #include 
 int main() {
 int res = timezone / 60; 
 ; return 0; }
 EOF
-if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_INT_TIMEZONE 1
@@ -2641,9 +2642,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for union semun""... $ac_c" 1>&6
-echo "configure:2645: checking for union semun" >&5
+echo "configure:2646: checking for union semun" >&5
 cat > conftest.$ac_ext <
-#line 2647 "configure"
+#line 2648 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2652,7 +2653,7 @@ int main() {
 union semun semun;
 ; return 0; }
 EOF
-if { (eval echo configure:2656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_UNION_SEMUN 1
@@ -2668,13 +2669,13 @@ rm -f conftest*
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2672: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:2673: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <
-#line 2678 "configure"
+#line 2679 "configure"
 #include "confdefs.h"
 #include 
 Autoconf TIOCGETP
@@ -2692,7 +2693,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <
-#line 2696 "configure"
+#line 2697 "configure"
 #include "confdefs.h"
 #include 
 Autoconf TCGETA
@@ -2714,7 +2715,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2718: checking for 8-bit clean memcmp" >&5
+echo "configure:2719: checking for 8-bit clean memcmp" >&5
 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2722,7 +2723,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <
-#line 2726 "configure"
+#line 2727 "configure"
 #include "confdefs.h"
 
 main()
@@ -2732,7 +2733,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_memcmp_clean=yes
 else
@@ -2750,12 +2751,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2754: checking return type of signal handlers" >&5
+echo "configure:2755: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2759 "configure"
+#line 2760 "configure"
 #include "confdefs.h"
 #include 
 #include 
@@ -2772,7 +2773,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2791,12 +2792,12 @@ EOF
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2795: checking for vprintf" >&5
+echo "configure:2796: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2800 "configure"
+#line 2801 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2819,7 +2820,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2843,12 +2844,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2847: checking for _doprnt" >&5
+echo "configure:2848: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 2852 "configure"
+#line 2853 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2871,7 +2872,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2898,12 +2899,12 @@ fi
 for ac_func in isinf tzset getrusage vfork memmove sigsetjmp kill sysconf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2902: checking for $ac_func" >&5
+echo "configure:2903: 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 <
-#line 2907 "configure"
+#line 2908 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2926,7 +2927,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2953,12 +2954,12 @@ done
 for ac_func in sigprocmask waitpid setsid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2957: checking for $ac_func" >&5
+echo "configure:2958: 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 <
-#line 2962 "configure"
+#line 2963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2981,7 +2982,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3006,12 +3007,12 @@ fi
 done
 
 echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
-echo "configure:3010: checking for inet_aton" >&5
+echo "configure:3011: checking for inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 3015 "configure"
+#line 3016 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char inet_aton(); below.  */
@@ -3034,7 +3035,7 @@ inet_aton();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_inet_aton=yes"
 else
@@ -3058,12 +3059,12 @@ INET_ATON='inet_aton.o'
 fi
 
 echo $ac_n "checking for strdup""... $ac_c" 1>&6
-echo "configure:3062: checking for strdup" >&5
+echo "configure:3063: checking for strdup" >&5
 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 3067 "configure"
+#line 3068 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char strdup(); below.  */
@@ -3086,7 +3087,7 @@ strdup();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_strdup=yes"
 else
@@ -3108,12 +3109,12 @@ fi
 
 
 echo $ac_n "checking for cbrt""... $ac_c" 1>&6
-echo "configure:3112: checking for cbrt" >&5
+echo "configure:3113: checking for cbrt" >&5
 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 3117 "configure"
+#line 3118 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char cbrt(); below.  */
@@ -3136,7 +3137,7 @@ cbrt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_cbrt=yes"
 else
@@ -3157,7 +3158,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
-echo "configure:3161: checking for cbrt in -lm" >&5
+echo "configure:3162: checking for cbrt in -lm" >&5
 ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3165,7 +3166,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <
-#line 3169 "configure"
+#line 3170 "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
@@ -3176,7 +3177,7 @@ int main() {
 cbrt()
 ; return 0; }
 EOF
-if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3202,12 +3203,12 @@ fi
 fi
 
 echo $ac_n "checking for rint""... $ac_c" 1>&6
-echo "configure:3206: checking for rint" >&5
+echo "configure:3207: checking for rint" >&5
 if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <
-#line 3211 "configure"
+#line 3212 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char rint(); below.  */
@@ -3230,7 +3231,7 @@ rint();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_rint=yes"
 else
@@ -3251,7 +3252,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
-echo "configure:3255: checking for rint in -lm" >&5
+echo "configure:3256: checking for rint in -lm" >&5
 ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3259,7 +3260,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <
-#line 3263 "configure"
+#line 3264 "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
@@ -3270,7 +3271,7 @@ int main() {
 rint()
 ; return 0; }
 EOF
-if { (eval echo configure:3274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3659,6 +3660,51 @@ cat >> $CONFIG_STATUS <<\EOF
   fi
 fi; done
 
+EOF
+
+cat >> $CONFIG_STATUS <
+ac_sources="port/${PORTNAME}.h"
+ac_dests="include/os.h"
+EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+srcdir=$ac_given_srcdir
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+
+  echo "linking $srcdir/$ac_source to $ac_dest"
+
+  if test ! -r $srcdir/$ac_source; then
+    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
+  fi
+  rm -f $ac_dest
+
+  # Make relative symlinks.
+  # Remove last slash and all that follows it.  Not all systems have dirname.
+  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
+  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
+    # The dest file is in a subdirectory.
+    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
+    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
+    # A "../" for each directory in $ac_dest_dir_suffix.
+    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
+  else
+    ac_dest_dir_suffix= ac_dots=
+  fi
+
+  case "$srcdir" in
+  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
+  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
+  esac
+
+  # Make a symlink if possible; otherwise try a hard link.
+  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
+    ln $srcdir/$ac_source $ac_dest; then :
+  else
+    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
+  fi
+done
 EOF
 cat >> $CONFIG_STATUS <
 


diff --git a/src/configure.in b/src/configure.in

index 67fafdeb2ad899b8b312a53530f1d6948cdd3b98..c5eb371dc21261674c5a7e4ba2c07e64cdcebe8c 100644 (file)

--- a/src/configure.in
+++ b/src/configure.in
@@ -9,7 +9,7 @@ case "$host_os" in
         esac ;;
    linux*) PORTNAME='linux' ;;
     bsdi*) PORTNAME='bsdi' ;;
- freebsd*|netbsd*) PORTNAME='BSD44_derived' ;;
+ freebsd*|netbsd*) PORTNAME='BSD44_derived';;
     dgux*) PORTNAME='dgux';;
      aix*) PORTNAME='aix';;
 nextstep*) PORTNAME='nextstep';;
@@ -25,6 +25,7 @@ nextstep*) PORTNAME='nextstep';;
    echo ""
    exit;;
 esac
+AC_LINK_FILES(port/${PORTNAME}.h, include/os.h)
 AC_SUBST(PORTNAME)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)


diff --git a/src/include/config.h.in b/src/include/config.h.in

index 839a6fb2cd5320c54c91e912961c47856fa14efc..525015b70dacd57afd7b5f83c0b0d82ee9d503fd 100644 (file)

--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -93,149 +93,7 @@
  * Code below this point should not require changes
  */
 
-#if defined(aix)
-#  define CLASS_CONFLICT 
-#  define DISABLE_XOPEN_NLS 
-#  define HAVE_ANSI_CPP
-#  define HAS_TEST_AND_SET
-   typedef unsigned int slock_t;
-#endif
-
-#if defined(alpha)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define DISABLE_XOPEN_NLS 
-#  define HAS_LONG_LONG
-#  define HAS_TEST_AND_SET
-#  include   /* for msemaphore */
-   typedef msemaphore slock_t;
-#endif
-
-#if defined(BSD44_derived)
-#  define USE_POSIX_TIME
-#  define NEED_I386_TAS_ASM
-#  define HAS_TEST_AND_SET
-#  if defined(__mips__)
-/* #    undef HAS_TEST_AND_SET */
-#  endif
-   typedef unsigned char slock_t;
-#endif
-
-#if defined(bsdi)
-#  if defined(i386)
-#    define NEED_I386_TAS_ASM
-#  endif
-#  if defined(sparc)
-#    define NEED_SPARC_TAS_ASM
-#  endif
-#  define USE_POSIX_TIME
-#  define HAS_TEST_AND_SET
-   typedef unsigned char slock_t;
-#endif
-
-
-#if defined(dgux)
-#  define LINUX_ELF
-#  define USE_POSIX_SIGNALS
-#endif
-
-#if defined(hpux)
-#  define JMP_BUF
-#  define USE_POSIX_TIME
-#  define HAS_TEST_AND_SET
-   typedef struct { int sem[4]; } slock_t;
-#endif
-
-#if defined(i386_solaris) 
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-   typedef unsigned char slock_t;
-#endif
-
-#if defined(irix5)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-#  include 
-   typedef abilock_t slock_t;
-#endif
-
-#if defined(linux)
-/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
-   here or with -D compile options, but __ macros should be set and used by C
-   library macros, not Postgres code.  __USE_POSIX is set by features.h,
-   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
-   be used.
-*/
-#  define JMP_BUF
-#  define USE_POSIX_TIME
-#  if !defined(PPC)
-#    define NEED_I386_TAS_ASM
-#    define HAS_TEST_AND_SET
-     typedef unsigned char slock_t;
-#  endif
-#endif
-
-#if defined(nextstep)
-# include 
-# if defined(__STRICT_ANSI__)
-#  define isascii(c)  ((unsigned)(c)<=0177)
-# endif
-  extern char* strdup (const char* string);
-# ifndef _POSIX_SOURCE
-  typedef unsigned short mode_t;
-  typedef int sigset_t;
-#  define SIG_BLOCK    00
-#  define SIG_UNBLOCK  01
-#  define SIG_SETMASK  02
-#  define NEED_SIG_JMP
-# endif
-
-# define JMP_BUF
-# define NO_WAITPID
-  typedef struct mutex slock_t;
-#endif
-
-#if defined(sparc_solaris)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-typedef unsigned char slock_t;
-#endif
-
-#if defined(sunos4)
-#  define USE_POSIX_TIME
-#endif
-
-#if defined(svr4) 
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#endif
-
-#if defined(win32)
-#  define JMP_BUF
-#  define NEED_SIG_JMP
-#  define NO_UNISTD_H
-#  define USES_WINSOCK 
-#  define NOFILE   100
-#  ifndef MAXPATHLEN
-#  define MAXPATHLEN    250
-#  endif
-#endif /* WIN32 */
-
-#if defined(ultrix4)
-#  define USE_POSIX_TIME
-#  define NEED_STRDUP
-#endif
+#include "os.h"
 
 /* This patch changes the behavior of aclcheck for groups. Currently an user
  * can access a table only if he has the required permission for ALL the groups


diff --git a/src/port/aix.h b/src/port/aix.h

new file mode 100644 (file)
index 0000000..1d50688

--- /dev/null
+++ b/src/port/aix.h
@@ -0,0 +1,5 @@
+#  define CLASS_CONFLICT 
+#  define DISABLE_XOPEN_NLS 
+#  define HAVE_ANSI_CPP
+#  define HAS_TEST_AND_SET
+   typedef unsigned int slock_t;


diff --git a/src/port/alpha.h b/src/port/alpha.h

new file mode 100644 (file)
index 0000000..5ac7ba1

--- /dev/null
+++ b/src/port/alpha.h
@@ -0,0 +1,7 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define DISABLE_XOPEN_NLS 
+#  define HAS_LONG_LONG
+#  define HAS_TEST_AND_SET
+#  include   /* for msemaphore */
+   typedef msemaphore slock_t;


diff --git a/src/port/bsdi.h b/src/port/bsdi.h

new file mode 100644 (file)
index 0000000..022c41d

--- /dev/null
+++ b/src/port/bsdi.h
@@ -0,0 +1,9 @@
+#  if defined(i386)
+#    define NEED_I386_TAS_ASM
+#  endif
+#  if defined(sparc)
+#    define NEED_SPARC_TAS_ASM
+#  endif
+#  define USE_POSIX_TIME
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;


diff --git a/src/port/dgux.h b/src/port/dgux.h

new file mode 100644 (file)
index 0000000..a004c29

--- /dev/null
+++ b/src/port/dgux.h
@@ -0,0 +1,2 @@
+#  define LINUX_ELF
+#  define USE_POSIX_SIGNALS


diff --git a/src/port/hpux.h b/src/port/hpux.h

new file mode 100644 (file)
index 0000000..8bf04ce

--- /dev/null
+++ b/src/port/hpux.h
@@ -0,0 +1,4 @@
+#  define JMP_BUF
+#  define USE_POSIX_TIME
+#  define HAS_TEST_AND_SET
+   typedef struct { int sem[4]; } slock_t;


diff --git a/src/port/i386_solaris.h b/src/port/i386_solaris.h

new file mode 100644 (file)
index 0000000..aa78ba5

--- /dev/null
+++ b/src/port/i386_solaris.h
@@ -0,0 +1,6 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;


diff --git a/src/port/irix5.h b/src/port/irix5.h

new file mode 100644 (file)
index 0000000..c995eb6

--- /dev/null
+++ b/src/port/irix5.h
@@ -0,0 +1,7 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+#  include 
+   typedef abilock_t slock_t;


diff --git a/src/port/linux.h b/src/port/linux.h

new file mode 100644 (file)
index 0000000..1439697

--- /dev/null
+++ b/src/port/linux.h
@@ -0,0 +1,13 @@
+/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
+   here or with -D compile options, but __ macros should be set and used by C
+   library macros, not Postgres code.  __USE_POSIX is set by features.h,
+   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
+   be used.
+*/
+#  define JMP_BUF
+#  define USE_POSIX_TIME
+#  if !defined(PPC)
+#    define NEED_I386_TAS_ASM
+#    define HAS_TEST_AND_SET
+     typedef unsigned char slock_t;
+#  endif


diff --git a/src/port/nextstep.h b/src/port/nextstep.h

new file mode 100644 (file)
index 0000000..d7fbae8

--- /dev/null
+++ b/src/port/nextstep.h
@@ -0,0 +1,17 @@
+# include 
+# if defined(__STRICT_ANSI__)
+#  define isascii(c)  ((unsigned)(c)<=0177)
+# endif
+  extern char* strdup (const char* string);
+# ifndef _POSIX_SOURCE
+  typedef unsigned short mode_t;
+  typedef int sigset_t;
+#  define SIG_BLOCK    00
+#  define SIG_UNBLOCK  01
+#  define SIG_SETMASK  02
+#  define NEED_SIG_JMP
+# endif
+
+# define JMP_BUF
+# define NO_WAITPID
+  typedef struct mutex slock_t;


diff --git a/src/port/sparc_solaris.h b/src/port/sparc_solaris.h

new file mode 100644 (file)
index 0000000..aa78ba5

--- /dev/null
+++ b/src/port/sparc_solaris.h
@@ -0,0 +1,6 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;


diff --git a/src/port/sunos4.h b/src/port/sunos4.h

new file mode 100644 (file)
index 0000000..0dbac44

--- /dev/null
+++ b/src/port/sunos4.h
@@ -0,0 +1 @@
+#  define USE_POSIX_TIME


diff --git a/src/port/svr4.h b/src/port/svr4.h

new file mode 100644 (file)
index 0000000..0c9810a

--- /dev/null
+++ b/src/port/svr4.h
@@ -0,0 +1,4 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT


diff --git a/src/port/ultrix4.h b/src/port/ultrix4.h

new file mode 100644 (file)
index 0000000..ae50130

--- /dev/null
+++ b/src/port/ultrix4.h
@@ -0,0 +1,2 @@
+#  define USE_POSIX_TIME
+#  define NEED_STRDUP


diff --git a/src/port/win32.h b/src/port/win32.h

new file mode 100644 (file)
index 0000000..7f4c97c

--- /dev/null
+++ b/src/port/win32.h
@@ -0,0 +1,8 @@
+#  define JMP_BUF
+#  define NEED_SIG_JMP
+#  define NO_UNISTD_H
+#  define USES_WINSOCK 
+#  define NOFILE   100
+#  ifndef MAXPATHLEN
+#  define MAXPATHLEN    250
+#  endif




This is the main PostgreSQL git repository.
RSS
Atom



window.onload = function () {
	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
	onloadTZSetup('local', tz_cookie, 'datetime');
};

diff --git a/src/configure.in b/src/configure.in
index 67fafdeb2ad899b8b312a53530f1d6948cdd3b98..c5eb371dc21261674c5a7e4ba2c07e64cdcebe8c 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -9,7 +9,7 @@ case "$host_os" in
         esac ;;
    linux*) PORTNAME='linux' ;;
     bsdi*) PORTNAME='bsdi' ;;
- freebsd*|netbsd*) PORTNAME='BSD44_derived' ;;
+ freebsd*|netbsd*) PORTNAME='BSD44_derived';;
     dgux*) PORTNAME='dgux';;
      aix*) PORTNAME='aix';;
 nextstep*) PORTNAME='nextstep';;
@@ -25,6 +25,7 @@ nextstep*) PORTNAME='nextstep';;
    echo ""
    exit;;
 esac
+AC_LINK_FILES(port/${PORTNAME}.h, include/os.h)
 AC_SUBST(PORTNAME)
 AC_SUBST(LDFLAGS)
 AC_SUBST(CPPFLAGS)

diff --git a/src/include/config.h.in b/src/include/config.h.in
index 839a6fb2cd5320c54c91e912961c47856fa14efc..525015b70dacd57afd7b5f83c0b0d82ee9d503fd 100644 (file)
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -93,149 +93,7 @@
  * Code below this point should not require changes
  */
 
-#if defined(aix)
-#  define CLASS_CONFLICT 
-#  define DISABLE_XOPEN_NLS 
-#  define HAVE_ANSI_CPP
-#  define HAS_TEST_AND_SET
-   typedef unsigned int slock_t;
-#endif
-
-#if defined(alpha)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define DISABLE_XOPEN_NLS 
-#  define HAS_LONG_LONG
-#  define HAS_TEST_AND_SET
-#  include   /* for msemaphore */
-   typedef msemaphore slock_t;
-#endif
-
-#if defined(BSD44_derived)
-#  define USE_POSIX_TIME
-#  define NEED_I386_TAS_ASM
-#  define HAS_TEST_AND_SET
-#  if defined(__mips__)
-/* #    undef HAS_TEST_AND_SET */
-#  endif
-   typedef unsigned char slock_t;
-#endif
-
-#if defined(bsdi)
-#  if defined(i386)
-#    define NEED_I386_TAS_ASM
-#  endif
-#  if defined(sparc)
-#    define NEED_SPARC_TAS_ASM
-#  endif
-#  define USE_POSIX_TIME
-#  define HAS_TEST_AND_SET
-   typedef unsigned char slock_t;
-#endif
-
-
-#if defined(dgux)
-#  define LINUX_ELF
-#  define USE_POSIX_SIGNALS
-#endif
-
-#if defined(hpux)
-#  define JMP_BUF
-#  define USE_POSIX_TIME
-#  define HAS_TEST_AND_SET
-   typedef struct { int sem[4]; } slock_t;
-#endif
-
-#if defined(i386_solaris) 
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-   typedef unsigned char slock_t;
-#endif
-
-#if defined(irix5)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-#  include 
-   typedef abilock_t slock_t;
-#endif
-
-#if defined(linux)
-/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
-   here or with -D compile options, but __ macros should be set and used by C
-   library macros, not Postgres code.  __USE_POSIX is set by features.h,
-   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
-   be used.
-*/
-#  define JMP_BUF
-#  define USE_POSIX_TIME
-#  if !defined(PPC)
-#    define NEED_I386_TAS_ASM
-#    define HAS_TEST_AND_SET
-     typedef unsigned char slock_t;
-#  endif
-#endif
-
-#if defined(nextstep)
-# include 
-# if defined(__STRICT_ANSI__)
-#  define isascii(c)  ((unsigned)(c)<=0177)
-# endif
-  extern char* strdup (const char* string);
-# ifndef _POSIX_SOURCE
-  typedef unsigned short mode_t;
-  typedef int sigset_t;
-#  define SIG_BLOCK    00
-#  define SIG_UNBLOCK  01
-#  define SIG_SETMASK  02
-#  define NEED_SIG_JMP
-# endif
-
-# define JMP_BUF
-# define NO_WAITPID
-  typedef struct mutex slock_t;
-#endif
-
-#if defined(sparc_solaris)
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#  define HAS_TEST_AND_SET
-typedef unsigned char slock_t;
-#endif
-
-#if defined(sunos4)
-#  define USE_POSIX_TIME
-#endif
-
-#if defined(svr4) 
-#  define USE_POSIX_TIME 
-#  define USE_POSIX_SIGNALS
-#  define NO_EMPTY_STMTS
-#  define SYSV_DIRENT
-#endif
-
-#if defined(win32)
-#  define JMP_BUF
-#  define NEED_SIG_JMP
-#  define NO_UNISTD_H
-#  define USES_WINSOCK 
-#  define NOFILE   100
-#  ifndef MAXPATHLEN
-#  define MAXPATHLEN    250
-#  endif
-#endif /* WIN32 */
-
-#if defined(ultrix4)
-#  define USE_POSIX_TIME
-#  define NEED_STRDUP
-#endif
+#include "os.h"
 
 /* This patch changes the behavior of aclcheck for groups. Currently an user
  * can access a table only if he has the required permission for ALL the groups

diff --git a/src/port/aix.h b/src/port/aix.h
new file mode 100644 (file)
index 0000000..1d50688
--- /dev/null
+++ b/src/port/aix.h
@@ -0,0 +1,5 @@
+#  define CLASS_CONFLICT 
+#  define DISABLE_XOPEN_NLS 
+#  define HAVE_ANSI_CPP
+#  define HAS_TEST_AND_SET
+   typedef unsigned int slock_t;

diff --git a/src/port/alpha.h b/src/port/alpha.h
new file mode 100644 (file)
index 0000000..5ac7ba1
--- /dev/null
+++ b/src/port/alpha.h
@@ -0,0 +1,7 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define DISABLE_XOPEN_NLS 
+#  define HAS_LONG_LONG
+#  define HAS_TEST_AND_SET
+#  include   /* for msemaphore */
+   typedef msemaphore slock_t;

diff --git a/src/port/bsdi.h b/src/port/bsdi.h
new file mode 100644 (file)
index 0000000..022c41d
--- /dev/null
+++ b/src/port/bsdi.h
@@ -0,0 +1,9 @@
+#  if defined(i386)
+#    define NEED_I386_TAS_ASM
+#  endif
+#  if defined(sparc)
+#    define NEED_SPARC_TAS_ASM
+#  endif
+#  define USE_POSIX_TIME
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;

diff --git a/src/port/dgux.h b/src/port/dgux.h
new file mode 100644 (file)
index 0000000..a004c29
--- /dev/null
+++ b/src/port/dgux.h
@@ -0,0 +1,2 @@
+#  define LINUX_ELF
+#  define USE_POSIX_SIGNALS

diff --git a/src/port/hpux.h b/src/port/hpux.h
new file mode 100644 (file)
index 0000000..8bf04ce
--- /dev/null
+++ b/src/port/hpux.h
@@ -0,0 +1,4 @@
+#  define JMP_BUF
+#  define USE_POSIX_TIME
+#  define HAS_TEST_AND_SET
+   typedef struct { int sem[4]; } slock_t;

diff --git a/src/port/i386_solaris.h b/src/port/i386_solaris.h
new file mode 100644 (file)
index 0000000..aa78ba5
--- /dev/null
+++ b/src/port/i386_solaris.h
@@ -0,0 +1,6 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;

diff --git a/src/port/irix5.h b/src/port/irix5.h
new file mode 100644 (file)
index 0000000..c995eb6
--- /dev/null
+++ b/src/port/irix5.h
@@ -0,0 +1,7 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+#  include 
+   typedef abilock_t slock_t;

diff --git a/src/port/linux.h b/src/port/linux.h
new file mode 100644 (file)
index 0000000..1439697
--- /dev/null
+++ b/src/port/linux.h
@@ -0,0 +1,13 @@
+/* __USE_POSIX, __USE_BSD, and __USE_BSD_SIGNAL used to be defined either
+   here or with -D compile options, but __ macros should be set and used by C
+   library macros, not Postgres code.  __USE_POSIX is set by features.h,
+   __USE_BSD is set by bsd/signal.h, and __USE_BSD_SIGNAL appears not to
+   be used.
+*/
+#  define JMP_BUF
+#  define USE_POSIX_TIME
+#  if !defined(PPC)
+#    define NEED_I386_TAS_ASM
+#    define HAS_TEST_AND_SET
+     typedef unsigned char slock_t;
+#  endif

diff --git a/src/port/nextstep.h b/src/port/nextstep.h
new file mode 100644 (file)
index 0000000..d7fbae8
--- /dev/null
+++ b/src/port/nextstep.h
@@ -0,0 +1,17 @@
+# include 
+# if defined(__STRICT_ANSI__)
+#  define isascii(c)  ((unsigned)(c)<=0177)
+# endif
+  extern char* strdup (const char* string);
+# ifndef _POSIX_SOURCE
+  typedef unsigned short mode_t;
+  typedef int sigset_t;
+#  define SIG_BLOCK    00
+#  define SIG_UNBLOCK  01
+#  define SIG_SETMASK  02
+#  define NEED_SIG_JMP
+# endif
+
+# define JMP_BUF
+# define NO_WAITPID
+  typedef struct mutex slock_t;

diff --git a/src/port/sparc_solaris.h b/src/port/sparc_solaris.h
new file mode 100644 (file)
index 0000000..aa78ba5
--- /dev/null
+++ b/src/port/sparc_solaris.h
@@ -0,0 +1,6 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT
+#  define HAS_TEST_AND_SET
+   typedef unsigned char slock_t;

diff --git a/src/port/sunos4.h b/src/port/sunos4.h
new file mode 100644 (file)
index 0000000..0dbac44
--- /dev/null
+++ b/src/port/sunos4.h
@@ -0,0 +1 @@
+#  define USE_POSIX_TIME

diff --git a/src/port/svr4.h b/src/port/svr4.h
new file mode 100644 (file)
index 0000000..0c9810a
--- /dev/null
+++ b/src/port/svr4.h
@@ -0,0 +1,4 @@
+#  define USE_POSIX_TIME 
+#  define USE_POSIX_SIGNALS
+#  define NO_EMPTY_STMTS
+#  define SYSV_DIRENT

diff --git a/src/port/ultrix4.h b/src/port/ultrix4.h
new file mode 100644 (file)
index 0000000..ae50130
--- /dev/null
+++ b/src/port/ultrix4.h
@@ -0,0 +1,2 @@
+#  define USE_POSIX_TIME
+#  define NEED_STRDUP

diff --git a/src/port/win32.h b/src/port/win32.h
new file mode 100644 (file)
index 0000000..7f4c97c
--- /dev/null
+++ b/src/port/win32.h
@@ -0,0 +1,8 @@
+#  define JMP_BUF
+#  define NEED_SIG_JMP
+#  define NO_UNISTD_H
+#  define USES_WINSOCK 
+#  define NOFILE   100
+#  ifndef MAXPATHLEN
+#  define MAXPATHLEN    250
+#  endif