components/unixodbc/patches/000-configure.patch

   1 --- a/configure.~1~     2015-08-31 13:06:19.000000000 +0300
   2 +++ b/configure 2015-11-25 16:33:41.977839326 +0300
   3 @@ -1,4 +1,4 @@
   4 -#! /bin/sh
   5 +#! /bin/bash
   6  # Guess values for system-dependent variables and create Makefiles.
   7  # Generated by GNU Autoconf 2.68 for unixODBC 2.3.4.
   8  #
   9 @@ -256,7 +256,7 @@
  10  fi
  11  fi
  12  fi
  13 -SHELL=${CONFIG_SHELL-/bin/sh}
  14 +SHELL=${CONFIG_SHELL-/bin/bash}
  15  export SHELL
  16  # Unset more variables known to interfere with behavior of common tools.
  17  CLICOLOR_FORCE= GREP_OPTIONS=
  18 @@ -546,7 +546,7 @@
  19
  20  lt_ltdl_dir='libltdl'
  21
  22 -SHELL=${CONFIG_SHELL-/bin/sh}
  23 +SHELL=${CONFIG_SHELL-/bin/bash}
  24
  25  lt_dlopen_dir="$lt_ltdl_dir"
  26
  27 @@ -874,7 +874,7 @@
  28  datadir='${datarootdir}'
  29  sysconfdir='${prefix}/etc'
  30  sharedstatedir='${prefix}/com'
  31 -localstatedir='${prefix}/var'
  32 +localstatedir='/var'
  33  includedir='${prefix}/include'
  34  oldincludedir='/usr/include'
  35  docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
  36 @@ -2571,7 +2571,7 @@
  37  ac_cpp='$CPP $CPPFLAGS'
  38  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  39  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  40 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  41 +ac_compiler_gnu="no"
  42
  43
  44  am__api_version='1.11'
  45 @@ -2987,7 +2987,7 @@
  46    $as_echo_n "(cached) " >&6
  47  else
  48    cat >conftest.make <<\_ACEOF
  49 -SHELL = /bin/sh
  50 +SHELL = /bin/bash
  51  all:
  52         @echo '@@@%%%=$(MAKE)=@@@%%%'
  53  _ACEOF
  54 @@ -3234,7 +3234,7 @@
  55  ac_cpp='$CPP $CPPFLAGS'
  56  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  57  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  58 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  59 +ac_compiler_gnu="no"
  60  if test -n "$ac_tool_prefix"; then
  61    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  62  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  63 @@ -4068,7 +4068,7 @@
  64      for i in 1 2 3 4 5 6; do
  65        echo '#include "conftst'$i'.h"' >> sub/conftest.c
  66        # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
  67 -      # Solaris 8's {/usr,}/bin/sh.
  68 +      # Solaris 8's {/usr,}/bin/bash.
  69        touch sub/conftst$i.h
  70      done
  71      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  72 @@ -4873,7 +4873,7 @@
  73      for i in 1 2 3 4 5 6; do
  74        echo '#include "conftst'$i'.h"' >> sub/conftest.c
  75        # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
  76 -      # Solaris 8's {/usr,}/bin/sh.
  77 +      # Solaris 8's {/usr,}/bin/bash.
  78        touch sub/conftst$i.h
  79      done
  80      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  81 @@ -5135,7 +5135,7 @@
  82    $as_echo_n "(cached) " >&6
  83  else
  84    cat >conftest.make <<\_ACEOF
  85 -SHELL = /bin/sh
  86 +SHELL = /bin/bash
  87  all:
  88         @echo '@@@%%%=$(MAKE)=@@@%%%'
  89  _ACEOF
  90 @@ -6683,7 +6683,7 @@
  91        for i in 1 2 3 4 5 6 7 8 ; do
  92          teststring=$teststring$teststring
  93        done
  94 -      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
  95 +      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
  96        # If test is not a shell built-in, we'll probably end up computing a
  97        # maximum length that is only half of the actual maximum length, but
  98        # we can't tell.
  99 @@ -15598,6 +15598,7 @@
 100  int
 101  main ()
 102  {
 103 +#error "We want to use libpthread and not libthread."
 104  mutex_lock()
 105    ;
 106    return 0;
 107 @@ -15687,7 +15688,7 @@
 108  if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
 109    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 110  $as_echo "yes" >&6; }
 111 -  CFLAGS="$CFLAGS -pthread"
 112 +  CFLAGS="$CFLAGS"
 113  else
 114    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 115  $as_echo "no" >&6; }
 116 @@ -15760,7 +15761,7 @@
 117  if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
 118    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 119  $as_echo "yes" >&6; }
 120 -  CFLAGS="$CFLAGS -pthread"
 121 +  CFLAGS="$CFLAGS"
 122  else
 123    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 124  $as_echo "no" >&6; }
 125 @@ -15798,7 +15799,7 @@
 126  if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
 127    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 128  $as_echo "yes" >&6; }
 129 -  CFLAGS="$CFLAGS -pthread"
 130 +  CFLAGS="$CFLAGS"
 131  else
 132    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 133  $as_echo "no" >&6; }
 134 @@ -15838,7 +15839,7 @@
 135
 136            $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 137
 138 -          THREADLIB="-pthread -lc_r"
 139 +          THREADLIB="-lpthread -lposix4"
 140            gotthread="yes";
 141
 142  else
 143 @@ -15851,7 +15852,7 @@
 144
 145          if test "x$gotthread" = "xno"; then
 146        SAVECFLAGS="$CFLAGS"
 147 -      CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
 148 +      CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
 149        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
 150  $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
 151  ac_save_LIBS="$LIBS"
 152 @@ -15999,7 +16000,7 @@
 153  ac_cpp='$CPP $CPPFLAGS'
 154  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 155  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 156 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
 157 +ac_compiler_gnu="no"
 158
 159
 160  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5
 161 @@ -16048,6 +16049,8 @@
 162
 163  fi
 164
 165 +export drivers="true"
 166 +export driverc="true"
 167
 168  # Check whether --with-msql-lib was given.
 169  if test "${with_msql_lib+set}" = set; then :
 170 @@ -16265,6 +16268,8 @@
 171    QNX_FALSE=
 172  fi
 173
 174 +export use_builtin_libtool="no"
 175 +
 176   if test "x$use_builtin_libtool" = "xyes" ; then
 177    WITHLT_TRUE=
 178    WITHLT_FALSE='#'
 179 @@ -16815,6 +16820,8 @@
 180  fi
 181  done
 182
 183 +export LIBS="${LIBS} -lsocket -lnsl -lgen -z ignore"
 184 +export LD_OPTIONS="-lsocket -lnsl -lgen -z ignore"
 185
 186  for ac_func in putenv socket strdup strstr setenv setlocale strchr
 187  do :