components/unixodbc/patches/000-configure.patch
author Rich Burridge <rich.burridge@oracle.com>
Tue, 13 Oct 2015 18:21:51 -0700
changeset 4945 d9d54aa673b6
parent 1042 31d26adcf615
child 7671 a092c6b08fcc
permissions -rw-r--r--
21292090 "gmake test" failures for re2c plus hookup system tests
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
     1
--- configure	2011-11-25 08:14:47.000000000 -0800
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
     2
+++ configure	2012-10-18 12:03:36.047791375 -0700
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     3
@@ -1,4 +1,4 @@
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     4
-#! /bin/sh
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     5
+#! /bin/bash
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     6
 # Guess values for system-dependent variables and create Makefiles.
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
     7
 # Generated by GNU Autoconf 2.65 for unixODBC 2.3.1.
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
     8
 #
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
     9
@@ -240,7 +240,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    10
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    11
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    13
-SHELL=${CONFIG_SHELL-/bin/sh}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    14
+SHELL=${CONFIG_SHELL-/bin/bash}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    15
 export SHELL
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
 # Unset more variables known to interfere with behavior of common tools.
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    17
 CLICOLOR_FORCE= GREP_OPTIONS=
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    18
@@ -533,7 +533,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    20
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    21
 # Check that we are running under the correct shell.
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    22
-SHELL=${CONFIG_SHELL-/bin/sh}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    23
+SHELL=${CONFIG_SHELL-/bin/bash}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    24
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    25
 case X$lt_ECHO in
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    26
 X*--fallback-echo)
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    27
@@ -617,7 +617,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    28
       elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    29
 	   test "X$CONFIG_SHELL" != X/bin/ksh; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    30
         # If we have ksh, try running configure again with it.
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    31
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    32
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    33
         export ORIGINAL_CONFIG_SHELL
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    34
         CONFIG_SHELL=/bin/ksh
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    35
         export CONFIG_SHELL
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    36
@@ -659,7 +659,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    37
 	  if test "$prev" != 'sed 50q "$0"'; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    38
 	    echo_test_string=`eval $prev`
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    39
 	    export echo_test_string
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    40
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    41
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    42
 	  else
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    43
 	    # Oops.  We lost completely, so just stick with echo.
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    44
 	    ECHO=echo
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    45
@@ -1002,7 +1002,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    46
 datadir='${datarootdir}'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    47
 sysconfdir='${prefix}/etc'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    48
 sharedstatedir='${prefix}/com'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    49
-localstatedir='${prefix}/var'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    50
+localstatedir='/var'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    51
 includedir='${prefix}/include'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    52
 oldincludedir='/usr/include'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    53
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    54
@@ -2689,7 +2689,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    55
 ac_cpp='$CPP $CPPFLAGS'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    56
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    57
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    58
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    59
+ac_compiler_gnu="no"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    60
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    61
 
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    62
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    63
@@ -3100,7 +3100,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    64
   $as_echo_n "(cached) " >&6
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    65
 else
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    66
   cat >conftest.make <<\_ACEOF
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    67
-SHELL = /bin/sh
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    68
+SHELL = /bin/bash
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    69
 all:
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    70
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    71
 _ACEOF
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    72
@@ -3346,7 +3346,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    73
 ac_cpp='$CPP $CPPFLAGS'
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    74
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    75
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    76
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    77
+ac_compiler_gnu="no"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    78
 if test -n "$ac_tool_prefix"; then
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    79
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    80
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    81
@@ -4180,7 +4180,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    82
     for i in 1 2 3 4 5 6; do
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    83
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    84
       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    85
-      # Solaris 8's {/usr,}/bin/sh.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    86
+      # Solaris 8's {/usr,}/bin/bash.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    87
       touch sub/conftst$i.h
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    88
     done
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    89
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    90
@@ -4984,7 +4984,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    91
     for i in 1 2 3 4 5 6; do
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    92
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    93
       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    94
-      # Solaris 8's {/usr,}/bin/sh.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    95
+      # Solaris 8's {/usr,}/bin/bash.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    96
       touch sub/conftst$i.h
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    97
     done
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    98
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
    99
@@ -5245,7 +5245,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   100
   $as_echo_n "(cached) " >&6
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   101
 else
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   102
   cat >conftest.make <<\_ACEOF
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   103
-SHELL = /bin/sh
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   104
+SHELL = /bin/bash
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   105
 all:
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   106
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   107
 _ACEOF
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   108
@@ -6705,7 +6705,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   109
       for i in 1 2 3 4 5 6 7 8 ; do
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   110
         teststring=$teststring$teststring
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   111
       done
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   112
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   113
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   114
       # If test is not a shell built-in, we'll probably end up computing a
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   115
       # maximum length that is only half of the actual maximum length, but
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   116
       # we can't tell.
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   117
@@ -14678,6 +14678,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   118
 int
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   119
 main ()
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   120
 {
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   121
+#error "We want to use libpthread and not libthread."
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   122
 mutex_lock()
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   123
   ;
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   124
   return 0;
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   125
@@ -14767,7 +14768,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   126
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   127
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   128
 $as_echo "yes" >&6; }
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   129
-  CFLAGS="$CFLAGS -pthread"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   130
+  CFLAGS="$CFLAGS"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   131
 else
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   132
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   133
 $as_echo "no" >&6; }
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   134
@@ -14840,7 +14841,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   135
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   136
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   137
 $as_echo "yes" >&6; }
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   138
-  CFLAGS="$CFLAGS -pthread"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   139
+  CFLAGS="$CFLAGS"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   140
 else
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   141
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   142
 $as_echo "no" >&6; }
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   143
@@ -14878,7 +14879,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   144
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   145
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   146
 $as_echo "yes" >&6; }
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   147
-  CFLAGS="$CFLAGS -pthread"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   148
+  CFLAGS="$CFLAGS"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   149
 else
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   150
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   151
 $as_echo "no" >&6; }
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   152
@@ -14918,7 +14919,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   153
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   154
           $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   155
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   156
-          THREADLIB="-pthread -lc_r"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   157
+          THREADLIB="-lpthread -lposix4"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   158
           gotthread="yes";
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   159
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   160
 else
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   161
@@ -14931,7 +14932,7 @@
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   162
 
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   163
         if test "x$gotthread" = "xno"; then
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   164
       SAVECFLAGS="$CFLAGS"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   165
-      CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   166
+      CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   167
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   168
 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   169
 ac_save_LIBS="$LIBS"
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   170
@@ -15080,7 +15081,7 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   171
 ac_cpp='$CPP $CPPFLAGS'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   172
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   173
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   174
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   175
+ac_compiler_gnu="no"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   176
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   177
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   178
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   179
@@ -15129,6 +15130,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   180
 
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   181
 fi
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   182
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   183
+export drivers="true"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   184
+export driverc="true"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   185
 
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   186
 # Check whether --with-msql-lib was given.
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   187
 if test "${with_msql_lib+set}" = set; then :
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   188
@@ -15348,6 +15351,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   189
   QNX_FALSE=
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   190
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   191
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   192
+export use_builtin_libtool="no"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   193
+
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   194
  if test "x$use_builtin_libtool" = "xyes" ; then
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   195
   WITHLT_TRUE=
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   196
   WITHLT_FALSE='#'
1042
31d26adcf615 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1
Stefan Teleman <stefan.teleman@oracle.com>
parents: 253
diff changeset
   197
@@ -15900,6 +15905,8 @@
253
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   198
 fi
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   199
 done
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   200
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   201
+export LIBS="${LIBS} -lsocket -lnsl -lgen -z ignore"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   202
+export LD_OPTIONS="-lsocket -lnsl -lgen -z ignore"
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   203
 
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   204
 for ac_func in putenv socket strdup strstr setenv setlocale strchr
425c6a23679f 7031762 libidn to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
   205
 do :