pike.git/ src/ modules/ Mysql/ configure.in

2008-05-14

2008-05-14 15:03:23 by Marcus Comstedt <marcus@mc.pp.se>

• 6727fb7e6a2da9acb184977e202ca9f51ed13806 (20 lines) (+13/-7) ^{[ Show | Annotate ]}
  Branch: 7.9

* Now uses $pike_cv_abi_suffixes instead of $with_abi to find libdir
* Check /opt/csw before /usr/sfw, and added some missing $with_root:s

Rev: src/modules/Mysql/configure.in:1.59

1:   # - # $Id: configure.in,v 1.58 2008/05/14 14:34:09 marcus Exp $ + # $Id: configure.in,v 1.59 2008/05/14 15:03:23 marcus Exp $   #   # Configure script for the mysql-module   #
45:    $with_root/usr/local $with_root/sw/local $with_root/sw \    $with_root/usr/gnu $with_root/opt/gnu $with_root/sw/gnu \    $with_root/usr/freeware $with_root/usr/pkg \ +  $with_root/opt/csw $with_root/opt/csw/mysql5 $with_root/opt/csw/mysql4 \    $with_root/usr/sfw $with_root/opt/sfw \ -  $with_root/opt/csw /opt/csw/mysql5 /opt/csw/mysql4 \ +     $with_root/usr $with_root    do    if test -d "$dir_prefix/."; then :; else continue; fi       for subdir in mysql .; do    if test -d "$dir_prefix/$subdir/."; then :; else continue; fi -  for libdir in "lib$with_abi" "lib/$with_abi" "lib"; do -  if test -d "$dir_prefix/$subdir/$libdir/mysql/."; then +  for libdir in $pike_cv_abi_suffixes; do +  if test -d "$dir_prefix/$subdir/lib$libdir/mysql/." || test -d "$dir_prefix/$subdir/lib/mysql$libdir/."; then    pike_cv_mysql_lib_dir_prefix="$dir_prefix/$subdir"    break 3    fi
69:    AC_MSG_CHECKING(for Mysql lib directory)    AC_CACHE_VAL(pike_cv_mysql_lib_dir, [    pike_cv_mysql_lib_dir="no" -  for libdir in "lib$with_abi" "lib/$with_abi" "lib"; do -  if test -d "$pike_cv_mysql_lib_dir_prefix/$libdir/mysql/."; then -  pike_cv_mysql_lib_dir="$pike_cv_mysql_lib_dir_prefix/$libdir/mysql" +  for libdir in $pike_cv_abi_suffixes; do +  if test -d "$pike_cv_mysql_lib_dir_prefix/lib$libdir/mysql/."; then +  pike_cv_mysql_lib_dir="$pike_cv_mysql_lib_dir_prefix/lib$libdir/mysql"    break -  +  else +  if test -d "$pike_cv_mysql_lib_dir_prefix/lib/mysql$libdir/."; then +  pike_cv_mysql_lib_dir="$pike_cv_mysql_lib_dir_prefix/lib/mysql$libdir" +  break    fi -  +  fi    done    ])    AC_MSG_RESULT($pike_cv_mysql_lib_dir)