Skip to content

P
Postgres FD Implementation
Commit b0c3c48e authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Assemble portability modules into libpgport library. 

Some makefile simplifications.
parent c3fdf892
Hide whitespace changes
Inline Side-by-side
Showing with 731 additions and 1684 deletions
config/c-library.m4
View file @ b0c3c48e
# Macros that test various C library quirks # Macros that test various C library quirks
# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.13 2002/03/30 00:59:52 petere Exp $ # $Header: /cvsroot/pgsql/config/c-library.m4,v 1.14 2002/07/27 20:10:03 petere Exp $
# PGAC_VAR_INT_TIMEZONE # PGAC_VAR_INT_TIMEZONE
...@@ -36,30 +36,6 @@ if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then ...@@ -36,30 +36,6 @@ if test x"$pgac_cv_func_gettimeofday_1arg" = xyes ; then
fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG
# PGAC_FUNC_MEMCMP
# ----------------
# Check if memcmp() properly handles negative bytes and returns +/-.
# SunOS does not.
# AC_FUNC_MEMCMP
AC_DEFUN([PGAC_FUNC_MEMCMP],
[AC_CACHE_CHECK(for 8-bit clean memcmp, pgac_cv_func_memcmp_clean,
[AC_TRY_RUN([
main()
{
char c0 = 0x40, c1 = 0x80, c2 = 0x81;
exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
}
], pgac_cv_func_memcmp_clean=yes, pgac_cv_func_memcmp_clean=no,
pgac_cv_func_memcmp_clean=no)])
if test $pgac_cv_func_memcmp_clean = no ; then
MEMCMP=memcmp.o
else
MEMCMP=
fi
AC_SUBST(MEMCMP)dnl
])
# PGAC_UNION_SEMUN # PGAC_UNION_SEMUN
# ---------------- # ----------------
# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so. # Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
......
configure
View file @ b0c3c48e
...@@ -7365,6 +7365,7 @@ fi ...@@ -7365,6 +7365,7 @@ fi
## ##
## Header files ## Header files
## ##
echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then if test "${ac_cv_header_stdc+set}" = set; then
...@@ -9127,6 +9128,7 @@ fi ...@@ -9127,6 +9128,7 @@ fi
## Types, structures, compiler characteristics ## Types, structures, compiler characteristics
## ##
echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
if test "${ac_cv_c_const+set}" = set; then if test "${ac_cv_c_const+set}" = set; then
...@@ -10203,6 +10205,7 @@ fi ...@@ -10203,6 +10205,7 @@ fi
## ##
## Functions, global variables ## Functions, global variables
## ##
echo "$as_me:$LINENO: checking for int timezone" >&5 echo "$as_me:$LINENO: checking for int timezone" >&5
echo $ECHO_N "checking for int timezone... $ECHO_C" >&6 echo $ECHO_N "checking for int timezone... $ECHO_C" >&6
if test "${pgac_cv_var_int_timezone+set}" = set; then if test "${pgac_cv_var_int_timezone+set}" = set; then
...@@ -10404,24 +10407,55 @@ _ACEOF ...@@ -10404,24 +10407,55 @@ _ACEOF
fi fi
# SunOS doesn't handle negative byte comparisons properly with +/- return # SunOS doesn't handle negative byte comparisons properly with +/- return
echo "$as_me:$LINENO: checking for 8-bit clean memcmp" >&5 echo "$as_me:$LINENO: checking for working memcmp" >&5
echo $ECHO_N "checking for 8-bit clean memcmp... $ECHO_C" >&6 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
if test "${pgac_cv_func_memcmp_clean+set}" = set; then if test "${ac_cv_func_memcmp_working+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
pgac_cv_func_memcmp_clean=no ac_cv_func_memcmp_working=no
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
main() #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{ {
/* Some versions of memcmp are not 8-bit clean. */
char c0 = 0x40, c1 = 0x80, c2 = 0x81; char c0 = 0x40, c1 = 0x80, c2 = 0x81;
exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1); if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
} exit (1);
/* The Next x86 OpenStep bug shows up only when comparing 16 bytes
or more and with at least one buffer not starting on a 4-byte boundary.
William Lewis provided this test program. */
{
char foo[21];
char bar[21];
int i;
for (i = 0; i < 4; i++)
{
char *a = foo + i;
char *b = bar + i;
strcpy (a, "--------01111111");
strcpy (b, "--------10000000");
if (memcmp (a, b, 16) >= 0)
exit (1);
}
exit (0);
}
;
return 0;
}
_ACEOF _ACEOF
rm -f conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
...@@ -10434,24 +10468,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -10434,24 +10468,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
pgac_cv_func_memcmp_clean=yes ac_cv_func_memcmp_working=yes
else else
echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
pgac_cv_func_memcmp_clean=no ac_cv_func_memcmp_working=no
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
fi fi
echo "$as_me:$LINENO: result: $pgac_cv_func_memcmp_clean" >&5 echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
echo "${ECHO_T}$pgac_cv_func_memcmp_clean" >&6 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
if test $pgac_cv_func_memcmp_clean = no ; then test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
MEMCMP=memcmp.o
else
MEMCMP=
fi
...@@ -10670,7 +10700,7 @@ fi ...@@ -10670,7 +10700,7 @@ fi
# also decide to use snprintf.c if snprintf() is present but does not # also decide to use snprintf.c if snprintf() is present but does not
# have working "long long int" support -- see below. # have working "long long int" support -- see below.
SNPRINTF='' pgac_need_repl_snprintf=no
for ac_func in snprintf for ac_func in snprintf
do do
...@@ -10745,7 +10775,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -10745,7 +10775,7 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
_ACEOF _ACEOF
else else
SNPRINTF='$(top_builddir)/src/port/snprintf.o' pgac_need_repl_snprintf=yes
fi fi
done done
...@@ -10823,13 +10853,12 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -10823,13 +10853,12 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
_ACEOF _ACEOF
else else
SNPRINTF='$(top_builddir)/src/port/snprintf.o' pgac_need_repl_snprintf=yes
fi fi
done done
# Check whether <stdio.h> declares snprintf() and vsnprintf(); if not, # Check whether <stdio.h> declares snprintf() and vsnprintf(); if not,
# include/c.h will provide declarations. Note this is a separate test # include/c.h will provide declarations. Note this is a separate test
# from whether the functions exist in the C library --- there are # from whether the functions exist in the C library --- there are
...@@ -11017,9 +11046,8 @@ cat >>confdefs.h <<\_ACEOF ...@@ -11017,9 +11046,8 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_ISINF 1 #define HAVE_ISINF 1
_ACEOF _ACEOF
ISINF=
else else
ISINF='isinf.o' LIBOBJS="$LIBOBJS isinf.$ac_objext"
# Look for a way to implement a substitute for isinf() # Look for a way to implement a substitute for isinf()
...@@ -11105,7 +11133,14 @@ fi ...@@ -11105,7 +11133,14 @@ fi
for ac_func in getrusage
for ac_func in gethostname getrusage inet_aton random srandom strcasecmp strdup strerror strtol strtoul
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11178,13 +11213,30 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11178,13 +11213,30 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
_ACEOF _ACEOF
else else
GETRUSAGE='$(top_builddir)/src/port/getrusage.o' LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
fi fi
done done
for ac_func in srandom # Solaris has a very slow qsort in certain cases.
case $host_os in
solaris*) LIBOBJS="$LIBOBJS qsort.$ac_objext" ;;
esac
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
# this hackery with HPUXMATHLIB allows us to cope.
HPUXMATHLIB=""
case $host_cpu in
hppa1.1)
if [ -r /lib/pa1.1/libm.a ] ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm"
fi ;;
esac
for ac_func in rint
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11257,35 +11309,24 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11257,35 +11309,24 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
_ACEOF _ACEOF
else else
SRANDOM='$(top_builddir)/src/port/srandom.o' echo "$as_me:$LINENO: checking for rint in -lm" >&5
fi echo $ECHO_N "checking for rint in -lm... $ECHO_C" >&6
done if test "${ac_cv_lib_m_rint+set}" = set; then
for ac_func in gethostname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $HPUXMATHLIB $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char $ac_func (); char rint ();
char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
...@@ -11295,15 +11336,7 @@ char (*f) (); ...@@ -11295,15 +11336,7 @@ char (*f) ();
int int
main () main ()
{ {
/* The GNU C library defines this for functions which it implements rint ();
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; ;
return 0; return 0;
} }
...@@ -11320,50 +11353,41 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11320,50 +11353,41 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" ac_cv_lib_m_rint=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" ac_cv_lib_m_rint=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "$as_me:$LINENO: result: $ac_cv_lib_m_rint" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 echo "${ECHO_T}$ac_cv_lib_m_rint" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then if test $ac_cv_lib_m_rint = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<\_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 #define HAVE_RINT 1
_ACEOF _ACEOF
else fi
GETHOSTNAME='$(top_builddir)/src/port/gethostname.o'
fi fi
done done
for ac_func in random if test "$with_readline" = yes; then
do echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo $ECHO_N "checking for rl_completion_append_character... $ECHO_C" >&6
echo "$as_me:$LINENO: checking for $ac_func" >&5 cat >conftest.$ac_ext <<_ACEOF
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, #include <stdio.h>
which can conflict with char $ac_func (); below. */ #ifdef HAVE_READLINE_READLINE_H
#include <assert.h> # include <readline/readline.h>
/* Override any gcc2 internal prototype to avoid an error. */ #elif defined(HAVE_READLINE_H)
#ifdef __cplusplus # include <readline.h>
extern "C"
#endif #endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
...@@ -11374,15 +11398,7 @@ char (*f) (); ...@@ -11374,15 +11398,7 @@ char (*f) ();
int int
main () main ()
{ {
/* The GNU C library defines this for functions which it implements rl_completion_append_character = 'x';
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; ;
return 0; return 0;
} }
...@@ -11399,29 +11415,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11399,29 +11415,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
_ACEOF
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
else
MISSING_RANDOM='$(top_builddir)/src/port/random.o'
fi
done
for ac_func in rl_completion_matches rl_filename_completion_function
for ac_func in inet_aton
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11493,36 +11503,18 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11493,36 +11503,18 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
else
INET_ATON='$(top_builddir)/src/port/inet_aton.o'
fi fi
done done
fi
for ac_func in strerror echo "$as_me:$LINENO: checking for finite" >&5
do echo $ECHO_N "checking for finite... $ECHO_C" >&6
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` cat >conftest.$ac_ext <<_ACEOF
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, #include <math.h>
which can conflict with char $ac_func (); below. */
#include <assert.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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
...@@ -11532,15 +11524,7 @@ char (*f) (); ...@@ -11532,15 +11524,7 @@ char (*f) ();
int int
main () main ()
{ {
/* The GNU C library defines this for functions which it implements int dummy=finite(1.0);
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; ;
return 0; return 0;
} }
...@@ -11557,51 +11541,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11557,51 +11541,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes"
cat >>confdefs.h <<\_ACEOF
#define HAVE_FINITE 1
_ACEOF
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
else
STRERROR='$(top_builddir)/src/port/strerror.o'
fi
done
for ac_func in strdup echo "$as_me:$LINENO: checking for sigsetjmp" >&5
do echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` cat >conftest.$ac_ext <<_ACEOF
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, #include <setjmp.h>
which can conflict with char $ac_func (); below. */
#include <assert.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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
extern "C" extern "C"
...@@ -11611,15 +11571,7 @@ char (*f) (); ...@@ -11611,15 +11571,7 @@ char (*f) ();
int int
main () main ()
{ {
/* The GNU C library defines this for functions which it implements sigjmp_buf x; sigsetjmp(x, 1);
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; ;
return 0; return 0;
} }
...@@ -11636,41 +11588,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11636,41 +11588,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else cat >>confdefs.h <<\_ACEOF
echo "$as_me: failed program was:" >&5 #define HAVE_SIGSETJMP 1
cat conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else else
STRDUP='$(top_builddir)/src/port/strdup.o' echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi fi
done rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
for ac_func in strtol echo "$as_me:$LINENO: checking for syslog" >&5
do echo $ECHO_N "checking for syslog... $ECHO_C" >&6
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` if test "${ac_cv_func_syslog+set}" = set; then
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */ which can conflict with char syslog (); below. */
#include <assert.h> #include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus #ifdef __cplusplus
...@@ -11678,7 +11620,7 @@ extern "C" ...@@ -11678,7 +11620,7 @@ extern "C"
#endif #endif
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */ builtin and then its argument prototype would still apply. */
char $ac_func (); char syslog ();
char (*f) (); char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
...@@ -11693,10 +11635,10 @@ main () ...@@ -11693,10 +11635,10 @@ main ()
/* The GNU C library defines this for functions which it implements /* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */ something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func) #if defined (__stub_syslog) || defined (__stub___syslog)
choke me choke me
#else #else
f = $ac_func; f = syslog;
#endif #endif
; ;
...@@ -11715,29 +11657,185 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ...@@ -11715,29 +11657,185 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" ac_cv_func_syslog=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" ac_cv_func_syslog=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 echo "${ECHO_T}$ac_cv_func_syslog" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then if test $ac_cv_func_syslog = yes; then
cat >>confdefs.h <<_ACEOF if test "${ac_cv_header_syslog_h+set}" = set; then
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 echo "$as_me:$LINENO: checking for syslog.h" >&5
echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
if test "${ac_cv_header_syslog_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking syslog.h usability" >&5
echo $ECHO_N "checking syslog.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
$ac_includes_default
#include <syslog.h>
_ACEOF _ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
{ (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_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking syslog.h presence" >&5
echo $ECHO_N "checking syslog.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <syslog.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else else
STRTOL='$(top_builddir)/src/port/strtol.o' echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
{ echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
no:yes )
{ echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: syslog.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
esac
echo "$as_me:$LINENO: checking for syslog.h" >&5
echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
if test "${ac_cv_header_syslog_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_syslog_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
fi
if test $ac_cv_header_syslog_h = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_SYSLOG 1
_ACEOF
fi
fi
echo "$as_me:$LINENO: checking for optreset" >&5
echo $ECHO_N "checking for optreset... $ECHO_C" >&6
if test "${pgac_cv_var_int_optreset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <unistd.h>
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
extern int optreset; optreset = 1;
;
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
pgac_cv_var_int_optreset=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
pgac_cv_var_int_optreset=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $pgac_cv_var_int_optreset" >&5
echo "${ECHO_T}$pgac_cv_var_int_optreset" >&6
if test x"$pgac_cv_var_int_optreset" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_INT_OPTRESET 1
_ACEOF
fi fi
done
for ac_func in strtoul for ac_func in strtoll strtoq
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11808,15 +11906,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11808,15 +11906,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
break
else
STRTOUL='$(top_builddir)/src/port/strtoul.o'
fi fi
done done
for ac_func in strcasecmp for ac_func in strtoull strtouq
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11887,41 +11983,14 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11887,41 +11983,14 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
break
else
STRCASECMP='$(top_builddir)/src/port/strcasecmp.o'
fi fi
done done
# Check for one of atexit() or on_exit()
# Set path of dllinit.c for cygwin for ac_func in atexit
DLLINIT=""
case $host_os in
cygwin*) DLLINIT='$(top_builddir)/src/backend/port/dllinit.o' ;;
esac
# Set path of qsort for solaris, which has a very slow qsort in certain cases.
QSORT=""
case $host_os in
solaris*) DLLINIT='$(top_builddir)/src/backend/port/qsort.o' ;;
esac
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
# this hackery with HPUXMATHLIB allows us to cope.
HPUXMATHLIB=""
case $host_cpu in
hppa1.1)
if [ -r /lib/pa1.1/libm.a ] ; then
HPUXMATHLIB="-L /lib/pa1.1 -lm"
fi ;;
esac
for ac_func in rint
do do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5 echo "$as_me:$LINENO: checking for $ac_func" >&5
...@@ -11994,134 +12063,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -11994,134 +12063,13 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
_ACEOF _ACEOF
else else
echo "$as_me:$LINENO: checking for rint in -lm" >&5
echo $ECHO_N "checking for rint in -lm... $ECHO_C" >&6 for ac_func in on_exit
if test "${ac_cv_lib_m_rint+set}" = set; then do
echo $ECHO_N "(cached) $ECHO_C" >&6 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
else echo "$as_me:$LINENO: checking for $ac_func" >&5
ac_check_lib_save_LIBS=$LIBS echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
LIBS="-lm $HPUXMATHLIB $LIBS" if eval "test \"\${$as_ac_var+set}\" = set"; then
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 rint ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
rint ();
;
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_m_rint=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_lib_m_rint=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_rint" >&5
echo "${ECHO_T}$ac_cv_lib_m_rint" >&6
if test $ac_cv_lib_m_rint = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_RINT 1
_ACEOF
fi
fi
done
if test "$with_readline" = yes; then
echo "$as_me:$LINENO: checking for rl_completion_append_character" >&5
echo $ECHO_N "checking for rl_completion_append_character... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <stdio.h>
#ifdef HAVE_READLINE_READLINE_H
# include <readline/readline.h>
#elif defined(HAVE_READLINE_H)
# include <readline.h>
#endif
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
rl_completion_append_character = 'x';
;
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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1
_ACEOF
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
for ac_func in rl_completion_matches rl_filename_completion_function
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
...@@ -12188,916 +12136,229 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then ...@@ -12188,916 +12136,229 @@ if test `eval echo '${'$as_ac_var'}'` = yes; then
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF _ACEOF
else
{ { echo "$as_me:$LINENO: error: neither atexit() nor on_exit() found" >&5
echo "$as_me: error: neither atexit() nor on_exit() found" >&2;}
{ (exit 1); exit 1; }; }
fi fi
done done
fi fi
done
echo "$as_me:$LINENO: checking for finite" >&5
echo $ECHO_N "checking for finite... $ECHO_C" >&6 # This test makes sure that run tests work at all. Sometimes a shared
cat >conftest.$ac_ext <<_ACEOF # library is found by the linker, but the runtime linker can't find it.
# This check should come after all modifications of compiler or linker
# variables, and before any other run tests.
echo "$as_me:$LINENO: checking test program" >&5
echo $ECHO_N "checking test program... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: cross-compiling" >&5
echo "${ECHO_T}cross-compiling" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> int main() { return 0; }
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
int dummy=finite(1.0);
;
return 0;
}
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
echo "$as_me:$LINENO: result: ok" >&5
cat >>confdefs.h <<\_ACEOF echo "${ECHO_T}ok" >&6
#define HAVE_FINITE 1
_ACEOF
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5 ( exit $ac_status )
echo "${ECHO_T}no" >&6 echo "$as_me:$LINENO: result: failed" >&5
echo "${ECHO_T}failed" >&6
{ { echo "$as_me:$LINENO: error:
*** Could not execute a simple test program. This may be a problem
*** related to locating shared libraries. Check the file 'config.log'
*** for the exact reason." >&5
echo "$as_me: error:
*** Could not execute a simple test program. This may be a problem
*** related to locating shared libraries. Check the file 'config.log'
*** for the exact reason." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: checking for sigsetjmp" >&5
echo $ECHO_N "checking for sigsetjmp... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF echo "$as_me:$LINENO: checking whether long int is 64 bits" >&5
echo $ECHO_N "checking whether long int is 64 bits... $ECHO_C" >&6
if test "${pgac_cv_type_long_int_64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
pgac_cv_type_long_int_64=no
{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
#include <setjmp.h> typedef long int int64;
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus /*
extern "C" * These are globals to discourage the compiler from folding all the
# endif * arithmetic tests down to compile-time constants.
int F77_DUMMY_MAIN() { return 1; } */
#endif int64 a = 20000001;
int int64 b = 40000005;
main ()
int does_int64_work()
{ {
sigjmp_buf x; sigsetjmp(x, 1); int64 c,d;
;
return 0; if (sizeof(int64) != 8)
return 0; /* definitely not the right size */
/* Do perfunctory checks to see if 64-bit arithmetic seems to work */
c = a * b;
d = (c + b) / b;
if (d != a+1)
return 0;
return 1;
}
main() {
exit(! does_int64_work());
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
pgac_cv_type_long_int_64=yes
cat >>confdefs.h <<\_ACEOF
#define HAVE_SIGSETJMP 1
_ACEOF
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
echo "$as_me:$LINENO: checking for syslog" >&5
echo $ECHO_N "checking for syslog... $ECHO_C" >&6
if test "${ac_cv_func_syslog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char syslog (); below. */
#include <assert.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 syslog ();
char (*f) ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_syslog) || defined (__stub___syslog)
choke me
#else
f = syslog;
#endif
;
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_func_syslog=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_cv_func_syslog=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_syslog" >&5
echo "${ECHO_T}$ac_cv_func_syslog" >&6
if test $ac_cv_func_syslog = yes; then
if test "${ac_cv_header_syslog_h+set}" = set; then
echo "$as_me:$LINENO: checking for syslog.h" >&5
echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
if test "${ac_cv_header_syslog_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
else
# Is the header compilable?
echo "$as_me:$LINENO: checking syslog.h usability" >&5
echo $ECHO_N "checking syslog.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
$ac_includes_default
#include <syslog.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
{ (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_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
echo "$as_me:$LINENO: checking syslog.h presence" >&5
echo $ECHO_N "checking syslog.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <syslog.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
else
ac_cpp_err=
fi
else
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
{ echo "$as_me:$LINENO: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: syslog.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
no:yes )
{ echo "$as_me:$LINENO: WARNING: syslog.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: syslog.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: syslog.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: syslog.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: syslog.h: proceeding with the preprocessor's result" >&2;};;
esac
echo "$as_me:$LINENO: checking for syslog.h" >&5
echo $ECHO_N "checking for syslog.h... $ECHO_C" >&6
if test "${ac_cv_header_syslog_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_syslog_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_syslog_h" >&5
echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
fi
if test $ac_cv_header_syslog_h = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_SYSLOG 1
_ACEOF
fi
fi
echo "$as_me:$LINENO: checking for optreset" >&5
echo $ECHO_N "checking for optreset... $ECHO_C" >&6
if test "${pgac_cv_var_int_optreset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <unistd.h>
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
extern int optreset; optreset = 1;
;
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
pgac_cv_var_int_optreset=yes
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
pgac_cv_var_int_optreset=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $pgac_cv_var_int_optreset" >&5
echo "${ECHO_T}$pgac_cv_var_int_optreset" >&6
if test x"$pgac_cv_var_int_optreset" = x"yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_INT_OPTRESET 1
_ACEOF
fi
# This test makes sure that run tests work at all. Sometimes a shared
# library is found by the linker, but the runtime linker can't find it.
# This check should come after all modifications of compiler or linker
# variables, and before any other run tests.
echo "$as_me:$LINENO: checking test program" >&5
echo $ECHO_N "checking test program... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: cross-compiling" >&5
echo "${ECHO_T}cross-compiling" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
int main() { return 0; }
_ACEOF
rm -f 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='./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
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
( exit $ac_status )
echo "$as_me:$LINENO: result: failed" >&5
echo "${ECHO_T}failed" >&6
{ { echo "$as_me:$LINENO: error:
*** Could not execute a simple test program. This may be a problem
*** related to locating shared libraries. Check the file 'config.log'
*** for the exact reason." >&5
echo "$as_me: error:
*** Could not execute a simple test program. This may be a problem
*** related to locating shared libraries. Check the file 'config.log'
*** for the exact reason." >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: checking whether long int is 64 bits" >&5
echo $ECHO_N "checking whether long int is 64 bits... $ECHO_C" >&6
if test "${pgac_cv_type_long_int_64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
pgac_cv_type_long_int_64=no
{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
typedef long int int64;
/*
* These are globals to discourage the compiler from folding all the
* arithmetic tests down to compile-time constants.
*/
int64 a = 20000001;
int64 b = 40000005;
int does_int64_work()
{
int64 c,d;
if (sizeof(int64) != 8)
return 0; /* definitely not the right size */
/* Do perfunctory checks to see if 64-bit arithmetic seems to work */
c = a * b;
d = (c + b) / b;
if (d != a+1)
return 0;
return 1;
}
main() {
exit(! does_int64_work());
}
_ACEOF
rm -f 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='./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
pgac_cv_type_long_int_64=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
( exit $ac_status )
pgac_cv_type_long_int_64=no
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $pgac_cv_type_long_int_64" >&5
echo "${ECHO_T}$pgac_cv_type_long_int_64" >&6
HAVE_LONG_INT_64=$pgac_cv_type_long_int_64
if test x"$pgac_cv_type_long_int_64" = xyes ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LONG_INT_64
_ACEOF
fi
if test x"$HAVE_LONG_INT_64" = x"no" ; then
echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
echo $ECHO_N "checking whether long long int is 64 bits... $ECHO_C" >&6
if test "${pgac_cv_type_long_long_int_64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
pgac_cv_type_long_long_int_64=no
{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
typedef long long int int64;
/*
* These are globals to discourage the compiler from folding all the
* arithmetic tests down to compile-time constants.
*/
int64 a = 20000001;
int64 b = 40000005;
int does_int64_work()
{
int64 c,d;
if (sizeof(int64) != 8)
return 0; /* definitely not the right size */
/* Do perfunctory checks to see if 64-bit arithmetic seems to work */
c = a * b;
d = (c + b) / b;
if (d != a+1)
return 0;
return 1;
}
main() {
exit(! does_int64_work());
}
_ACEOF
rm -f 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='./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
pgac_cv_type_long_long_int_64=yes
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
( exit $ac_status )
pgac_cv_type_long_long_int_64=no
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $pgac_cv_type_long_long_int_64" >&5
echo "${ECHO_T}$pgac_cv_type_long_long_int_64" >&6
HAVE_LONG_LONG_INT_64=$pgac_cv_type_long_long_int_64
if test x"$pgac_cv_type_long_long_int_64" = xyes ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LONG_LONG_INT_64
_ACEOF
fi
fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#define INT64CONST(x) x##LL
long long int foo = INT64CONST(0x1234567890123456);
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
{ (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
cat >>confdefs.h <<\_ACEOF
#define HAVE_LL_CONSTANTS 1
_ACEOF
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
if [ x$SNPRINTF = x ] ; then
echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %lld" >&5
echo $ECHO_N "checking whether snprintf handles 'long long int' as %lld... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: assuming not on target machine" >&5
echo "${ECHO_T}assuming not on target machine" >&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
INT64_FORMAT='"%lld"'
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
#define INT64_FORMAT "%lld"
int64 a = 20000001;
int64 b = 40000005;
int does_int64_snprintf_work()
{
int64 c;
char buf[100];
if (sizeof(int64) != 8)
return 0; /* doesn't look like the right size */
c = a * b;
snprintf(buf, 100, INT64_FORMAT, c);
if (strcmp(buf, "800000140000005") != 0)
return 0; /* either multiply or snprintf is busted */
return 1;
}
main() {
exit(! does_int64_snprintf_work());
}
_ACEOF
rm -f 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='./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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
INT64_FORMAT='"%lld"'
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
( exit $ac_status )
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %qd" >&5
echo $ECHO_N "checking whether snprintf handles 'long long int' as %qd... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: assuming not on target machine" >&5
echo "${ECHO_T}assuming not on target machine" >&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
INT64_FORMAT='"%lld"'
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
#define INT64_FORMAT "%qd"
int64 a = 20000001;
int64 b = 40000005;
int does_int64_snprintf_work()
{
int64 c;
char buf[100];
if (sizeof(int64) != 8)
return 0; /* doesn't look like the right size */
c = a * b;
snprintf(buf, 100, INT64_FORMAT, c);
if (strcmp(buf, "800000140000005") != 0)
return 0; /* either multiply or snprintf is busted */
return 1;
}
main() {
exit(! does_int64_snprintf_work());
}
_ACEOF
rm -f 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='./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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
INT64_FORMAT='"%qd"'
else else
echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
( exit $ac_status ) ( exit $ac_status )
echo "$as_me:$LINENO: result: no" >&5 pgac_cv_type_long_int_64=no
echo "${ECHO_T}no" >&6
# Force usage of our own snprintf, since system snprintf is broken
SNPRINTF='$(top_builddir)/src/port/snprintf.o'
INT64_FORMAT='"%lld"'
fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi fi
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
else
# here if we previously decided we needed to use our own snprintf
INT64_FORMAT='"%lld"'
fi
else
# Here if we are not using 'long long int' at all
INT64_FORMAT='"%ld"'
fi fi
echo "$as_me:$LINENO: result: $pgac_cv_type_long_int_64" >&5
echo "${ECHO_T}$pgac_cv_type_long_int_64" >&6
HAVE_LONG_INT_64=$pgac_cv_type_long_int_64
if test x"$pgac_cv_type_long_int_64" = xyes ; then
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<\_ACEOF
#define INT64_FORMAT $INT64_FORMAT #define HAVE_LONG_INT_64
_ACEOF _ACEOF
for ac_func in strtoll strtoq
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
#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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN
# ifdef __cplusplus
extern "C"
# endif
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
;
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
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
break
fi fi
done
for ac_func in strtoull strtouq if test x"$HAVE_LONG_INT_64" = x"no" ; then
do echo "$as_me:$LINENO: checking whether long long int is 64 bits" >&5
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo $ECHO_N "checking whether long long int is 64 bits... $ECHO_C" >&6
echo "$as_me:$LINENO: checking for $ac_func" >&5 if test "${pgac_cv_type_long_long_int_64+set}" = set; then
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
pgac_cv_type_long_long_int_64=no
{ echo "$as_me:$LINENO: WARNING: 64 bit arithmetic disabled when cross-compiling" >&5
echo "$as_me: WARNING: 64 bit arithmetic disabled when cross-compiling" >&2;}
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, typedef long long int int64;
which can conflict with char $ac_func (); below. */
#include <assert.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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN /*
# ifdef __cplusplus * These are globals to discourage the compiler from folding all the
extern "C" * arithmetic tests down to compile-time constants.
# endif */
int F77_DUMMY_MAIN() { return 1; } int64 a = 20000001;
#endif int64 b = 40000005;
int
main () int does_int64_work()
{ {
/* The GNU C library defines this for functions which it implements int64 c,d;
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; if (sizeof(int64) != 8)
return 0; return 0; /* definitely not the right size */
/* Do perfunctory checks to see if 64-bit arithmetic seems to work */
c = a * b;
d = (c + b) / b;
if (d != a+1)
return 0;
return 1;
}
main() {
exit(! does_int64_work());
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" pgac_cv_type_long_long_int_64=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" ( exit $ac_status )
pgac_cv_type_long_long_int_64=no
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 fi
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 echo "$as_me:$LINENO: result: $pgac_cv_type_long_long_int_64" >&5
if test `eval echo '${'$as_ac_var'}'` = yes; then echo "${ECHO_T}$pgac_cv_type_long_long_int_64" >&6
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 HAVE_LONG_LONG_INT_64=$pgac_cv_type_long_long_int_64
if test x"$pgac_cv_type_long_long_int_64" = xyes ; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LONG_LONG_INT_64
_ACEOF _ACEOF
break
fi fi
done
fi
# Check for one of atexit() or on_exit()
for ac_func in atexit
do if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */ #define INT64CONST(x) x##LL
#include <assert.h> long long int foo = INT64CONST(0x1234567890123456);
/* 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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN #ifdef F77_DUMMY_MAIN
# ifdef __cplusplus # ifdef __cplusplus
...@@ -13108,130 +12369,187 @@ char (*f) (); ...@@ -13108,130 +12369,187 @@ char (*f) ();
int int
main () main ()
{ {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_link) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext' { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes"
cat >>confdefs.h <<\_ACEOF
#define HAVE_LL_CONSTANTS 1
_ACEOF
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f conftest.$ac_objext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 if test $pgac_need_repl_snprintf = no; then
echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %lld" >&5
echo $ECHO_N "checking whether snprintf handles 'long long int' as %lld... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: cannot test (not on host machine)" >&5
echo "${ECHO_T}cannot test (not on host machine)" >&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"'
else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
#include <stdio.h>
typedef long long int int64;
#define INT64_FORMAT "%lld"
int64 a = 20000001;
int64 b = 40000005;
int does_int64_snprintf_work()
{
int64 c;
char buf[100];
if (sizeof(int64) != 8)
return 0; /* doesn't look like the right size */
c = a * b;
snprintf(buf, 100, INT64_FORMAT, c);
if (strcmp(buf, "800000140000005") != 0)
return 0; /* either multiply or snprintf is busted */
return 1;
}
main() {
exit(! does_int64_snprintf_work());
}
_ACEOF _ACEOF
rm -f 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='./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
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
INT64_FORMAT='"%lld"'
else else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
( exit $ac_status )
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking whether snprintf handles 'long long int' as %qd" >&5
echo $ECHO_N "checking whether snprintf handles 'long long int' as %qd... $ECHO_C" >&6
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: cannot test (not on host machine)" >&5
echo "${ECHO_T}cannot test (not on host machine)" >&6
# Force usage of our own snprintf, since we cannot test foreign snprintf
pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"'
for ac_func in on_exit
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else else
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, #include <stdio.h>
which can conflict with char $ac_func (); below. */ typedef long long int int64;
#include <assert.h> #define INT64_FORMAT "%qd"
/* 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 $ac_func ();
char (*f) ();
#ifdef F77_DUMMY_MAIN int64 a = 20000001;
# ifdef __cplusplus int64 b = 40000005;
extern "C"
# endif int does_int64_snprintf_work()
int F77_DUMMY_MAIN() { return 1; }
#endif
int
main ()
{ {
/* The GNU C library defines this for functions which it implements int64 c;
to always fail with ENOSYS. Some functions are actually named char buf[100];
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
f = $ac_func;
#endif
; if (sizeof(int64) != 8)
return 0; return 0; /* doesn't look like the right size */
c = a * b;
snprintf(buf, 100, INT64_FORMAT, c);
if (strcmp(buf, "800000140000005") != 0)
return 0; /* either multiply or snprintf is busted */
return 1;
}
main() {
exit(! does_int64_snprintf_work());
} }
_ACEOF _ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>&5 (eval $ac_link) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
eval "$as_ac_var=yes" echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
INT64_FORMAT='"%qd"'
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5 cat conftest.$ac_ext >&5
eval "$as_ac_var=no" ( exit $ac_status )
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
# Force usage of our own snprintf, since system snprintf is broken
pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"'
fi fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 fi
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
if test `eval echo '${'$as_ac_var'}'` = yes; then fi
cat >>confdefs.h <<_ACEOF else
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 # here if we previously decided we needed to use our own snprintf
_ACEOF INT64_FORMAT='"%lld"'
fi
else else
{ { echo "$as_me:$LINENO: error: neither atexit() nor on_exit() found" >&5 # Here if we are not using 'long long int' at all
echo "$as_me: error: neither atexit() nor on_exit() found" >&2;} INT64_FORMAT='"%ld"'
{ (exit 1); exit 1; }; }
fi fi
done
fi
done
cat >>confdefs.h <<_ACEOF
#define INT64_FORMAT $INT64_FORMAT
_ACEOF
if test $pgac_need_repl_snprintf = yes; then
LIBOBJS="$LIBOBJS snprintf.$ac_objext"
fi
echo "$as_me:$LINENO: checking for unsigned long" >&5 echo "$as_me:$LINENO: checking for unsigned long" >&5
...@@ -17577,21 +16895,7 @@ s,@python_moduledir@,$python_moduledir,;t t ...@@ -17577,21 +16895,7 @@ s,@python_moduledir@,$python_moduledir,;t t
s,@python_moduleexecdir@,$python_moduleexecdir,;t t s,@python_moduleexecdir@,$python_moduleexecdir,;t t
s,@python_includespec@,$python_includespec,;t t s,@python_includespec@,$python_includespec,;t t
s,@python_libspec@,$python_libspec,;t t s,@python_libspec@,$python_libspec,;t t
s,@MEMCMP@,$MEMCMP,;t t s,@LIBOBJS@,$LIBOBJS,;t t
s,@SNPRINTF@,$SNPRINTF,;t t
s,@ISINF@,$ISINF,;t t
s,@GETRUSAGE@,$GETRUSAGE,;t t
s,@SRANDOM@,$SRANDOM,;t t
s,@GETHOSTNAME@,$GETHOSTNAME,;t t
s,@MISSING_RANDOM@,$MISSING_RANDOM,;t t
s,@INET_ATON@,$INET_ATON,;t t
s,@STRERROR@,$STRERROR,;t t
s,@STRDUP@,$STRDUP,;t t
s,@STRTOL@,$STRTOL,;t t
s,@STRTOUL@,$STRTOUL,;t t
s,@STRCASECMP@,$STRCASECMP,;t t
s,@DLLINIT@,$DLLINIT,;t t
s,@QSORT@,$QSORT,;t t
s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t
s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
s,@MSGFMT@,$MSGFMT,;t t s,@MSGFMT@,$MSGFMT,;t t
......
configure.in
View file @ b0c3c48e
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Header: /cvsroot/pgsql/configure.in,v 1.193 2002/07/19 17:35:09 momjian Exp $ dnl $Header: /cvsroot/pgsql/configure.in,v 1.194 2002/07/27 20:10:03 petere Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -747,6 +747,7 @@ fi ...@@ -747,6 +747,7 @@ fi
## ##
## Header files ## Header files
## ##
dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES dnl sys/socket.h is required by AC_FUNC_ACCEPT_ARGTYPES
AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h]) AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
...@@ -798,6 +799,7 @@ fi ...@@ -798,6 +799,7 @@ fi
## ##
## Types, structures, compiler characteristics ## Types, structures, compiler characteristics
## ##
m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that. m4_defun([AC_PROG_CC_STDC], []) dnl We don't want that.
AC_C_CONST AC_C_CONST
AC_C_INLINE AC_C_INLINE
...@@ -840,12 +842,13 @@ fi ...@@ -840,12 +842,13 @@ fi
## ##
## Functions, global variables ## Functions, global variables
## ##
PGAC_VAR_INT_TIMEZONE PGAC_VAR_INT_TIMEZONE
AC_FUNC_ACCEPT_ARGTYPES AC_FUNC_ACCEPT_ARGTYPES
PGAC_FUNC_GETTIMEOFDAY_1ARG PGAC_FUNC_GETTIMEOFDAY_1ARG
# SunOS doesn't handle negative byte comparisons properly with +/- return # SunOS doesn't handle negative byte comparisons properly with +/- return
PGAC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_CHECK_FUNCS([cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync]) AC_CHECK_FUNCS([cbrt fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync])
...@@ -870,10 +873,9 @@ fi ...@@ -870,10 +873,9 @@ fi
# also decide to use snprintf.c if snprintf() is present but does not # also decide to use snprintf.c if snprintf() is present but does not
# have working "long long int" support -- see below. # have working "long long int" support -- see below.
SNPRINTF='' pgac_need_repl_snprintf=no
AC_CHECK_FUNCS(snprintf, [], SNPRINTF='$(top_builddir)/src/port/snprintf.o') AC_CHECK_FUNCS(snprintf, [], pgac_need_repl_snprintf=yes)
AC_CHECK_FUNCS(vsnprintf, [], SNPRINTF='$(top_builddir)/src/port/snprintf.o') AC_CHECK_FUNCS(vsnprintf, [], pgac_need_repl_snprintf=yes)
AC_SUBST(SNPRINTF)
# Check whether <stdio.h> declares snprintf() and vsnprintf(); if not, # Check whether <stdio.h> declares snprintf() and vsnprintf(); if not,
...@@ -895,49 +897,18 @@ AC_CACHE_CHECK([for isinf], ac_cv_func_isinf, ...@@ -895,49 +897,18 @@ AC_CACHE_CHECK([for isinf], ac_cv_func_isinf,
if test $ac_cv_func_isinf = yes ; then if test $ac_cv_func_isinf = yes ; then
AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have isinf()]) AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have isinf()])
ISINF=
else else
ISINF='isinf.o' AC_LIBOBJ(isinf)
# Look for a way to implement a substitute for isinf() # Look for a way to implement a substitute for isinf()
AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break]) AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
fi fi
AC_SUBST(ISINF)
AC_CHECK_FUNCS(getrusage, [], GETRUSAGE='$(top_builddir)/src/port/getrusage.o')
AC_SUBST(GETRUSAGE)
AC_CHECK_FUNCS(srandom, [], SRANDOM='$(top_builddir)/src/port/srandom.o')
AC_SUBST(SRANDOM)
AC_CHECK_FUNCS(gethostname, [], GETHOSTNAME='$(top_builddir)/src/port/gethostname.o')
AC_SUBST(GETHOSTNAME)
AC_CHECK_FUNCS(random, [], MISSING_RANDOM='$(top_builddir)/src/port/random.o')
AC_SUBST(MISSING_RANDOM)
AC_CHECK_FUNCS(inet_aton, [], INET_ATON='$(top_builddir)/src/port/inet_aton.o')
AC_SUBST(INET_ATON)
AC_CHECK_FUNCS(strerror, [], STRERROR='$(top_builddir)/src/port/strerror.o')
AC_SUBST(STRERROR)
AC_CHECK_FUNCS(strdup, [], STRDUP='$(top_builddir)/src/port/strdup.o')
AC_SUBST(STRDUP)
AC_CHECK_FUNCS(strtol, [], STRTOL='$(top_builddir)/src/port/strtol.o')
AC_SUBST(STRTOL)
AC_CHECK_FUNCS(strtoul, [], STRTOUL='$(top_builddir)/src/port/strtoul.o')
AC_SUBST(STRTOUL)
AC_CHECK_FUNCS(strcasecmp, [], STRCASECMP='$(top_builddir)/src/port/strcasecmp.o')
AC_SUBST(STRCASECMP)
# Set path of dllinit.c for cygwin
DLLINIT=""
case $host_os in
cygwin*) DLLINIT='$(top_builddir)/src/backend/port/dllinit.o' ;;
esac
AC_SUBST(DLLINIT)
# Set path of qsort for solaris, which has a very slow qsort in certain cases. AC_REPLACE_FUNCS([gethostname getrusage inet_aton random srandom strcasecmp strdup strerror strtol strtoul])
QSORT=""
# Solaris has a very slow qsort in certain cases.
case $host_os in case $host_os in
solaris*) DLLINIT='$(top_builddir)/src/backend/port/qsort.o' ;; solaris*) AC_LIBOBJ(qsort) ;;
esac esac
AC_SUBST(QSORT)
# On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a; # On HPUX 9, rint() is not in regular libm.a but in /lib/pa1.1/libm.a;
# this hackery with HPUXMATHLIB allows us to cope. # this hackery with HPUXMATHLIB allows us to cope.
...@@ -992,6 +963,14 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then ...@@ -992,6 +963,14 @@ if test x"$pgac_cv_var_int_optreset" = x"yes"; then
AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset']) AC_DEFINE(HAVE_INT_OPTRESET, 1, [Define to 1 if you have the global variable 'int optreset'])
fi fi
AC_CHECK_FUNCS([strtoll strtoq], [break])
AC_CHECK_FUNCS([strtoull strtouq], [break])
# Check for one of atexit() or on_exit()
AC_CHECK_FUNCS(atexit, [],
[AC_CHECK_FUNCS(on_exit, [],
[AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
# This test makes sure that run tests work at all. Sometimes a shared # This test makes sure that run tests work at all. Sometimes a shared
# library is found by the linker, but the runtime linker can't find it. # library is found by the linker, but the runtime linker can't find it.
...@@ -1047,8 +1026,8 @@ dnl We cope with snprintfs that use either %lld or %qd as the format. ...@@ -1047,8 +1026,8 @@ dnl We cope with snprintfs that use either %lld or %qd as the format.
dnl If neither works, fall back to our own snprintf emulation (which we dnl If neither works, fall back to our own snprintf emulation (which we
dnl know uses %lld). dnl know uses %lld).
if [[ x"$HAVE_LONG_LONG_INT_64" = xyes ]] ; then if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
if [[ x$SNPRINTF = x ]] ; then if test $pgac_need_repl_snprintf = no; then
AC_MSG_CHECKING(whether snprintf handles 'long long int' as %lld) AC_MSG_CHECKING(whether snprintf handles 'long long int' as %lld)
AC_TRY_RUN([#include <stdio.h> AC_TRY_RUN([#include <stdio.h>
typedef long long int int64; typedef long long int int64;
...@@ -1108,17 +1087,17 @@ main() { ...@@ -1108,17 +1087,17 @@ main() {
], ],
[ AC_MSG_RESULT(no) [ AC_MSG_RESULT(no)
# Force usage of our own snprintf, since system snprintf is broken # Force usage of our own snprintf, since system snprintf is broken
SNPRINTF='$(top_builddir)/src/port/snprintf.o' pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
], ],
[ AC_MSG_RESULT(assuming not on target machine) [ AC_MSG_RESULT([cannot test (not on host machine)])
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
SNPRINTF='$(top_builddir)/src/port/snprintf.o' pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
]) ], ]) ],
[ AC_MSG_RESULT(assuming not on target machine) [ AC_MSG_RESULT([cannot test (not on host machine)])
# Force usage of our own snprintf, since we cannot test foreign snprintf # Force usage of our own snprintf, since we cannot test foreign snprintf
SNPRINTF='$(top_builddir)/src/port/snprintf.o' pgac_need_repl_snprintf=yes
INT64_FORMAT='"%lld"' INT64_FORMAT='"%lld"'
]) ])
else else
...@@ -1133,14 +1112,9 @@ fi ...@@ -1133,14 +1112,9 @@ fi
AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT, AC_DEFINE_UNQUOTED(INT64_FORMAT, $INT64_FORMAT,
[Define this as the appropriate snprintf format for 64-bit ints, if any]) [Define this as the appropriate snprintf format for 64-bit ints, if any])
if test $pgac_need_repl_snprintf = yes; then
AC_CHECK_FUNCS([strtoll strtoq], [break]) AC_LIBOBJ(snprintf)
AC_CHECK_FUNCS([strtoull strtouq], [break]) fi
# Check for one of atexit() or on_exit()
AC_CHECK_FUNCS(atexit, [],
[AC_CHECK_FUNCS(on_exit, [],
[AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
dnl Need a #define for the size of Datum (unsigned long) dnl Need a #define for the size of Datum (unsigned long)
......
contrib/pg_controldata/Makefile
View file @ b0c3c48e
# $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.7 2002/07/18 04:33:39 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/Makefile,v 1.8 2002/07/27 20:10:03 petere Exp $
subdir = contrib/pg_controldata subdir = contrib/pg_controldata
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
all: submake-libpgport
PROGRAM = pg_controldata PROGRAM = pg_controldata
OBJS = pg_controldata.o pg_crc.o $(SNPRINTF) OBJS = pg_controldata.o pg_crc.o
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
EXTRA_CLEAN = pg_crc.c snprintf.c EXTRA_CLEAN = pg_crc.c
DOCS = README.pg_controldata DOCS = README.pg_controldata
......
contrib/pg_resetxlog/Makefile
View file @ b0c3c48e
# $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.5 2002/07/18 04:33:39 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/pg_resetxlog/Attic/Makefile,v 1.6 2002/07/27 20:10:03 petere Exp $
subdir = contrib/pg_resetxlog subdir = contrib/pg_resetxlog
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
all: submake-libpgport
PROGRAM = pg_resetxlog PROGRAM = pg_resetxlog
OBJS = pg_resetxlog.o pg_crc.o $(SNPRINTF) OBJS = pg_resetxlog.o pg_crc.o
pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
EXTRA_CLEAN = pg_crc.c snprintf.c EXTRA_CLEAN = pg_crc.c
DOCS = README.pg_resetxlog DOCS = README.pg_resetxlog
......
doc/FAQ_Solaris
View file @ b0c3c48e
...@@ -3,7 +3,7 @@ Frequently Asked Questions (FAQ) for PostgreSQL 7.2 ...@@ -3,7 +3,7 @@ Frequently Asked Questions (FAQ) for PostgreSQL 7.2
Sun Solaris specific Sun Solaris specific
to be read in conjunction with the installation instructions to be read in conjunction with the installation instructions
============================================================ ============================================================
last updated: $Date: 2002/07/15 21:34:04 $ last updated: $Date: 2002/07/27 20:10:03 $
current maintainer: Peter Eisentraut <peter_e@gmx.net> current maintainer: Peter Eisentraut <peter_e@gmx.net>
...@@ -88,15 +88,15 @@ to work on Solaris 7: ...@@ -88,15 +88,15 @@ to work on Solaris 7:
On Solaris 7 and older, the 64-bit version of libc has a buggy vsnprintf On Solaris 7 and older, the 64-bit version of libc has a buggy vsnprintf
routine, which leads to erratic core dumps in PostgreSQL. The simplest known routine, which leads to erratic core dumps in PostgreSQL. The simplest known
workaround is to force PostgreSQL to use its own version of vsnprintf rather workaround is to force PostgreSQL to use its own version of vsnprintf rather
than the library copy. To do this, after you run 'configure' edit two files than the library copy. To do this, after you run 'configure' edit a file
produced by configure: produced by configure:
(1) In src/Makefile.global, change the line In src/Makefile.global, change the line
SNPRINTF = LIBOBJS =
to read to read
SNPRINTF = $(top_builddir)/src/backend/port/snprint.o LIBOBJS = snprintf.o
(2) In src/backend/port/Makefile, add "snprintf.o" to OBJS. (Skip this (There might be other files already listed in this variable. Order
step if you see "$(SNPRINTF)" already listed in OBJS.) does not matter.)
Then build as usual. Then build as usual.
src/Makefile
View file @ b0c3c48e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/Makefile,v 1.25 2002/07/18 22:15:10 tgl Exp $ # $Header: /cvsroot/pgsql/src/Makefile,v 1.26 2002/07/27 20:10:04 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -14,6 +14,7 @@ include Makefile.global ...@@ -14,6 +14,7 @@ include Makefile.global
all install installdirs uninstall dep depend distprep: all install installdirs uninstall dep depend distprep:
$(MAKE) -C port $@
$(MAKE) -C backend $@ $(MAKE) -C backend $@
$(MAKE) -C include $@ $(MAKE) -C include $@
$(MAKE) -C interfaces $@ $(MAKE) -C interfaces $@
...@@ -24,6 +25,7 @@ install-all-headers: ...@@ -24,6 +25,7 @@ install-all-headers:
$(MAKE) -C include $@ $(MAKE) -C include $@
clean: clean:
$(MAKE) -C port $@
$(MAKE) -C backend $@ $(MAKE) -C backend $@
$(MAKE) -C include $@ $(MAKE) -C include $@
$(MAKE) -C interfaces $@ $(MAKE) -C interfaces $@
...@@ -32,6 +34,7 @@ clean: ...@@ -32,6 +34,7 @@ clean:
$(MAKE) -C test $@ $(MAKE) -C test $@
distclean maintainer-clean: distclean maintainer-clean:
-$(MAKE) -C port $@
-$(MAKE) -C backend $@ -$(MAKE) -C backend $@
-$(MAKE) -C include $@ -$(MAKE) -C include $@
-$(MAKE) -C interfaces $@ -$(MAKE) -C interfaces $@
......
src/Makefile.global.in
View file @ b0c3c48e
# -*-makefile-*- # -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.151 2002/07/19 17:35:10 momjian Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.152 2002/07/27 20:10:04 petere Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -294,6 +294,7 @@ ifeq ($(enable_rpath), yes) ...@@ -294,6 +294,7 @@ ifeq ($(enable_rpath), yes)
LDFLAGS += $(rpath) LDFLAGS += $(rpath)
endif endif
########################################################################## ##########################################################################
# #
# Some variables needed to find some client interfaces # Some variables needed to find some client interfaces
...@@ -302,6 +303,14 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq ...@@ -302,6 +303,14 @@ libpq_srcdir = $(top_srcdir)/src/interfaces/libpq
libpq_builddir = $(top_builddir)/src/interfaces/libpq libpq_builddir = $(top_builddir)/src/interfaces/libpq
libpq = -L$(libpq_builddir) -lpq libpq = -L$(libpq_builddir) -lpq
submake-libpq:
$(MAKE) -C $(libpq_builddir) all
submake-libpgport:
$(MAKE) -C $(top_builddir)/src/port all
.PHONY: submake-libpq submake-libpgport
########################################################################## ##########################################################################
# #
...@@ -346,23 +355,14 @@ endif ...@@ -346,23 +355,14 @@ endif
# #
# substitute implementations of the C library # substitute implementations of the C library
GETHOSTNAME = @GETHOSTNAME@ LIBOBJS = @LIBOBJS@
GETRUSAGE = @GETRUSAGE@
INET_ATON = @INET_ATON@ ifneq (,$(LIBOBJS))
ISINF = @ISINF@ LIBS += -lpgport
MEMCMP = @MEMCMP@ LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS)
MISSING_RANDOM = @MISSING_RANDOM@ endif
QSORT = @QSORT@
SNPRINTF = @SNPRINTF@
SRANDOM = @SRANDOM@
STRCASECMP = @STRCASECMP@
STRDUP = @STRDUP@
STRERROR = @STRERROR@
STRTOL = @STRTOL@
STRTOUL = @STRTOUL@
# Not really standard libc functions, used by the backend. # Not really standard libc functions, used by the backend.
DLLINIT = @DLLINIT@
TAS = @TAS@ TAS = @TAS@
......
src/Makefile.shlib
View file @ b0c3c48e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.59 2002/07/16 05:46:35 momjian Exp $ # $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.60 2002/07/27 20:10:04 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -332,7 +332,7 @@ $(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT) ...@@ -332,7 +332,7 @@ $(shlib) lib$(NAME).a: $(OBJS) $(DLLINIT)
$(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK) $(DLLWRAP) -o $(shlib) --dllname $(shlib) --def $(NAME).def $(OBJS) $(DLLINIT) $(DLLLIBS) $(SHLIB_LINK)
$(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a $(DLLTOOL) --dllname $(shlib) --def $(NAME).def --output-lib lib$(NAME).a
$(DLLINIT): $(DLLINIT): $(DLLINIT:%.o=%.c)
$(MAKE) -C $(@D) $(@F) $(MAKE) -C $(@D) $(@F)
endif # PORTNAME == win endif # PORTNAME == win
......
src/backend/Makefile
View file @ b0c3c48e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.81 2002/07/18 02:02:29 ishii Exp $ # $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.82 2002/07/27 20:10:04 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -29,7 +29,7 @@ endif ...@@ -29,7 +29,7 @@ endif
########################################################################## ##########################################################################
all: postgres $(POSTGRES_IMP) all: submake-libpgport postgres $(POSTGRES_IMP)
ifeq ($(enable_nls), yes) ifeq ($(enable_nls), yes)
$(MAKE) -C po all $(MAKE) -C po all
endif endif
...@@ -41,13 +41,11 @@ postgres: $(OBJS) ...@@ -41,13 +41,11 @@ postgres: $(OBJS)
else # win else # win
# No points for style here. How about encapsulating some of these
# commands into variables?
postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a
dlltool --dllname $@$(X) --output-exp $@.exp --def postgres.def $(DLLTOOL) --dllname $@$(X) --output-exp $@.exp --def postgres.def
gcc $(LDFLAGS) -g -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(DLLLIBS) $(CC) $(LDFLAGS) -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(DLLLIBS)
dlltool --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def $(DLLTOOL) --dllname $@$(X) --base-file $@.base --output-exp $@.exp --def postgres.def
gcc $(LDFLAGS) -g -o $@$(X) $@.exp $(OBJS) $(DLLLIBS) $(CC) $(LDFLAGS) -o $@$(X) $@.exp $(OBJS) $(DLLLIBS)
rm $@.exp $@.base rm $@.exp $@.base
endif # win endif # win
...@@ -73,7 +71,7 @@ libpostgres.a: $(OBJS) $(DLLINIT) postgres.def ...@@ -73,7 +71,7 @@ libpostgres.a: $(OBJS) $(DLLINIT) postgres.def
endif # MAKE_DLL endif # MAKE_DLL
$(DLLINIT): $(DLLINIT): $(DLLINIT:%.o=%.c)
$(MAKE) -C $(@D) $(@F) $(MAKE) -C $(@D) $(@F)
# The postgres.o target is needed by the rule in Makefile.global that # The postgres.o target is needed by the rule in Makefile.global that
......
src/backend/port/Makefile
View file @ b0c3c48e
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
# be converted to Method 2. # be converted to Method 2.
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.17 2002/07/19 17:35:11 momjian Exp $ # $Header: /cvsroot/pgsql/src/backend/port/Makefile,v 1.18 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -21,14 +21,8 @@ subdir = src/backend/port ...@@ -21,14 +21,8 @@ subdir = src/backend/port
top_builddir = ../../.. top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
OBJS=$(GETHOSTNAME) $(GETRUSAGE) $(INET_ATON) $(ISINF) $(MEMCMP) \
$(MISSING_RANDOM) $(QSORT) $(SNPRINTF) $(SRANDOM) $(STRCASECMP) \
$(STRDUP) $(STRERROR) $(STRTOL) $(STRTOUL)
OBJS+=dynloader.o pg_sema.o pg_shmem.o OBJS+=dynloader.o pg_sema.o pg_shmem.o
OBJS+=$(DLLINIT)
OBJS+=$(TAS) OBJS+=$(TAS)
ifeq ($(PORTNAME), qnx4) ifeq ($(PORTNAME), qnx4)
...@@ -65,7 +59,7 @@ tas.o: tas.s ...@@ -65,7 +59,7 @@ tas.o: tas.s
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
# IPC test program # IPC test program
ipc_test: ipc_test.o pg_sema.o pg_shmem.o $(MEMCMP) $(SNPRINTF) $(STRERROR) ipc_test: ipc_test.o pg_sema.o pg_shmem.o
$(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@
distclean clean: distclean clean:
......
src/backend/port/inet_aton.c deleted 100644 → 0
View file @ c3fdf892
/* $Id: inet_aton.c,v 1.20 2001/10/25 05:49:40 momjian Exp $
*
* This inet_aton() function was taken from the GNU C library and
* incorporated into Postgres for those systems which do not have this
* routine in their standard C libraries.
*
* The function was been extracted whole from the file inet_aton.c in
* Release 5.3.12 of the Linux C library, which is derived from the
* GNU C library, by Bryan Henderson in October 1996. The copyright
* notice from that file is below.
*/
/*
* Copyright (c) 1983, 1990, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. */
#include "c.h"
#include <sys/types.h>
#include <netinet/in.h>
#include <ctype.h>
/*
* Check whether "cp" is a valid ascii representation
* of an Internet address and convert to a binary address.
* Returns 1 if the address is valid, 0 if not.
* This replaces inet_addr, the return value from which
* cannot distinguish between failure and a local broadcast address.
*/
int
inet_aton(const char *cp, struct in_addr * addr)
{
unsigned int val;
int base,
n;
char c;
u_int parts[4];
u_int *pp = parts;
for (;;)
{
/*
* Collect number up to ``.''. Values are specified as for C:
* 0x=hex, 0=octal, other=decimal.
*/
val = 0;
base = 10;
if (*cp == '0')
{
if (*++cp == 'x' || *cp == 'X')
base = 16, cp++;
else
base = 8;
}
while ((c = *cp) != '\0')
{
if (isdigit((unsigned char) c))
{
val = (val * base) + (c - '0');
cp++;
continue;
}
if (base == 16 && isxdigit((unsigned char) c))
{
val = (val << 4) +
(c + 10 - (islower((unsigned char) c) ? 'a' : 'A'));
cp++;
continue;
}
break;
}
if (*cp == '.')
{
/*
* Internet format: a.b.c.d a.b.c (with c treated as
* 16-bits) a.b (with b treated as 24 bits)
*/
if (pp >= parts + 3 || val > 0xff)
return 0;
*pp++ = val, cp++;
}
else
break;
}
/*
* Check for trailing junk.
*/
while (*cp)
if (!isspace((unsigned char) *cp++))
return 0;
/*
* Concoct the address according to the number of parts specified.
*/
n = pp - parts + 1;
switch (n)
{
case 1: /* a -- 32 bits */
break;
case 2: /* a.b -- 8.24 bits */
if (val > 0xffffff)
return 0;
val |= parts[0] << 24;
break;
case 3: /* a.b.c -- 8.8.16 bits */
if (val > 0xffff)
return 0;
val |= (parts[0] << 24) | (parts[1] << 16);
break;
case 4: /* a.b.c.d -- 8.8.8.8 bits */
if (val > 0xff)
return 0;
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
break;
}
if (addr)
addr->s_addr = htonl(val);
return 1;
}
src/bin/pg_dump/Makefile
View file @ b0c3c48e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.35 2002/07/15 21:34:05 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.36 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -14,12 +14,11 @@ top_builddir = ../../.. ...@@ -14,12 +14,11 @@ top_builddir = ../../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \ OBJS= pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
pg_backup_files.o pg_backup_null.o pg_backup_tar.o sprompt.o \ pg_backup_files.o pg_backup_null.o pg_backup_tar.o sprompt.o
$(STRDUP) $(STRTOUL)
override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
all: submake pg_dump pg_restore pg_dumpall all: submake-libpq submake-libpgport pg_dump pg_restore pg_dumpall
pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a pg_dump: pg_dump.o common.o $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ $(CC) $(CFLAGS) pg_dump.o common.o $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
...@@ -34,10 +33,6 @@ pg_dumpall: pg_dumpall.sh ...@@ -34,10 +33,6 @@ pg_dumpall: pg_dumpall.sh
$< >$@ $< >$@
chmod a+x $@ chmod a+x $@
.PHONY: submake
submake:
$(MAKE) -C $(libpq_builddir) all
install: all installdirs install: all installdirs
$(INSTALL_PROGRAM) pg_dump$(X) $(DESTDIR)$(bindir)/pg_dump$(X) $(INSTALL_PROGRAM) pg_dump$(X) $(DESTDIR)$(bindir)/pg_dump$(X)
$(INSTALL_PROGRAM) pg_restore$(X) $(DESTDIR)$(bindir)/pg_restore$(X) $(INSTALL_PROGRAM) pg_restore$(X) $(DESTDIR)$(bindir)/pg_restore$(X)
...@@ -49,12 +44,5 @@ installdirs: ...@@ -49,12 +44,5 @@ installdirs:
uninstall: uninstall:
rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall) rm -f $(addprefix $(DESTDIR)$(bindir)/, pg_dump$(X) pg_restore$(X) pg_dumpall)
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall rm -f pg_dump$(X) pg_restore$(X) $(OBJS) pg_dump.o common.o pg_restore.o pg_dumpall
ifeq (depend,$(wildcard depend))
include depend
endif
src/bin/pg_encoding/Makefile
View file @ b0c3c48e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1998, PostgreSQL Global Development Group # Copyright (c) 1998, PostgreSQL Global Development Group
# #
# $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.14 2001/03/23 05:46:05 ishii Exp $ # $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/Makefile,v 1.15 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -14,23 +14,11 @@ include $(top_builddir)/src/Makefile.global ...@@ -14,23 +14,11 @@ include $(top_builddir)/src/Makefile.global
OBJS= pg_encoding.o OBJS= pg_encoding.o
all: submake pg_encoding all: submake-libpq submake-libpgport pg_encoding
ifdef STRTOUL
OBJS+=$(top_builddir)/src/backend/port/strtoul.o
$(top_builddir)/src/backend/port/strtoul.o:
$(MAKE) -C $(top_builddir)/src/backend/port strtoul.o
endif
pg_encoding: $(OBJS) pg_encoding: $(OBJS)
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@ $(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
.PHONY: submake
submake:
$(MAKE) -C $(libpq_builddir) all
install: all installdirs install: all installdirs
$(INSTALL_PROGRAM) pg_encoding$(X) $(DESTDIR)$(bindir)/pg_encoding$(X) $(INSTALL_PROGRAM) pg_encoding$(X) $(DESTDIR)$(bindir)/pg_encoding$(X)
...@@ -40,12 +28,5 @@ installdirs: ...@@ -40,12 +28,5 @@ installdirs:
uninstall: uninstall:
rm -f $(DESTDIR)$(bindir)/pg_encoding$(X) rm -f $(DESTDIR)$(bindir)/pg_encoding$(X)
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend
clean distclean maintainer-clean: clean distclean maintainer-clean:
rm -f pg_encoding$(X) pg_encoding.o rm -f pg_encoding$(X) pg_encoding.o
ifeq (depend,$(wildcard depend))
include depend
endif
src/bin/psql/Makefile
View file @ b0c3c48e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.34 2002/07/15 21:34:05 momjian Exp $ # $Header: /cvsroot/pgsql/src/bin/psql/Makefile,v 1.35 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -19,12 +19,9 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) ...@@ -19,12 +19,9 @@ override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o \ OBJS=command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
startup.o prompt.o variables.o large_obj.o print.o describe.o \ startup.o prompt.o variables.o large_obj.o print.o describe.o \
sprompt.o tab-complete.o mbprint.o $(SNPRINTF) $(STRDUP) \ sprompt.o tab-complete.o mbprint.o
$(STRERROR) $(STRTOUL)
all: submake psql all: submake-libpq submake-libpgport psql
# End of hacks for picking up backend 'port' modules
psql: $(OBJS) $(libpq_builddir)/libpq.a psql: $(OBJS) $(libpq_builddir)/libpq.a
$(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@ $(CC) $(CFLAGS) $(OBJS) $(libpq) $(LDFLAGS) $(LIBS) -o $@
...@@ -39,11 +36,6 @@ $(srcdir)/sql_help.h: ...@@ -39,11 +36,6 @@ $(srcdir)/sql_help.h:
@echo "*** Perl is needed to build psql help." @echo "*** Perl is needed to build psql help."
endif endif
.PHONY: submake
submake:
$(MAKE) -C $(libpq_builddir) all
distprep: $(srcdir)/sql_help.h distprep: $(srcdir)/sql_help.h
install: all installdirs install: all installdirs
...@@ -55,15 +47,8 @@ installdirs: ...@@ -55,15 +47,8 @@ installdirs:
uninstall: uninstall:
rm -f $(DESTDIR)$(bindir)/psql$(X) rm -f $(DESTDIR)$(bindir)/psql$(X)
depend dep:
$(CC) -MM -MG $(CFLAGS) *.c >depend
clean distclean: clean distclean:
rm -f psql$(X) $(OBJS) rm -f psql$(X) $(OBJS)
maintainer-clean: distclean maintainer-clean: distclean
rm -f $(srcdir)/sql_help.h rm -f $(srcdir)/sql_help.h
ifeq (depend,$(wildcard depend))
include depend
endif
src/interfaces/ecpg/preproc/Makefile
View file @ b0c3c48e
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.84 2002/07/15 21:34:05 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.85 2002/07/27 20:10:05 petere Exp $
subdir = src/interfaces/ecpg/preproc subdir = src/interfaces/ecpg/preproc
top_builddir = ../../../.. top_builddir = ../../../..
...@@ -18,10 +18,9 @@ override CFLAGS += -Wno-error ...@@ -18,10 +18,9 @@ override CFLAGS += -Wno-error
endif endif
OBJS=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\ OBJS=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o output.o\
keywords.o c_keywords.o ../lib/typename.o descriptor.o variable.o \ keywords.o c_keywords.o ../lib/typename.o descriptor.o variable.o
$(SNPRINTF) $(STRDUP)
all: ecpg all: submake-libpgport ecpg
ecpg: $(OBJS) ecpg: $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
...@@ -70,11 +69,3 @@ clean distclean: ...@@ -70,11 +69,3 @@ clean distclean:
# inadequate tools. # inadequate tools.
maintainer-clean: distclean maintainer-clean: distclean
rm -f $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c rm -f $(srcdir)/preproc.c $(srcdir)/preproc.h $(srcdir)/pgc.c
depend dep: preproc.c pgc.c
$(CC) -MM $(CFLAGS) *.c >depend
ifeq (depend,$(wildcard depend))
include depend
endif
src/interfaces/libpgtcl/Makefile
View file @ b0c3c48e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.26 2001/05/11 01:46:33 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.27 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -27,11 +27,7 @@ SHLIB_LINK = $(libpq) ...@@ -27,11 +27,7 @@ SHLIB_LINK = $(libpq)
# braindead; users of libpq should not need to know what it depends on.) # braindead; users of libpq should not need to know what it depends on.)
SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS)) SHLIB_LINK+= $(filter -L%, $(LDFLAGS)) $(filter -lcrypt, $(LIBS))
all: submake all-lib all: submake-libpq all-lib
.PHONY: submake
submake:
$(MAKE) -C $(libpq_builddir) all
# Shared library stuff # Shared library stuff
include $(top_srcdir)/src/Makefile.shlib include $(top_srcdir)/src/Makefile.shlib
......
src/interfaces/libpq++/examples/Makefile
View file @ b0c3c48e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
# Portions Copyright (c) 1994, Regents of the University of California # Portions Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/Makefile,v 1.14 2002/06/20 20:29:54 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq++/examples/Attic/Makefile,v 1.15 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -31,8 +31,6 @@ all: $(PROGS) ...@@ -31,8 +31,6 @@ all: $(PROGS)
$(PROGS): % : %.cc $(PROGS): % : %.cc
$(CXX) $(CXXFLAGS) -o $@ $@.cc $(LDFLAGS) $(CXX) $(CXXFLAGS) -o $@ $@.cc $(LDFLAGS)
.PHONY: submake
clean: clean:
rm -f $(PROGS) rm -f $(PROGS)
src/interfaces/libpq/Makefile
View file @ b0c3c48e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
# Copyright (c) 1994, Regents of the University of California # Copyright (c) 1994, Regents of the University of California
# #
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.63 2002/07/18 03:59:49 momjian Exp $ # $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.64 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -22,7 +22,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconf ...@@ -22,7 +22,7 @@ override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconf
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \ OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
pqexpbuffer.o dllist.o md5.o pqsignal.o fe-secure.o \ pqexpbuffer.o dllist.o md5.o pqsignal.o fe-secure.o \
$(notdir $(INET_ATON)) $(notdir $(SNPRINTF)) $(notdir $(STRERROR)) $(filter inet_aton.o snprintf.o strerror.o, $(LIBOBJS))
ifdef MULTIBYTE ifdef MULTIBYTE
OBJS+= wchar.o encnames.o OBJS+= wchar.o encnames.o
...@@ -54,20 +54,8 @@ md5.c: $(backend_src)/libpq/md5.c ...@@ -54,20 +54,8 @@ md5.c: $(backend_src)/libpq/md5.c
# symlink the source files in here and build our own object file. # symlink the source files in here and build our own object file.
# this only gets done if configure finds system doesn't have inet_aton() # this only gets done if configure finds system doesn't have inet_aton()
ifdef INET_ATON inet_aton.c snprintf.c strerror.c: %.c : $(top_srcdir)/src/port/%.c
$(basename $(notdir $(INET_ATON))).c: $(basename $(INET_ATON)).c
rm -f $@ && $(LN_S) $< . rm -f $@ && $(LN_S) $< .
endif
ifdef SNPRINTF
$(basename $(notdir $(SNPRINTF))).c: $(basename $(SNPRINTF)).c
rm -f $@ && $(LN_S) $< .
endif
ifdef STRERROR
$(basename $(notdir $(STRERROR))).c: $(basename $(STRERROR)).c
rm -f $@ && $(LN_S) $< .
endif
ifdef MULTIBYTE ifdef MULTIBYTE
wchar.c : % : $(backend_src)/utils/mb/% wchar.c : % : $(backend_src)/utils/mb/%
......
src/makefiles/Makefile.win
View file @ b0c3c48e
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.16 2002/07/16 05:46:35 momjian Exp $ # $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.17 2002/07/27 20:10:05 petere Exp $
LDFLAGS+= -g LDFLAGS+= -g
DLLTOOL= dlltool DLLTOOL= dlltool
DLLWRAP= dllwrap DLLWRAP= dllwrap
DLLLIBS= -lcygipc -lcrypt DLLLIBS= -lcygipc -lcrypt
BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres BE_DLLLIBS= -L$(top_builddir)/src/backend -lpostgres
DLLINIT = $(top_builddir)/src/utils/dllinit.o
MK_NO_LORDER=true MK_NO_LORDER=true
MAKE_DLL=true MAKE_DLL=true
#MAKE_DLL=false #MAKE_DLL=false
......
src/port/Makefile
View file @ b0c3c48e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# with broken/missing library files. # with broken/missing library files.
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/port/Makefile,v 1.2 2002/07/19 17:35:11 momjian Exp $ # $Header: /cvsroot/pgsql/src/port/Makefile,v 1.3 2002/07/27 20:10:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -15,9 +15,12 @@ subdir = src/port ...@@ -15,9 +15,12 @@ subdir = src/port
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
ifdef LIBOBJS
all: libpgport.a
endif
# libpgport.a: $(LIBOBJS)
# The backend/port directory removes these files. $(AR) crs $@ $^
#
#distclean clean: clean distclean maintainer-clean:
# rm -f $(OBJS) rm -f libpgport.a $(LIBOBJS)
src/port/inet_aton.h deleted 100644 → 0
View file @ c3fdf892
/* $Id: inet_aton.h,v 1.1 2002/07/18 04:13:59 momjian Exp $ */
int inet_aton(const char *cp, struct in_addr * addr);
src/utils/Makefile 0 → 100644
View file @ b0c3c48e
#-------------------------------------------------------------------------
#
# Makefile for utils
#
# $Header: /cvsroot/pgsql/src/utils/Attic/Makefile,v 1.14 2002/07/27 20:10:05 petere Exp $
#
# dllinit.o is only built on Win32 platform.
#
#-------------------------------------------------------------------------
subdir = src/utils
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
all:
clean distclean maintainer-clean:
rm -f dllinit.o
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