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

version» Context lines:

pike.git/src/modules/Mysql/configure.in:134:    echo "Adding `echo $2 | sed -e 's/^-L//'` to the library search path."    LDFLAGS="${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"    ;;    -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    echo "Adding `${MARIADB_CONFIG} --include` to CPPFLAGS."    CPPFLAGS="`${MARIADB_CONFIG} --include` ${CPPFLAGS}"
pike.git/src/modules/Mysql/configure.in:331:    PIKE_FEATURE(Mysql,[yes (lib$1)])    AC_MSG_RESULT(yes)    $2    else    AC_MSG_RESULT(no)    $3    fi   fi   ])    -  if test "x${MARIADB_CONFIG}" = "xno"; then -  # libmysql.lib is the name for the libmysql.dll wrapper in the -  # windows releases. There's also a mysqlclient.lib which contain the +  TRY_MYSQLCLIENT="yes" +  if test "x${MARIADB_CONFIG}" = "xno"; then :; else +  # Try the MariaDB client libraries. +  # NB: These are distributed separately from the MariaDB server. +  TRY_MYSQLCLIENT="no" +  AC_CHECK_SQLLIB(mariadbclient_r, [ +  LIBS="-lmariadbclient_r $LIBS" +  ], [ +  AC_CHECK_SQLLIB(mariadbclient, [ +  LIBS="-lmariadbclient $LIBS" +  ], [ +  AC_CHECK_SQLLIB(mariadb_r, [ +  LIBS="-lmariadb_r $LIBS" +  ], [ +  AC_CHECK_SQLLIB(mariadb, [ +  LIBS="-lmariadb $LIBS" +  ], [ +  # Fallback to using the MySQL client libraries. +  # NB: These are distributed together with the MariaDB server. +  TRY_MYSQLCLIENT="yes" +  ]) +  ]) +  ]) +  ]) +  fi +  +  if test "x${TRY_MYSQLCLIENT}" = "xyes"; then +  # libmysql.lib is the name of the libmysql.dll wrapper in the +  # windows releases. There's also a mysqlclient.lib which contains the    # static version. We prefer the dynamic one so check libmysql first.    AC_CHECK_SQLLIB(libmysql, [    LIBS="-llibmysql $LIBS"    ], [ -  +  AC_CHECK_SQLLIB(mysqlclient_r, [ +  LIBS="-lmysqlclient_r $LIBS" +  ], [    AC_CHECK_SQLLIB(mysqlclient, [    LIBS="-lmysqlclient $LIBS"    ], [    AC_CHECK_SQLLIB(mysqllib, [    LIBS="-lmysqllib $LIBS"    ], [    AC_CHECK_SQLLIB(mysql, [    LIBS="-lmysql $LIBS"    ], [    PIKE_FEATURE_NODEP(Mysql)    pike_cv_mysql="no"    ])    ])    ])    ]) -  else -  AC_CHECK_SQLLIB(mariadbclient, [ -  LIBS="-lmariadbclient $LIBS" -  ], [ -  AC_CHECK_SQLLIB(mariadb, [ -  LIBS="-lmariadb $LIBS" -  ], [ -  PIKE_FEATURE_NODEP(Mysql) -  pike_cv_mysql="no" +     ]) -  ]) +     fi       if test x$pike_cv_mysql = xno; then :; else    # Check version match    AC_CHECK_FUNC(mysql_get_client_version,[    AC_TRY_RUN([#ifdef HAVE_WINSOCK2_H   #include <winsock2.h>   #else   #ifdef HAVE_WINSOCK_H   #include <winsock.h>