Commitad20c99

committed

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

versions don't handle long options the way we want. Per Zdenek Kotala.

1 parent2e0e563 commitad20c99Copy full SHA for ad20c99

File tree

+25

-5

lines changed

+25

-5

lines changed

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16630,8 +16630,23 @@ esac`
`16630`	`16630`
`16631`	`16631`	`fi`
`16632`	`16632`
`16633`		`-# similarly, use system's getopt_long() only if system provides struct option.`
`16634`		`-if test x"$ac_cv_type_struct_option" = xyes ; then`
	`16633`	`+# Similarly, use system's getopt_long() only if system provides struct option.`
	`16634`	`+# Solaris' getopt() doesn't do what we want for long options, so always use`
	`16635`	`+# our versions on that platform.`
	`16636`	`+if test "$PORTNAME" = "solaris"; then`
	`16637`	`+ case " $LIBOBJS " in`
	`16638`	`+ " getopt.$ac_objext " ) ;;`
	`16639`	`+ *) LIBOBJS="$LIBOBJS getopt.$ac_objext"`
	`16640`	`+ ;;`
	`16641`	`+esac`
	`16642`	`+`
	`16643`	`+ case " $LIBOBJS " in`
	`16644`	`+ " getopt_long.$ac_objext " ) ;;`
	`16645`	`+ *) LIBOBJS="$LIBOBJS getopt_long.$ac_objext"`
	`16646`	`+ ;;`
	`16647`	`+esac`
	`16648`	`+`
	`16649`	`+elif test x"$ac_cv_type_struct_option" = xyes ; then`
`16635`	`16650`
`16636`	`16651`	`for ac_func in getopt_long`
`16637`	`16652`	`do`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $PostgreSQL: pgsql/configure.in,v 1.551 2008/02/19 01:05:28 momjian Exp $`
	`2`	`+dnl $PostgreSQL: pgsql/configure.in,v 1.552 2008/02/2405:21:54 tgl Exp $`
`3`	`3`	`dnl`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -1095,8 +1095,13 @@ else`
`1095`	`1095`	`AC_LIBOBJ(getaddrinfo)`
`1096`	`1096`	`fi`
`1097`	`1097`
`1098`		`-# similarly, use system's getopt_long() only if system provides struct option.`
`1099`		`-if test x"$ac_cv_type_struct_option" = xyes ; then`
	`1098`	`+# Similarly, use system's getopt_long() only if system provides struct option.`
	`1099`	`+# Solaris' getopt() doesn't do what we want for long options, so always use`
	`1100`	`+# our versions on that platform.`
	`1101`	`+if test "$PORTNAME" = "solaris"; then`
	`1102`	`+ AC_LIBOBJ(getopt)`
	`1103`	`+ AC_LIBOBJ(getopt_long)`
	`1104`	`+elif test x"$ac_cv_type_struct_option" = xyes ; then`
`1100`	`1105`	`AC_REPLACE_FUNCS([getopt_long])`
`1101`	`1106`	`else`
`1102`	`1107`	`AC_LIBOBJ(getopt_long)`

Comments

(0)