components/bash/solaris-009.configure.patch
changeset 115 c360825c3a3f
parent 114 6cc95ec7b1bb
child 116 ae6a90899b42
equal deleted inserted replaced
114:6cc95ec7b1bb 115:c360825c3a3f
     1 --- configure	2009-12-29 05:34:51.000000000 -0800
       
     2 +++ configure	2010-09-01 10:45:06.225859891 -0700
       
     3 @@ -1,4 +1,4 @@
       
     4 -#! /bin/sh
       
     5 +#! /bin/bash
       
     6  # From configure.in for Bash 4.1, version 4.019.
       
     7  # Guess values for system-dependent variables and create Makefiles.
       
     8  # Generated by GNU Autoconf 2.63 for bash 4.1-release.
       
     9 @@ -13,6 +13,8 @@
       
    10  ## M4sh Initialization.  ##
       
    11  ## --------------------- ##
       
    12  
       
    13 +export LD_OPTIONS="-lc -lm -lgen -lsocket -lnsl -lresolv -z ignore"
       
    14 +
       
    15  # Be more Bourne compatible
       
    16  DUALCASE=1; export DUALCASE # for MKS sh
       
    17  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
       
    18 @@ -592,7 +594,7 @@
       
    19  subdirs=
       
    20  MFLAGS=
       
    21  MAKEFLAGS=
       
    22 -SHELL=${CONFIG_SHELL-/bin/sh}
       
    23 +SHELL=${CONFIG_SHELL-/bin/bash}
       
    24  
       
    25  # Identity of this package.
       
    26  PACKAGE_NAME='bash'
       
    27 @@ -3500,7 +3502,7 @@
       
    28    ac_save_c_werror_flag=$ac_c_werror_flag
       
    29     ac_c_werror_flag=yes
       
    30     ac_cv_prog_cc_g=no
       
    31 -   CFLAGS="-g"
       
    32 +   CFLAGS=""
       
    33     cat >conftest.$ac_ext <<_ACEOF
       
    34  /* confdefs.h.  */
       
    35  _ACEOF
       
    36 @@ -3579,7 +3581,7 @@
       
    37  sed 's/^/| /' conftest.$ac_ext >&5
       
    38  
       
    39  	ac_c_werror_flag=$ac_save_c_werror_flag
       
    40 -	 CFLAGS="-g"
       
    41 +	 CFLAGS=""
       
    42  	 cat >conftest.$ac_ext <<_ACEOF
       
    43  /* confdefs.h.  */
       
    44  _ACEOF
       
    45 @@ -3638,7 +3640,7 @@
       
    46    if test "$GCC" = yes; then
       
    47      CFLAGS="-g -O2"
       
    48    else
       
    49 -    CFLAGS="-g"
       
    50 +    CFLAGS=""
       
    51    fi
       
    52  else
       
    53    if test "$GCC" = yes; then
       
    54 @@ -5092,7 +5094,7 @@
       
    55  
       
    56  if test -z "$CC_FOR_BUILD"; then
       
    57      if test "x$cross_compiling" = "xno"; then
       
    58 -	CC_FOR_BUILD='$(CC)'
       
    59 +	CC_FOR_BUILD='$(CC) $(CPPFLAGS) $(CFLAGS)'
       
    60      else
       
    61  	CC_FOR_BUILD=gcc
       
    62      fi
       
    63 @@ -5100,7 +5102,7 @@
       
    64  
       
    65  
       
    66  
       
    67 -test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
       
    68 +test -z "$CFLAGS" && CFLAGS="${CFLAGS}" auto_cflags=1
       
    69  
       
    70  test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O2"
       
    71  
       
    72 @@ -5132,7 +5134,7 @@
       
    73  	LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-""}
       
    74  fi
       
    75  
       
    76 -test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD="-g"
       
    77 +test -z "$CFLAGS_FOR_BUILD" && CFLAGS_FOR_BUILD=""
       
    78  
       
    79  
       
    80  
       
    81 @@ -5257,9 +5259,14 @@
       
    82  int
       
    83  main ()
       
    84  {
       
    85 +#if defined(sun) || defined(__sun) || defined(__sun__)
       
    86 +#error "we want to use libcurses."
       
    87 +return 255;
       
    88 +#else
       
    89  return tgetent ();
       
    90    ;
       
    91    return 0;
       
    92 +#endif
       
    93  }
       
    94  _ACEOF
       
    95  rm -f conftest.$ac_objext conftest$ac_exeext
       
    96 @@ -6164,7 +6171,7 @@
       
    97    $as_echo_n "(cached) " >&6
       
    98  else
       
    99    cat >conftest.make <<\_ACEOF
       
   100 -SHELL = /bin/sh
       
   101 +SHELL = /bin/bash
       
   102  all:
       
   103  	@echo '@@@%%%=$(MAKE)=@@@%%%'
       
   104  _ACEOF
       
   105 @@ -6190,7 +6197,7 @@
       
   106  
       
   107  case "$host_os" in
       
   108  opennt*|interix*)	MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;;
       
   109 -*)			MAKE_SHELL=/bin/sh ;;
       
   110 +*)			MAKE_SHELL=/bin/bash ;;
       
   111  esac
       
   112  
       
   113  
       
   114 @@ -7177,7 +7184,7 @@
       
   115  # Prepare PATH_SEPARATOR.
       
   116  # The user is always right.
       
   117  if test "${PATH_SEPARATOR+set}" != set; then
       
   118 -  echo "#! /bin/sh" >conf$$.sh
       
   119 +  echo "#! /bin/bash" >conf$$.sh
       
   120    echo  "exit 0"   >>conf$$.sh
       
   121    chmod +x conf$$.sh
       
   122    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
       
   123 @@ -7191,7 +7198,7 @@
       
   124  # Find out how to test for executable files. Don't use a zero-byte file,
       
   125  # as systems may use methods other than mode bits to determine executability.
       
   126  cat >conf$$.file <<_ASEOF
       
   127 -#! /bin/sh
       
   128 +#! /bin/bash
       
   129  exit 0
       
   130  _ASEOF
       
   131  chmod +x conf$$.file
       
   132 @@ -7288,7 +7295,7 @@
       
   133  # Prepare PATH_SEPARATOR.
       
   134  # The user is always right.
       
   135  if test "${PATH_SEPARATOR+set}" != set; then
       
   136 -  echo "#! /bin/sh" >conf$$.sh
       
   137 +  echo "#! /bin/bash" >conf$$.sh
       
   138    echo  "exit 0"   >>conf$$.sh
       
   139    chmod +x conf$$.sh
       
   140    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
       
   141 @@ -7302,7 +7309,7 @@
       
   142  # Find out how to test for executable files. Don't use a zero-byte file,
       
   143  # as systems may use methods other than mode bits to determine executability.
       
   144  cat >conf$$.file <<_ASEOF
       
   145 -#! /bin/sh
       
   146 +#! /bin/bash
       
   147  exit 0
       
   148  _ASEOF
       
   149  chmod +x conf$$.file
       
   150 @@ -7359,7 +7366,7 @@
       
   151  # Prepare PATH_SEPARATOR.
       
   152  # The user is always right.
       
   153  if test "${PATH_SEPARATOR+set}" != set; then
       
   154 -  echo "#! /bin/sh" >conf$$.sh
       
   155 +  echo "#! /bin/bash" >conf$$.sh
       
   156    echo  "exit 0"   >>conf$$.sh
       
   157    chmod +x conf$$.sh
       
   158    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
       
   159 @@ -7373,7 +7380,7 @@
       
   160  # Find out how to test for executable files. Don't use a zero-byte file,
       
   161  # as systems may use methods other than mode bits to determine executability.
       
   162  cat >conf$$.file <<_ASEOF
       
   163 -#! /bin/sh
       
   164 +#! /bin/bash
       
   165  exit 0
       
   166  _ASEOF
       
   167  chmod +x conf$$.file
       
   168 @@ -8992,7 +8999,7 @@
       
   169  # Prepare PATH_SEPARATOR.
       
   170  # The user is always right.
       
   171  if test "${PATH_SEPARATOR+set}" != set; then
       
   172 -  echo "#! /bin/sh" >conf$$.sh
       
   173 +  echo "#! /bin/bash" >conf$$.sh
       
   174    echo  "exit 0"   >>conf$$.sh
       
   175    chmod +x conf$$.sh
       
   176    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
       
   177 @@ -9102,7 +9109,7 @@
       
   178  else
       
   179  
       
   180      CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
       
   181 -    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
       
   182 +    ${CONFIG_SHELL-/bin/bash} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
       
   183      . ./conftest.sh
       
   184      rm -f ./conftest.sh
       
   185      acl_cv_rpath=done
       
   186 @@ -13042,39 +13049,18 @@
       
   187  /* end confdefs.h.  */
       
   188  /* Define isinf to an innocuous variant, in case <limits.h> declares isinf.
       
   189     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
       
   190 -#define isinf innocuous_isinf
       
   191 -
       
   192 -/* System header to define __stub macros and hopefully few prototypes,
       
   193 -    which can conflict with char isinf (); below.
       
   194 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
       
   195 -    <limits.h> exists even on freestanding compilers.  */
       
   196 -
       
   197 -#ifdef __STDC__
       
   198 -# include <limits.h>
       
   199 -#else
       
   200 -# include <assert.h>
       
   201 -#endif
       
   202 -
       
   203 -#undef isinf
       
   204 -
       
   205 +#include <math.h>
       
   206  /* Override any GCC internal prototype to avoid an error.
       
   207     Use char because int might match the return type of a GCC
       
   208     builtin and then its argument prototype would still apply.  */
       
   209 -#ifdef __cplusplus
       
   210 -extern "C"
       
   211 -#endif
       
   212 -char isinf ();
       
   213  /* The GNU C library defines this for functions which it implements
       
   214      to always fail with ENOSYS.  Some functions are actually named
       
   215      something starting with __ and the normal name is an alias.  */
       
   216 -#if defined __stub_isinf || defined __stub___isinf
       
   217 -choke me
       
   218 -#endif
       
   219  
       
   220  int
       
   221  main ()
       
   222  {
       
   223 -return isinf ();
       
   224 +return isinf(0.0);
       
   225    ;
       
   226    return 0;
       
   227  }
       
   228 @@ -13134,39 +13120,26 @@
       
   229  /* end confdefs.h.  */
       
   230  /* Define isnan to an innocuous variant, in case <limits.h> declares isnan.
       
   231     For example, HP-UX 11i <limits.h> declares gettimeofday.  */
       
   232 -#define isnan innocuous_isnan
       
   233  
       
   234  /* System header to define __stub macros and hopefully few prototypes,
       
   235      which can conflict with char isnan (); below.
       
   236      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
       
   237      <limits.h> exists even on freestanding compilers.  */
       
   238  
       
   239 -#ifdef __STDC__
       
   240 -# include <limits.h>
       
   241 -#else
       
   242 -# include <assert.h>
       
   243 -#endif
       
   244 -
       
   245 -#undef isnan
       
   246 +#include <math.h>
       
   247  
       
   248  /* Override any GCC internal prototype to avoid an error.
       
   249     Use char because int might match the return type of a GCC
       
   250     builtin and then its argument prototype would still apply.  */
       
   251 -#ifdef __cplusplus
       
   252 -extern "C"
       
   253 -#endif
       
   254 -char isnan ();
       
   255 +
       
   256  /* The GNU C library defines this for functions which it implements
       
   257      to always fail with ENOSYS.  Some functions are actually named
       
   258      something starting with __ and the normal name is an alias.  */
       
   259 -#if defined __stub_isnan || defined __stub___isnan
       
   260 -choke me
       
   261 -#endif
       
   262  
       
   263  int
       
   264  main ()
       
   265  {
       
   266 -return isnan ();
       
   267 +return isnan(0.0);
       
   268    ;
       
   269    return 0;
       
   270  }
       
   271 @@ -25521,7 +25494,7 @@
       
   272  exit 69
       
   273  ' >conftest
       
   274  chmod u+x conftest
       
   275 -(SHELL=/bin/sh; export SHELL; ./conftest >/dev/null 2>&1)
       
   276 +(SHELL=/bin/bash; export SHELL; ./conftest >/dev/null 2>&1)
       
   277  if test $? -ne 69; then
       
   278     ac_cv_sys_interpreter=yes
       
   279  else
       
   280 @@ -30117,9 +30090,14 @@
       
   281  int
       
   282  main ()
       
   283  {
       
   284 +#if defined(sun) || defined(__sun) || defined(__sun__)
       
   285 +#error "we want to use libcurses"
       
   286 +return 255;
       
   287 +#else
       
   288  return tgetent ();
       
   289    ;
       
   290    return 0;
       
   291 +#endif
       
   292  }
       
   293  _ACEOF
       
   294  rm -f conftest.$ac_objext conftest$ac_exeext
       
   295 @@ -30302,7 +30280,7 @@
       
   296    $as_echo_n "(cached) " >&6
       
   297  else
       
   298    ac_check_lib_save_LIBS=$LIBS
       
   299 -LIBS="-lcurses  $LIBS"
       
   300 +LIBS="/usr/lib/libcurses.so.1  $LIBS"
       
   301  cat >conftest.$ac_ext <<_ACEOF
       
   302  /* confdefs.h.  */
       
   303  _ACEOF
       
   304 @@ -30468,7 +30446,7 @@
       
   305  TERMCAP_LIB=
       
   306  TERMCAP_DEP=
       
   307  else
       
   308 -TERMCAP_LIB=-lcurses
       
   309 +TERMCAP_LIB=/usr/lib/libcurses.so.1
       
   310  TERMCAP_DEP=
       
   311  fi
       
   312  
       
   313 @@ -30676,7 +30654,7 @@
       
   314  then
       
   315  	{ $as_echo "$as_me:$LINENO: checking shared object configuration for loadable builtins" >&5
       
   316  $as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
       
   317 -	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
       
   318 +	eval `${CONFIG_SHELL-/bin/bash} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
       
   319  
       
   320  
       
   321