Index: configure
===================================================================
RCS file: /cvsroot/pgsql-server/configure,v
retrieving revision 1.364
diff -c -c -r1.364 configure
*** configure	19 May 2004 21:37:42 -0000	1.364
--- configure	19 May 2004 22:06:21 -0000
***************
*** 4293,4317 ****
  fi
  
  fi
  
! echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
! echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
! if test "${ac_cv_lib_util_setproctitle+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char setproctitle ();
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
--- 4293,4317 ----
  fi
  
  fi
+ # Irix has nsl, socket, gen, and sun in its libc, but also
+ # keeps separate libs around for backwords compatibility.
+ # Using them creates warnings in config.log. This test quiets that.
+ # See also: http://freeware.sgi.com/howto.html
+ if test "$PORTNAME" != "irix"
+ then
  
! echo "$as_me:$LINENO: checking for main in -lnsl" >&5
! echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
! if test "${ac_cv_lib_nsl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
  
! 
  #ifdef F77_DUMMY_MAIN
  #  ifdef __cplusplus
       extern "C"
***************
*** 4321,4327 ****
  int
  main ()
  {
! setproctitle ();
    ;
    return 0;
  }
--- 4321,4327 ----
  int
  main ()
  {
! main ();
    ;
    return 0;
  }
***************
*** 4338,4371 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_util_setproctitle=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_util_setproctitle=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
! echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
! if test $ac_cv_lib_util_setproctitle = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBUTIL 1
  _ACEOF
  
!   LIBS="-lutil $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -lm" >&5
! echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
! if test "${ac_cv_lib_m_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
--- 4338,4371 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_nsl_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_nsl_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
! if test $ac_cv_lib_nsl_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBNSL 1
  _ACEOF
  
!   LIBS="-lnsl $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -lsocket" >&5
! echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
! if test "${ac_cv_lib_socket_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
***************
*** 4397,4430 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_m_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_m_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
! echo "${ECHO_T}$ac_cv_lib_m_main" >&6
! if test $ac_cv_lib_m_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBM 1
  _ACEOF
  
!   LIBS="-lm $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -ldl" >&5
! echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
! if test "${ac_cv_lib_dl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
--- 4397,4430 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_socket_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_socket_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
! echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
! if test $ac_cv_lib_socket_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBSOCKET 1
  _ACEOF
  
!   LIBS="-lsocket $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -lgen" >&5
! echo $ECHO_N "checking for main in -lgen... $ECHO_C" >&6
! if test "${ac_cv_lib_gen_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lgen  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
***************
*** 4456,4489 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_dl_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_dl_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
! if test $ac_cv_lib_dl_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBDL 1
  _ACEOF
  
!   LIBS="-ldl $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -lnsl" >&5
! echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
! if test "${ac_cv_lib_nsl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
--- 4456,4556 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_gen_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_gen_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_gen_main" >&5
! echo "${ECHO_T}$ac_cv_lib_gen_main" >&6
! if test $ac_cv_lib_gen_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBGEN 1
  _ACEOF
  
!   LIBS="-lgen $LIBS"
  
  fi
  
+ fi
  
! 
! echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
! echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
! if test "${ac_cv_lib_util_setproctitle+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lutil  $LIBS"
! cat >conftest.$ac_ext <<_ACEOF
! #line $LINENO "configure"
! #include "confdefs.h"
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char setproctitle ();
! #ifdef F77_DUMMY_MAIN
! #  ifdef __cplusplus
!      extern "C"
! #  endif
!    int F77_DUMMY_MAIN() { return 1; }
! #endif
! int
! main ()
! {
! setproctitle ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
!          { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_lib_util_setproctitle=yes
! else
!   echo "$as_me: failed program was:" >&5
! cat conftest.$ac_ext >&5
! ac_cv_lib_util_setproctitle=no
! fi
! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
! echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
! if test $ac_cv_lib_util_setproctitle = yes; then
!   cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBUTIL 1
! _ACEOF
! 
!   LIBS="-lutil $LIBS"
! 
! fi
! 
! 
! echo "$as_me:$LINENO: checking for main in -lm" >&5
! echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
! if test "${ac_cv_lib_m_main+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_check_lib_save_LIBS=$LIBS
! LIBS="-lm  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
***************
*** 4515,4548 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_nsl_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_nsl_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
! if test $ac_cv_lib_nsl_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBNSL 1
  _ACEOF
  
!   LIBS="-lnsl $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -lsocket" >&5
! echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6
! if test "${ac_cv_lib_socket_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
--- 4582,4615 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_m_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_m_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
! echo "${ECHO_T}$ac_cv_lib_m_main" >&6
! if test $ac_cv_lib_m_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBM 1
  _ACEOF
  
!   LIBS="-lm $LIBS"
  
  fi
  
  
! echo "$as_me:$LINENO: checking for main in -ldl" >&5
! echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
! if test "${ac_cv_lib_dl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  #include "confdefs.h"
***************
*** 4574,4596 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_socket_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_socket_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5
! echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
! if test $ac_cv_lib_socket_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBSOCKET 1
  _ACEOF
  
!   LIBS="-lsocket $LIBS"
  
  fi
  
--- 4641,4663 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_dl_main=yes
  else
    echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
! ac_cv_lib_dl_main=no
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
! if test $ac_cv_lib_dl_main = yes; then
    cat >>confdefs.h <<_ACEOF
! #define HAVE_LIBDL 1
  _ACEOF
  
!   LIBS="-ldl $LIBS"
  
  fi
  
***************
*** 5004,5068 ****
  _ACEOF
  
    LIBS="-lBSD $LIBS"
- 
- fi
- 
- 
- echo "$as_me:$LINENO: checking for main in -lgen" >&5
- echo $ECHO_N "checking for main in -lgen... $ECHO_C" >&6
- if test "${ac_cv_lib_gen_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgen  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- #include "confdefs.h"
- 
- 
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
- #  endif
-    int F77_DUMMY_MAIN() { return 1; }
- #endif
- int
- main ()
- {
- main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gen_main=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_lib_gen_main=no
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_gen_main" >&5
- echo "${ECHO_T}$ac_cv_lib_gen_main" >&6
- if test $ac_cv_lib_gen_main = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGEN 1
- _ACEOF
- 
-   LIBS="-lgen $LIBS"
  
  fi
  
--- 5071,5076 ----
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql-server/configure.in,v
retrieving revision 1.352
diff -c -c -r1.352 configure.in
*** configure.in	19 May 2004 21:37:42 -0000	1.352
--- configure.in	19 May 2004 22:06:22 -0000
***************
*** 580,590 ****
  then
  	AC_CHECK_LIB(bsd,      main)
  fi
  AC_CHECK_LIB(util,     setproctitle)
  AC_CHECK_LIB(m,        main)
  AC_CHECK_LIB(dl,       main)
- AC_CHECK_LIB(nsl,      main)
- AC_CHECK_LIB(socket,   main)
  AC_CHECK_LIB(ipc,      main)
  AC_CHECK_LIB(IPC,      main)
  AC_CHECK_LIB(lc,       main)
--- 580,599 ----
  then
  	AC_CHECK_LIB(bsd,      main)
  fi
+ # Irix has nsl, socket, gen, and sun in its libc, but also
+ # keeps separate libs around for backwords compatibility.
+ # Using them creates warnings in config.log. This test quiets that.
+ # See also: http://freeware.sgi.com/howto.html
+ if test "$PORTNAME" != "irix"
+ then
+ AC_CHECK_LIB(nsl,      main)
+ AC_CHECK_LIB(socket,   main)
+ AC_CHECK_LIB(gen,      main)
+ fi
+ 
  AC_CHECK_LIB(util,     setproctitle)
  AC_CHECK_LIB(m,        main)
  AC_CHECK_LIB(dl,       main)
  AC_CHECK_LIB(ipc,      main)
  AC_CHECK_LIB(IPC,      main)
  AC_CHECK_LIB(lc,       main)
***************
*** 592,598 ****
  AC_CHECK_LIB(ld,       main)
  AC_CHECK_LIB(compat,   main)
  AC_CHECK_LIB(BSD,      main)
- AC_CHECK_LIB(gen,      main)
  AC_CHECK_LIB(PW,       main)
  AC_CHECK_LIB(resolv,   main)
  AC_SEARCH_LIBS(getopt_long, [getopt gnugetopt])
--- 601,606 ----
Index: config/programs.m4
===================================================================
RCS file: /cvsroot/pgsql-server/config/programs.m4,v
retrieving revision 1.13
diff -c -c -r1.13 programs.m4
*** config/programs.m4	29 Nov 2003 19:51:17 -0000	1.13
--- config/programs.m4	19 May 2004 22:06:22 -0000
***************
*** 87,95 ****
      pgac_save_LIBS=$LIBS
      LIBS="${pgac_rllib}${pgac_lib} $LIBS"
      AC_TRY_LINK_FUNC([readline], [[
!       # NetBSD and OpenBSD have a broken linker that does not
        # recognize dependent libraries
!       case $host_os in netbsd* | openbsd* )
          case $pgac_lib in
            *curses*) ;;
            *) pgac_lib=" -lcurses" ;;
--- 87,95 ----
      pgac_save_LIBS=$LIBS
      LIBS="${pgac_rllib}${pgac_lib} $LIBS"
      AC_TRY_LINK_FUNC([readline], [[
!       # NetBSD, OpenBSD, and Irix have a broken linker that does not
        # recognize dependent libraries
!       case $host_os in netbsd* | openbsd* | irix*)
          case $pgac_lib in
            *curses*) ;;
            *) pgac_lib=" -lcurses" ;;