Skip to content

Commit a74e041

Browse files
bmomjianbmomjian
committed
Put back code modularization of fseeko() configure checks.
1 parent 7f9693b commit a74e041

File tree

2 files changed

+106
-4
lines changed

2 files changed

+106
-4
lines changed

‎configure

Lines changed: 103 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16409,8 +16409,7 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
1640916409

1641016410

1641116411

16412-
16413-
for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv
16412+
for ac_func in crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv
1641416413
do
1641516414
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
1641616415
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -17928,6 +17927,108 @@ fi
1792817927
done
1792917928

1793017929

17930+
17931+
for ac_func in fseeko
17932+
do
17933+
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
17934+
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
17935+
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
17936+
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
17937+
echo $ECHO_N "(cached) $ECHO_C" >&6
17938+
else
17939+
cat >conftest.$ac_ext <<_ACEOF
17940+
/* confdefs.h. */
17941+
_ACEOF
17942+
cat confdefs.h >>conftest.$ac_ext
17943+
cat >>conftest.$ac_ext <<_ACEOF
17944+
/* end confdefs.h. */
17945+
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
17946+
For example, HP-UX 11i <limits.h> declares gettimeofday. */
17947+
#define $ac_func innocuous_$ac_func
17948+
17949+
/* System header to define __stub macros and hopefully few prototypes,
17950+
which can conflict with char $ac_func (); below.
17951+
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
17952+
<limits.h> exists even on freestanding compilers. */
17953+
17954+
#ifdef __STDC__
17955+
# include <limits.h>
17956+
#else
17957+
# include <assert.h>
17958+
#endif
17959+
17960+
#undef $ac_func
17961+
17962+
/* Override any GCC internal prototype to avoid an error.
17963+
Use char because int might match the return type of a GCC
17964+
builtin and then its argument prototype would still apply. */
17965+
#ifdef __cplusplus
17966+
extern "C"
17967+
#endif
17968+
char $ac_func ();
17969+
/* The GNU C library defines this for functions which it implements
17970+
to always fail with ENOSYS. Some functions are actually named
17971+
something starting with __ and the normal name is an alias. */
17972+
#if defined __stub_$ac_func || defined __stub___$ac_func
17973+
choke me
17974+
#endif
17975+
17976+
int
17977+
main ()
17978+
{
17979+
return $ac_func ();
17980+
;
17981+
return 0;
17982+
}
17983+
_ACEOF
17984+
rm -f conftest.$ac_objext conftest$ac_exeext
17985+
if { (ac_try="$ac_link"
17986+
case "(($ac_try" in
17987+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17988+
*) ac_try_echo=$ac_try;;
17989+
esac
17990+
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17991+
(eval "$ac_link") 2>conftest.er1
17992+
ac_status=$?
17993+
grep -v '^ *+' conftest.er1 >conftest.err
17994+
rm -f conftest.er1
17995+
cat conftest.err >&5
17996+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
17997+
(exit $ac_status); } && {
17998+
test -z "$ac_c_werror_flag" ||
17999+
test ! -s conftest.err
18000+
} && test -s conftest$ac_exeext &&
18001+
$as_test_x conftest$ac_exeext; then
18002+
eval "$as_ac_var=yes"
18003+
else
18004+
echo "$as_me: failed program was:" >&5
18005+
sed 's/^/| /' conftest.$ac_ext >&5
18006+
18007+
eval "$as_ac_var=no"
18008+
fi
18009+
18010+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
18011+
conftest$ac_exeext conftest.$ac_ext
18012+
fi
18013+
ac_res=`eval echo '${'$as_ac_var'}'`
18014+
{ echo "$as_me:$LINENO: result: $ac_res" >&5
18015+
echo "${ECHO_T}$ac_res" >&6; }
18016+
if test `eval echo '${'$as_ac_var'}'` = yes; then
18017+
cat >>confdefs.h <<_ACEOF
18018+
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
18019+
_ACEOF
18020+
18021+
else
18022+
case " $LIBOBJS " in
18023+
*" $ac_func.$ac_objext "* ) ;;
18024+
*) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
18025+
;;
18026+
esac
18027+
18028+
fi
18029+
done
18030+
18031+
1793118032
case $host_os in
1793218033
# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
1793318034
bsdi*|netbsd*)

‎configure.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.550 2008/02/19 00:46:43 momjian Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.551 2008/02/19 01:05:28 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1080,7 +1080,7 @@ fi
10801080
pgac_save_LIBS="$LIBS"
10811081
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
10821082

1083-
AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv])
1083+
AC_REPLACE_FUNCS([crypt getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv])
10841084

10851085
LIBS="$pgac_save_LIBS"
10861086

@@ -1153,6 +1153,7 @@ AC_CHECK_FUNCS(atexit, [],
11531153
[AC_CHECK_FUNCS(on_exit, [],
11541154
[AC_MSG_ERROR([neither atexit() nor on_exit() found])])])
11551155

1156+
AC_REPLACE_FUNCS(fseeko)
11561157
case $host_os in
11571158
# BSD/OS & NetBSD use a custom fseeko/ftello built on fsetpos/fgetpos
11581159
bsdi*|netbsd*)

0 commit comments

Comments
 (0)