components/unixodbc/patches/000-configure.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Tue, 06 Nov 2012 14:34:01 -0800
changeset 1042 31d26adcf615
parent 253 425c6a23679f
child 7671 a092c6b08fcc
permissions -rw-r--r--
15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1

--- configure	2011-11-25 08:14:47.000000000 -0800
+++ configure	2012-10-18 12:03:36.047791375 -0700
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for unixODBC 2.3.1.
 #
@@ -240,7 +240,7 @@
 fi
 fi
 fi
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=${CONFIG_SHELL-/bin/bash}
 export SHELL
 # Unset more variables known to interfere with behavior of common tools.
 CLICOLOR_FORCE= GREP_OPTIONS=
@@ -533,7 +533,7 @@
 
 
 # Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
+SHELL=${CONFIG_SHELL-/bin/bash}
 
 case X$lt_ECHO in
 X*--fallback-echo)
@@ -617,7 +617,7 @@
       elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
 	   test "X$CONFIG_SHELL" != X/bin/ksh; then
         # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
         export ORIGINAL_CONFIG_SHELL
         CONFIG_SHELL=/bin/ksh
         export CONFIG_SHELL
@@ -659,7 +659,7 @@
 	  if test "$prev" != 'sed 50q "$0"'; then
 	    echo_test_string=`eval $prev`
 	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
 	  else
 	    # Oops.  We lost completely, so just stick with echo.
 	    ECHO=echo
@@ -1002,7 +1002,7 @@
 datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
+localstatedir='/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -2689,7 +2689,7 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compiler_gnu="no"
 
 
 
@@ -3100,7 +3100,7 @@
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
+SHELL = /bin/bash
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
@@ -3346,7 +3346,7 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compiler_gnu="no"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -4180,7 +4180,7 @@
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
+      # Solaris 8's {/usr,}/bin/bash.
       touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -4984,7 +4984,7 @@
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
+      # Solaris 8's {/usr,}/bin/bash.
       touch sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -5245,7 +5245,7 @@
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
+SHELL = /bin/bash
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
@@ -6705,7 +6705,7 @@
       for i in 1 2 3 4 5 6 7 8 ; do
         teststring=$teststring$teststring
       done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
@@ -14678,6 +14678,7 @@
 int
 main ()
 {
+#error "We want to use libpthread and not libthread."
 mutex_lock()
   ;
   return 0;
@@ -14767,7 +14768,7 @@
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  CFLAGS="$CFLAGS -pthread"
+  CFLAGS="$CFLAGS"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -14840,7 +14841,7 @@
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  CFLAGS="$CFLAGS -pthread"
+  CFLAGS="$CFLAGS"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -14878,7 +14879,7 @@
 if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-  CFLAGS="$CFLAGS -pthread"
+  CFLAGS="$CFLAGS"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -14918,7 +14919,7 @@
 
           $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 
-          THREADLIB="-pthread -lc_r"
+          THREADLIB="-lpthread -lposix4"
           gotthread="yes";
 
 else
@@ -14931,7 +14932,7 @@
 
         if test "x$gotthread" = "xno"; then
       SAVECFLAGS="$CFLAGS"
-      CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
+      CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
 ac_save_LIBS="$LIBS"
@@ -15080,7 +15081,7 @@
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ac_compiler_gnu="no"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5
@@ -15129,6 +15130,8 @@
 
 fi
 
+export drivers="true"
+export driverc="true"
 
 # Check whether --with-msql-lib was given.
 if test "${with_msql_lib+set}" = set; then :
@@ -15348,6 +15351,8 @@
   QNX_FALSE=
 fi
 
+export use_builtin_libtool="no"
+
  if test "x$use_builtin_libtool" = "xyes" ; then
   WITHLT_TRUE=
   WITHLT_FALSE='#'
@@ -15900,6 +15905,8 @@
 fi
 done
 
+export LIBS="${LIBS} -lsocket -lnsl -lgen -z ignore"
+export LD_OPTIONS="-lsocket -lnsl -lgen -z ignore"
 
 for ac_func in putenv socket strdup strstr setenv setlocale strchr
 do :