Skip to content

P
Postgres FD Implementation
Commit 4da36853 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Revert irix change to suppress configure warnings.

parent 5c1cfb5f
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 158 deletions
configure
View file @ 4da36853
......@@ -4293,25 +4293,25 @@ _ACEOF
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 "$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="-lnsl $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"
......@@ -4321,7 +4321,7 @@ cat >conftest.$ac_ext <<_ACEOF
int
main ()
{
main ();
setproctitle ();
;
return 0;
}
......@@ -4338,34 +4338,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_main=yes
ac_cv_lib_util_setproctitle=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_nsl_main=no
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_nsl_main" >&5
echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
if test $ac_cv_lib_nsl_main = yes; then
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_LIBNSL 1
#define HAVE_LIBUTIL 1
_ACEOF
LIBS="-lnsl $LIBS"
LIBS="-lutil $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 "$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="-lsocket $LIBS"
LIBS="-lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
......@@ -4397,34 +4397,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_main=yes
ac_cv_lib_m_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_socket_main=no
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_socket_main" >&5
echo "${ECHO_T}$ac_cv_lib_socket_main" >&6
if test $ac_cv_lib_socket_main = yes; then
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_LIBSOCKET 1
#define HAVE_LIBM 1
_ACEOF
LIBS="-lsocket $LIBS"
LIBS="-lm $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 "$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="-lgen $LIBS"
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
......@@ -4456,101 +4456,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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
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
ac_cv_lib_dl_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_util_setproctitle=no
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_util_setproctitle" >&5
echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
if test $ac_cv_lib_util_setproctitle = yes; then
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_LIBUTIL 1
#define HAVE_LIBDL 1
_ACEOF
LIBS="-lutil $LIBS"
LIBS="-ldl $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 "$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="-lm $LIBS"
LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
......@@ -4582,34 +4515,34 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_m_main=yes
ac_cv_lib_nsl_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_m_main=no
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_m_main" >&5
echo "${ECHO_T}$ac_cv_lib_m_main" >&6
if test $ac_cv_lib_m_main = yes; then
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_LIBM 1
#define HAVE_LIBNSL 1
_ACEOF
LIBS="-lm $LIBS"
LIBS="-lnsl $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 "$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="-ldl $LIBS"
LIBS="-lsocket $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
......@@ -4641,23 +4574,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_main=yes
ac_cv_lib_socket_main=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_dl_main=no
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_dl_main" >&5
echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
if test $ac_cv_lib_dl_main = yes; then
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_LIBDL 1
#define HAVE_LIBSOCKET 1
_ACEOF
LIBS="-ldl $LIBS"
LIBS="-lsocket $LIBS"
fi
......@@ -5075,6 +5008,65 @@ _ACEOF
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
echo "$as_me:$LINENO: checking for main in -lPW" >&5
echo $ECHO_N "checking for main in -lPW... $ECHO_C" >&6
if test "${ac_cv_lib_PW_main+set}" = set; then
......@@ -5827,9 +5819,9 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
# NetBSD and OpenBSD have a broken linker that does not
# NetBSD, OpenBSD, and Irix have a broken linker that does not
# recognize dependent libraries
case $host_os in netbsd* | openbsd* )
case $host_os in netbsd* | openbsd* | irix*)
case $pgac_lib in
*curses*) ;;
*) pgac_lib=" -lcurses" ;;
......@@ -12019,14 +12011,7 @@ case $host_os in mingw*)
LIBOBJS="$LIBOBJS copydir.$ac_objext"
LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"
LIBOBJS="$LIBOBJS open.$ac_objext"
LIBOBJS="$LIBOBJS rand.$ac_objext"
cat >>confdefs.h <<\_ACEOF
#define USE_PGTZ 1
_ACEOF
USE_PGTZ=yes
;;
LIBOBJS="$LIBOBJS rand.$ac_objext" ;;
esac
# Win32 can't to rename or unlink on an open file
......@@ -18631,7 +18616,6 @@ s,@python_includespec@,$python_includespec,;t t
s,@python_libspec@,$python_libspec,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@HAVE_IPV6@,$HAVE_IPV6,;t t
s,@USE_PGTZ@,$USE_PGTZ,;t t
s,@acx_pthread_config@,$acx_pthread_config,;t t
s,@PTHREAD_CC@,$PTHREAD_CC,;t t
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
......
configure.in
View file @ 4da36853
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.353 2004/05/19 22:12:30 momjian Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.354 2004/05/19 22:36:36 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
......@@ -580,20 +580,11 @@ if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha"
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(nsl, main)
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(ipc, main)
AC_CHECK_LIB(IPC, main)
AC_CHECK_LIB(lc, main)
......@@ -601,6 +592,7 @@ AC_CHECK_LIB(dld, main)
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])
......@@ -900,11 +892,7 @@ case $host_os in mingw*)
AC_LIBOBJ(copydir)
AC_LIBOBJ(gettimeofday)
AC_LIBOBJ(open)
AC_LIBOBJ(rand)
AC_DEFINE(USE_PGTZ, 1,
[Define to 1 to use our own timezone library])
USE_PGTZ=yes
AC_SUBST(USE_PGTZ) ;;
AC_LIBOBJ(rand) ;;
esac
# Win32 can't to rename or unlink on an open file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment