diff -rNu zabbix34-server.orig/files/patch-m4_ax__lib__mysql.m4 zabbix34-server/files/patch-m4_ax__lib__mysql.m4 --- zabbix34-server.orig/files/patch-m4_ax__lib__mysql.m4 1970-01-01 10:00:00.000000000 +1000 +++ zabbix34-server/files/patch-m4_ax__lib__mysql.m4 2018-02-27 13:24:03.451371000 +1100 @@ -0,0 +1,77 @@ +--- m4/ax_lib_mysql.m4.orig ++++ m4/ax_lib_mysql.m4 +@@ -78,48 +78,54 @@ + + if test "$want_mysql" = "yes"; then + +- AC_PATH_PROGS(MYSQL_CONFIG, mysql_config mariadb_config) ++ AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mariadb_config], [Could not find mysql_config]) + + if test -x "$MYSQL_CONFIG"; then + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" + _full_libmysql_libs="`$MYSQL_CONFIG --libs`" ++ _all_libmysql_libs="" + +- _save_mysql_ldflags="${LDFLAGS}" +- _save_mysql_cflags="${CFLAGS}" +- LDFLAGS="${LDFLAGS} ${_full_libmysql_libs}" +- CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}" + + for i in $_full_libmysql_libs; do + case $i in +- -lmysqlclient|-lperconaserverclient|-lmariadbclient|-lmariadb) +- +- _lib_name="`echo "$i" | cut -b3-`" +- AC_CHECK_LIB($_lib_name, main, [ +- MYSQL_LIBS="-l${_lib_name} ${MYSQL_LIBS}" +- ],[ +- AC_MSG_ERROR([Not found $_lib_name library]) +- ]) +- ;; + -L*) + + MYSQL_LDFLAGS="${MYSQL_LDFLAGS} $i" + ;; + -l*) ++ _all_libmysql_libs="${_all_libmysql_libs} $i" + +- _lib_name="`echo "$i" | cut -b3-`" +- AC_CHECK_LIB($_lib_name, main, [ +- MYSQL_LIBS="${MYSQL_LIBS} ${i}" +- ],[ +- AC_MSG_ERROR([Not found $i library]) +- ]) + ;; + esac + done + ++ _save_mysql_ldflags="${LDFLAGS}" ++ _save_mysql_cflags="${CFLAGS}" ++ LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}" ++ CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}" ++ for i in $_all_libmysql_libs; do ++ _client_lib_name="`echo "$i" | cut -b3-`" ++ if test "x$enable_static" != "xyes"; then ++ AC_CHECK_LIB([$_client_lib_name], [mysql_error], [ ++ MYSQL_LIBS="${i} ${MYSQL_LIBS}" ++ ]) ++ else ++ AC_CHECK_LIB([$_client_lib_name], [mysql_error], [ ++ MYSQL_LIBS="${_all_libmysql_libs} ${MYSQL_LIBS}" ++ ]) ++ fi ++ done ++ ++ if test -z "$MYSQL_LIBS"; then ++ AC_MSG_ERROR([Could not find MySQL client library]) ++ fi + LDFLAGS="${_save_mysql_ldflags}" + CFLAGS="${_save_mysql_cflags}" + unset _save_mysql_ldflags + unset _save_mysql_cflags ++ unset _full_libmysql_libs ++ unset _all_libmysql_libs ++ unset _client_lib_name + + MYSQL_VERSION=`$MYSQL_CONFIG --version` + diff -rNu zabbix34-server.orig/Makefile zabbix34-server/Makefile --- zabbix34-server.orig/Makefile 2018-02-27 13:42:50.591423000 +1100 +++ zabbix34-server/Makefile 2018-02-27 12:31:41.944001000 +1100 @@ -33,7 +33,7 @@ USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif -USES= pkgconfig iconv +USES= autoreconf iconv pkgconfig USERS= zabbix GROUPS= zabbix @@ -191,9 +191,6 @@ ${WRKSRC}/database/${d}/data.sql . endfor .endif - @${REINPLACE_CMD} \ - -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ - ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) \ -exec ${RM} {} + @@ -211,6 +208,12 @@ (cd ${WRKSRC}/database/ && \ ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" \ ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database/) + ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf \ + ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}.conf.sample +.else + ${MV} ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf \ + ${STAGEDIR}${ETCDIR}/zabbix_${ZABBIX_BUILD}d.conf.sample + .endif .endif .else # frontend .include