Sorry for the package, but the following patch need to be applied to get
the new verion compiled on SCO Openserver 5.0.5 and Unixware 7.1.1 Nicolas Bazin
This commit is contained in:
Bruce Momjian
parent
d37134085b
commit
2d81019493
118
configure
vendored
118
configure
vendored
@ -5375,65 +5375,6 @@ _ACEOF
|
||||
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"
|
||||
|
||||
|
||||
#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_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 -lnsl" >&5
|
||||
echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_nsl_main+set}" = set; then
|
||||
@ -5493,6 +5434,65 @@ _ACEOF
|
||||
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"
|
||||
|
||||
|
||||
#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_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 -lipc" >&5
|
||||
echo $ECHO_N "checking for main in -lipc... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_ipc_main+set}" = set; then
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.180 2002/04/21 19:54:50 thomas Exp $
|
||||
dnl $Header: /cvsroot/pgsql/configure.in,v 1.181 2002/04/24 01:56:20 momjian Exp $
|
||||
|
||||
dnl Developers, please strive to achieve this order:
|
||||
dnl
|
||||
@ -705,8 +705,8 @@ fi
|
||||
AC_CHECK_LIB(util, setproctitle)
|
||||
AC_CHECK_LIB(m, main)
|
||||
AC_CHECK_LIB(dl, main)
|
||||
AC_CHECK_LIB(socket, 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)
|
||||
|
||||
@ -2720,7 +2720,7 @@ conv_from_octal(const unsigned char *s)
|
||||
y = 0;
|
||||
|
||||
for (i = 1; i <= 3; i++)
|
||||
y += (s[i] - 48) * (int) pow(8, 3 - i);
|
||||
y += (s[i] - '0') << (3 * (3 - i));
|
||||
|
||||
return y;
|
||||
|
||||
@ -2743,7 +2743,7 @@ conv_from_hex(const unsigned char *s)
|
||||
else
|
||||
val = s[i] - '0';
|
||||
|
||||
y += val * (int) pow(16, 2 - i);
|
||||
y += val << (4 * (2 - i));
|
||||
}
|
||||
|
||||
return y;
|
||||
@ -2798,7 +2798,7 @@ conv_to_octal(unsigned char val)
|
||||
|
||||
for (i = 4; i > 1; i--)
|
||||
{
|
||||
x[i] = (val & 7) + 48;
|
||||
x[i] = (val & 7) + '0';
|
||||
val >>= 3;
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.23 2002/01/03 21:52:05 tgl Exp $
|
||||
# $Header: /cvsroot/pgsql/src/test/regress/Attic/pg_regress.sh,v 1.24 2002/04/24 01:56:20 momjian Exp $
|
||||
|
||||
me=`basename $0`
|
||||
: ${TMPDIR=/tmp}
|
||||
@ -173,7 +173,7 @@ esac
|
||||
# ----------
|
||||
|
||||
case $host_platform in
|
||||
*-*-qnx*)
|
||||
*-*-qnx* | *-*-sco3.2v5*)
|
||||
DIFFFLAGS=-b;;
|
||||
*)
|
||||
DIFFFLAGS=-w;;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user