500b81b3fc
The code was already using mysql_thread_init() at runtime with mysql>=4.0, this diff only removes references to an obsolete function. ok sthen@
42 lines
1.3 KiB
Plaintext
42 lines
1.3 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.2 2019/05/10 21:13:28 jca Exp $
|
|
Index: configure.in
|
|
--- configure.in.orig
|
|
+++ configure.in
|
|
@@ -14,9 +14,9 @@ AC_PREFIX_DEFAULT(/usr/local/rtg)
|
|
|
|
dnl Define auxiliary libraries
|
|
CGI_LIB_DIR=cgilib-0.4
|
|
-GD_LIB_DIR=gd-1.8.4
|
|
-PNG_LIB_DIR=libpng-1.2.1
|
|
-ZLIB_LIB_DIR=zlib-1.1.4
|
|
+GD_LIB_DIR=$LOCALBASE
|
|
+PNG_LIB_DIR=$LOCALBASE
|
|
+ZLIB_LIB_DIR=/usr
|
|
|
|
dnl Compilation Setup
|
|
AC_ARG_WITH(mysql,
|
|
@@ -143,7 +143,7 @@ fi
|
|
LDFLAGS="-L$MYSQL_LIB_DIR $LDFLAGS"
|
|
CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
|
|
|
|
-AC_CHECK_LIB(mysqlclient_r, my_thread_init,
|
|
+AC_CHECK_LIB(mysqlclient_r, mysql_thread_init,
|
|
LIBS="-lmysqlclient_r $LIBS",
|
|
AC_MSG_ERROR(Cannot link with thread-safe MySQL lib (libmysqlclient_r)))
|
|
|
|
@@ -221,6 +221,14 @@ if test "$OLD_UCD_SNMP" = "yes"; then
|
|
AC_MSG_ERROR(Cannot find UCD-SNMP libraries(snmp)))
|
|
fi
|
|
dnl ****************** End SNMP checking ***********************
|
|
+
|
|
+AC_CHECK_LIB(gd, gdImageDestroy,
|
|
+ [ LIBS="`$LOCALBASE/bin/gdlib-config --ldflags` `$LOCALBASE/bin/gdlib-config --libs` -lgd $LIBS" ],
|
|
+ AC_MSG_ERROR(Cannot find GD))
|
|
+
|
|
+AC_CHECK_LIB(png, png_free,
|
|
+ [ LIBS="`$LOCALBASE/bin/libpng-config --ldflags` $LIBS"],
|
|
+ AC_MSG_ERROR(Cannot find libpng))
|
|
|
|
|
|
AC_OUTPUT(Makefile \
|