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

version» Context lines:

pike.git/src/modules/Mysql/configure.in:97:    fi    done    # Blastwave adds an extra lib on top.    if test -d "$pike_cv_mysql_lib_dir/lib/."; then    pike_cv_mysql_lib_dir="$pike_cv_mysql_lib_dir/lib"    fi    ])    AC_MSG_RESULT($pike_cv_mysql_lib_dir)    if test "x$pike_cv_mysql_lib_dir" = "xno"; then :; else    echo Adding $pike_cv_mysql_lib_dir to the library search path. -  LDFLAGS="${LDFLAGS} -R$pike_cv_mysql_lib_dir -L$pike_cv_mysql_lib_dir" +  LDFLAGS="-R$pike_cv_mysql_lib_dir -L$pike_cv_mysql_lib_dir ${LDFLAGS}"    fi       AC_MSG_CHECKING(for Mysql include-directory)    AC_CACHE_VAL(pike_cv_mysql_include_dir, [    pike_cv_mysql_include_dir="no"    for incdir in include/mysql include; do    if test -d "$pike_cv_mysql_lib_dir_prefix/$incdir/."; then    pike_cv_mysql_include_dir="$pike_cv_mysql_lib_dir_prefix/$incdir"    break    fi
pike.git/src/modules/Mysql/configure.in:123:    echo Adding $pike_cv_mysql_include_dir to the include search path.    CPPFLAGS="-I$pike_cv_mysql_include_dir ${CPPFLAGS}"    fi    fi    else    echo "MariaDB found. Attempting to use."    # MariaDB    # NB: mariadb_config doens't distinguish between    # LDFLAGS and LIBS    MARIADB_LIBS="" +  MARIADB_LDFLAGS=""    set ignored `${MARIADB_CONFIG} --libs_r`    while test "$#" -gt 1; do    case "$2" in    -L*)    echo "Adding `echo $2 | sed -e 's/^-L//'` to the library search path." -  LDFLAGS="${LDFLAGS} $2 `echo $2 | sed -e 's/^-L/-R/'`" +  MARIADB_LDFLAGS="${MARIADB_LDFLAGS} $2 `echo $2 | sed -e 's/^-L/-R/'`"    ;;    -R*)    echo "Adding `echo $2 | sed -e 's/^-R//'` to the library runtime search path." -  LDFLAGS="${LDFLAGS} $2" +  MARIADB_LDFLAGS="${MARIADB_LDFLAGS} $2"    ;;    -lmaria*)    # We handle the client library itself later.    ;;    -lmysql*)    # We handle the client library itself later.    ;;    *)    # NB: We need to buffer libs to get them in the correct order.    echo "Adding $2 to LIBS."    MARIADB_LIBS="${MARIADB_LIBS} $2"    ;;    esac    shift    done    -  +  LDFLAGS="${MARIADB_LDFLAGS} ${LDFLAGS}" +     if echo " $MARIADB_LIBS" | grep -i iconv >/dev/null; then :; else    # NB: Sometimes iconv doesn't get listed by mariadb_config.    AC_CHECK_LIB(iconv, iconv_open, [    MARIADB_LIBS="${MARIADB_LIBS} -liconv"    ], [    AC_CHECK_LIB(iconv, libiconv_open, [    MARIADB_LIBS="${MARIADB_LIBS} -liconv"    ])    ])    fi