database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-09 17:03:00 +03:00
Code Activity

Use our own getopt() and getopt_long() on Solaris, because that platform's

Browse Source 
versions don't handle long options the way we want.  Per Zdenek Kotala.
This commit is contained in:
Tom Lane
2008-02-24 05:22:33 +00:00
parent fd511b5347
commit 36cc9b7cea
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@@ -12758,8 +12758,13 @@ else
LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext" LIBOBJS="$LIBOBJS getaddrinfo.$ac_objext"
fi fi
# similarly, use system's getopt_long() only if system provides struct option. # Similarly, use system's getopt_long() only if system provides struct option.
if test x"$ac_cv_type_struct_option" = xyes ; then # Solaris' getopt() doesn't do what we want for long options, so always use
# our versions on that platform.
if test "$PORTNAME" = "solaris"; then
LIBOBJS="$LIBOBJS getopt.$ac_objext"
LIBOBJS="$LIBOBJS getopt_long.$ac_objext"
elif test x"$ac_cv_type_struct_option" = xyes ; then
for ac_func in getopt_long for ac_func in getopt_long
do do

13
configure.in
View File

@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.398.4.22 2008/01/03 21:41:50 tgl Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.398.4.23 2008/02/24 05:22:33 tgl Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org]) AC_INIT([PostgreSQL], [8.0.15], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.59 is required. m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.53], [], [m4_fatal([Autoconf version 2.53 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not Untested combinations of 'autoconf' and PostgreSQL versions are not
recommended. You can remove the check from 'configure.in' but it is then recommended. You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])]) your responsibility whether the result works or not.])])
@@ -942,8 +942,13 @@ else
AC_LIBOBJ(getaddrinfo) AC_LIBOBJ(getaddrinfo)
fi fi
# similarly, use system's getopt_long() only if system provides struct option. # Similarly, use system's getopt_long() only if system provides struct option.
if test x"$ac_cv_type_struct_option" = xyes ; then # Solaris' getopt() doesn't do what we want for long options, so always use
# our versions on that platform.
if test "$PORTNAME" = "solaris"; then
AC_LIBOBJ(getopt)
AC_LIBOBJ(getopt_long)
elif test x"$ac_cv_type_struct_option" = xyes ; then
AC_REPLACE_FUNCS([getopt_long]) AC_REPLACE_FUNCS([getopt_long])
else else
AC_LIBOBJ(getopt_long) AC_LIBOBJ(getopt_long)