Attachment #31626 for bug #52615

View | Details | Raw Unified | Return to bug 52615 | Differences between
Collapse All | Expand All




  
  echo $ac_n "checking Oracle version""... $ac_c" 1>&6
echo "configure:54109: checking Oracle version" >&5
  ORACLE_VERSION=7.3
  	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
    ORACLE_VERSION=9.0
  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
    ORACLE_VERSION=8.1
  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
    ORACLE_VERSION=8.0
  elif test -f $ORACLE_DIR/lib/libclntsh.a; then
    if test -f $ORACLE_DIR/lib/libcore4.a; then
      ORACLE_VERSION=8.0
    else
      ORACLE_VERSION=8.1
    fi
  else
  	{ echo "configure: error: Oracle needed libraries not found" 1>&2; exit 1; }
  fi
  echo "$ac_t""$ORACLE_VERSION" 1>&6

  case $ORACLE_VERSION in

	    

  if test "$ext_shared" = "yes"; then
    ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD"
    if test -n "$ORACLE_DIR/lib"; then
      
  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
    
  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
    ai_p=$ORACLE_DIR/lib
  else
    
    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
    
    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
  fi

    
      if test "$ext_shared" = "yes"; then
        ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD"
      else
        
  
  
  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
  
  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
  if test -n "$unique" && test "`eval $cmd`" = "" ; then
    eval "LIBPATH$unique=set"
    
    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
    LDFLAGS="$LDFLAGS -L$ai_p"
    PHP_RPATHS="$PHP_RPATHS $ai_p"
  
  fi


      fi
    
  fi

    fi
  else
    

  if test -n "$ORACLE_DIR/lib"; then
    
  if test "$ORACLE_DIR/lib" != "/usr/lib"; then
    
  if test -z "$ORACLE_DIR/lib" || echo "$ORACLE_DIR/lib" | grep '^/' >/dev/null ; then
    ai_p=$ORACLE_DIR/lib
  else
    
    ep_dir="`echo $ORACLE_DIR/lib|sed 's%/*[^/][^/]*/*$%%'`"
    
    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
    ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
  fi

    
      
  
  
  unique=`echo $ai_p|sed 's/[^a-zA-Z0-9]/_/g'`
  
  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
  if test -n "$unique" && test "`eval $cmd`" = "" ; then
    eval "LIBPATH$unique=set"
    
    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
    LDFLAGS="$LDFLAGS -L$ai_p"
    PHP_RPATHS="$PHP_RPATHS $ai_p"
  
  fi


    
  fi

  fi
  
  
  case wrap in
  c|c_r|pthread*) ;;
  *) 
      LIBS="-lwrap $LIBS" 
   ;;
  esac




  fi


	    

  if test "$ext_shared" = "yes"; then
    ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
    if test -n "$ORACLE_DIR/lib"; then
      

  else
    
  
  case cs in
  c|c_r|pthread*) ;;
  *) 
    if test "$ext_shared" = "yes"; then
        SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" 
    else
      
  
  case cs in
  c|c_r|pthread*) ;;
  *) 
      LIBS="-lcs $LIBS" 
   ;;
  esac


    fi
   ;;
  esac


    
  
  case ct in
  c|c_r|pthread*) ;;
  *) 


    
  
    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
  c|c_r|pthread*) ;;
  *) 
    if test "$ext_shared" = "yes"; then
        SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" 
    else
      
  
  case comn in
  c|c_r|pthread*) ;;
  *) 
      LIBS="-lcomn $LIBS" 
   ;;
  esac


    fi
   ;;
  esac


    
  
  case intl in
  c|c_r|pthread*) ;;
  *) 
    if test "$ext_shared" = "yes"; then
        SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" 
    else
      
  
  case intl in
  c|c_r|pthread*) ;;
  *) 
      LIBS="-lintl $LIBS" 
   ;;
  esac


    fi
   ;;
  esac


  
    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
  
    
  save_old_LDFLAGS=$LDFLAGS


    
  
else
  echo "$ac_t""no" 1>&6

    LDFLAGS=$save_old_LDFLAGS
    unset ac_cv_func_tcl
     
      
  
  case sybtcl in
  c|c_r|pthread*) ;;
  *) 
    if test "$ext_shared" = "yes"; then
        SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" 
    else
      
  
  case sybtcl in
  c|c_r|pthread*) ;;
  *) 
      LIBS="-lsybtcl $LIBS" 
   ;;
  esac


    fi
   ;;
  esac


    
  
fi

  



# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"

# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'

CXXFLAGS="$CXXFLAGS $standard_libtool_flag"

all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
install_targets="install-sapi $PHP_INSTALL_CLI_TARGET install-modules $install_pear install-build install-headers install-programs"
if test "$PHP_SAPI" != "cgi"; then
  install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
fi


  PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"

Return to bug 52615

Lines 54106-54129 Link Here

(-)configure (-123 / +100 lines)
54106		54106
54107	echo $ac_n "checking Oracle version""... $ac_c" 1>&6	54107	echo $ac_n "checking Oracle version""... $ac_c" 1>&6
54108	echo "configure:54109: checking Oracle version" >&5	54108	echo "configure:54109: checking Oracle version" >&5
54109	if test -s "$ORACLE_DIR/orainst/unix.rgs"; then	54109	ORACLE_VERSION=7.3
54110	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs \| sed 's/ */:/g' \| cut -d: -f 6 \| cut -c 2-4`
54111	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
54112	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
54113	ORACLE_VERSION=9.0
54114	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
54115	ORACLE_VERSION=8.1
54116	elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
54117	ORACLE_VERSION=8.0
54118	elif test -f $ORACLE_DIR/lib/libclntsh.a; then
54119	if test -f $ORACLE_DIR/lib/libcore4.a; then
54120	ORACLE_VERSION=8.0
54121	else
54122	ORACLE_VERSION=8.1
54123	fi
54124	else
54125	{ echo "configure: error: Oracle needed libraries not found" 1>&2; exit 1; }
54126	fi
54127	echo "$ac_t""$ORACLE_VERSION" 1>&6	54110	echo "$ac_t""$ORACLE_VERSION" 1>&6
54128		54111
54129	case $ORACLE_VERSION in	54112	case $ORACLE_VERSION in
Lines 55303-55308 Link Here
55303		55286
55304		55287
55305	if test "$ext_shared" = "yes"; then	55288	if test "$ext_shared" = "yes"; then
		55289	ORACLE_SHARED_LIBADD="-lwrap $ORACLE_SHARED_LIBADD"
		55290	if test -n "$ORACLE_DIR/lib"; then
		55291
		55292	if test "$ORACLE_DIR/lib" != "/usr/lib"; then
		55293
		55294	if test -z "$ORACLE_DIR/lib" \|\| echo "$ORACLE_DIR/lib" \| grep '^/' >/dev/null ; then
		55295	ai_p=$ORACLE_DIR/lib
		55296	else
		55297
		55298	ep_dir="`echo $ORACLE_DIR/lib\|sed 's%/[^/][^/]/*$%%'`"
		55299
		55300	ep_realdir="`(cd \"$ep_dir\" && pwd)`"
		55301	ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
		55302	fi
		55303
		55304
		55305	if test "$ext_shared" = "yes"; then
		55306	ORACLE_SHARED_LIBADD="$ld_runpath_switch$ai_p -L$ai_p $ORACLE_SHARED_LIBADD"
		55307	else
		55308
		55309
		55310
		55311	unique=`echo $ai_p\|sed 's/[^a-zA-Z0-9]/_/g'`
		55312
		55313	cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
		55314	if test -n "$unique" && test "`eval $cmd`" = "" ; then
		55315	eval "LIBPATH$unique=set"
		55316
		55317	test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
		55318	LDFLAGS="$LDFLAGS -L$ai_p"
		55319	PHP_RPATHS="$PHP_RPATHS $ai_p"
		55320
		55321	fi
		55322
		55323
		55324	fi
		55325
		55326	fi
		55327
		55328	fi
		55329	else
		55330
		55331
		55332	if test -n "$ORACLE_DIR/lib"; then
		55333
		55334	if test "$ORACLE_DIR/lib" != "/usr/lib"; then
		55335
		55336	if test -z "$ORACLE_DIR/lib" \|\| echo "$ORACLE_DIR/lib" \| grep '^/' >/dev/null ; then
		55337	ai_p=$ORACLE_DIR/lib
		55338	else
		55339
		55340	ep_dir="`echo $ORACLE_DIR/lib\|sed 's%/[^/][^/]/*$%%'`"
		55341
		55342	ep_realdir="`(cd \"$ep_dir\" && pwd)`"
		55343	ai_p="$ep_realdir/`basename \"$ORACLE_DIR/lib\"`"
		55344	fi
		55345
		55346
		55347
		55348
		55349
		55350	unique=`echo $ai_p\|sed 's/[^a-zA-Z0-9]/_/g'`
		55351
		55352	cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
55353	if test -n "$unique" && test "`eval $cmd`" = "" ; then
55354	eval "LIBPATH$unique=set"
55355
55356	test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
55357	LDFLAGS="$LDFLAGS -L$ai_p"
55358	PHP_RPATHS="$PHP_RPATHS $ai_p"
55359
55360	fi
55361
55362
55363
55364	fi
55365
55366	fi
55367
55368
55369	case wrap in
55370	c\|c_r\|pthread*) ;;
55371	*)
55372	LIBS="-lwrap $LIBS"
55373	;;
55374	esac
55375
55376
55377
55378
55379	fi
55380
55381
55382
55383
55384	if test "$ext_shared" = "yes"; then
55306	ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"	55385	ORACLE_SHARED_LIBADD="-lcore3 $ORACLE_SHARED_LIBADD"
55307	if test -n "$ORACLE_DIR/lib"; then	55386	if test -n "$ORACLE_DIR/lib"; then
55308		55387
Lines 70911-70939 Link Here
70911	else	70990	else
70912		70991
70913		70992
70914	case cs in
70915	c\|c_r\|pthread*) ;;
70916	*)
70917	if test "$ext_shared" = "yes"; then
70918	SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD"
70919	else
70920
70921
70922	case cs in
70923	c\|c_r\|pthread*) ;;
70924	*)
70925	LIBS="-lcs $LIBS"
70926	;;
70927	esac
70928
70929
70930	fi
70931	;;
70932	esac
70933
70934
70935
70936
70937	case ct in	70993	case ct in
70938	c\|c_r\|pthread*) ;;	70994	c\|c_r\|pthread*) ;;
70939	*)	70995	*)
Lines 70957-71008 Link Here
70957		71013
70958		71014
70959		71015
70960	case comn in	71016	SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
70961	c\|c_r\|pthread*) ;;
70962	*)
70963	if test "$ext_shared" = "yes"; then
70964	SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD"
70965	else
70966
70967
70968	case comn in
70969	c\|c_r\|pthread*) ;;
70970	*)
70971	LIBS="-lcomn $LIBS"
70972	;;
70973	esac
70974
70975
70976	fi
70977	;;
70978	esac
70979
70980
70981
70982
70983	case intl in
70984	c\|c_r\|pthread*) ;;
70985	*)
70986	if test "$ext_shared" = "yes"; then
70987	SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD"
70988	else
70989
70990
70991	case intl in
70992	c\|c_r\|pthread*) ;;
70993	*)
70994	LIBS="-lintl $LIBS"
70995	;;
70996	esac
70997
70998
70999	fi
71000	;;
71001	esac
71002
71003
71004
71005	SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
71006		71017
71007		71018
71008	save_old_LDFLAGS=$LDFLAGS	71019	save_old_LDFLAGS=$LDFLAGS
Lines 71072-71108 Link Here
71072		71083
71073		71084
71074		71085
71075	else
71076	echo "$ac_t""no" 1>&6
71077
71078	LDFLAGS=$save_old_LDFLAGS
71079	unset ac_cv_func_tcl
71080
71081
71082
71083	case sybtcl in
71084	c\|c_r\|pthread*) ;;
71085	*)
71086	if test "$ext_shared" = "yes"; then
71087	SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD"
71088	else
71089
71090
71091	case sybtcl in
71092	c\|c_r\|pthread*) ;;
71093	*)
71094	LIBS="-lsybtcl $LIBS"
71095	;;
71096	esac
71097
71098
71099	fi
71100	;;
71101	esac
71102
71103
71104
71105
71106	fi	71086	fi
71107		71087
71108		71088
Lines 83989-83995 Link Here
83989		83969
83990		83970
83991	# This can be used to rebuild libtool when needed	83971	# This can be used to rebuild libtool when needed
83992	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	83972	LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool/ltmain.sh"
83993		83973
83994	# Always use our own libtool.	83974	# Always use our own libtool.
83995	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	83975	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
Lines 84033-84042 Link Here
84033	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"	84013	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
84034		84014
84035	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'	84015	all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
84036	install_targets="install-sapi install-modules $install_pear install-build install-headers install-programs"	84016	install_targets="install-sapi $PHP_INSTALL_CLI_TARGET install-modules $install_pear install-build install-headers install-programs"
84037	if test "$PHP_SAPI" != "cgi"; then
84038	install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
84039	fi
84040		84017
84041		84018
84042	PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"	84019	PHP_VAR_SUBST="$PHP_VAR_SUBST all_targets"