Bug #2925 ยป cross.patch
| lighttpd-1.4.52/configure.ac | ||
|---|---|---|
|
)
|
||
|
AC_MSG_RESULT([$WITH_MYSQL])
|
||
|
MYSQL_INCLUDE=
|
||
|
MYSQL_CFLAGS=
|
||
|
MYSQL_LIBS=
|
||
|
if test "$WITH_MYSQL" != no; then
|
||
|
if test "$WITH_MYSQL" = yes; then
|
||
|
AC_PATH_PROG([MYSQL_CONFIG], [mysql_config])
|
||
|
else
|
||
|
AS_IF([test "$WITH_MYSQL" != no],[
|
||
|
AS_IF([test "$WITH_MYSQL" = yes],[
|
||
|
PKG_CHECK_MODULES([MYSQL],[mariadb],[
|
||
|
MYSQL_CONFIG=$PKG_CONFIG
|
||
|
],[
|
||
|
PKG_CHECK_MODULES([MYSQL],[mysqlclient],[
|
||
|
MYSQL_CONFIG=$PKG_CONFIG
|
||
|
],[
|
||
|
AC_PATH_PROG([MYSQL_CONFIG], [mysql_config])
|
||
|
])
|
||
|
])
|
||
|
],[
|
||
|
MYSQL_CONFIG=$WITH_MYSQL
|
||
|
fi
|
||
|
])
|
||
|
if test -z "$MYSQL_CONFIG"; then
|
||
|
AC_MSG_ERROR([mysql_config is not found])
|
||
|
fi
|
||
|
if test ! -x "$MYSQL_CONFIG"; then
|
||
|
AC_MSG_ERROR([mysql_config not exists or not executable, use --with-mysql=path-to-mysql_config])
|
||
|
fi
|
||
|
AS_IF([test "$MYSQL_CONFIG" != "$PKG_CONFIG"],[
|
||
|
if test -z "$MYSQL_CONFIG"; then
|
||
|
AC_MSG_ERROR([mysql_config is not found])
|
||
|
fi
|
||
|
if test ! -x "$MYSQL_CONFIG"; then
|
||
|
AC_MSG_ERROR([mysql_config not exists or not executable, use --with-mysql=path-to-mysql_config])
|
||
|
fi
|
||
|
if "$MYSQL_CONFIG" | grep -- '--include' > /dev/null ; then
|
||
|
MYSQL_INCLUDE=`"$MYSQL_CONFIG" --include | sed s/\'//g`
|
||
|
else
|
||
|
MYSQL_INCLUDE=`"$MYSQL_CONFIG" --cflags | sed s/\'//g`
|
||
|
fi
|
||
|
MYSQL_LIBS=`"$MYSQL_CONFIG" --libs | sed s/\'//g`
|
||
|
if "$MYSQL_CONFIG" | grep -- '--include' > /dev/null ; then
|
||
|
MYSQL_CFLAGS=`"$MYSQL_CONFIG" --include | sed s/\'//g`
|
||
|
else
|
||
|
MYSQL_CFLAGS=`"$MYSQL_CONFIG" --cflags | sed s/\'//g`
|
||
|
fi
|
||
|
MYSQL_LIBS=`"$MYSQL_CONFIG" --libs | sed s/\'//g`
|
||
|
])
|
||
|
AC_MSG_CHECKING([for MySQL includes at])
|
||
|
AC_MSG_RESULT([$MYSQL_INCLUDE])
|
||
|
AC_MSG_RESULT([$MYSQL_CFLAGS])
|
||
|
AC_MSG_CHECKING([for MySQL libraries at])
|
||
|
AC_MSG_RESULT([$MYSQL_LIBS])
|
||
|
AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
|
||
|
fi
|
||
|
])
|
||
|
AM_CONDITIONAL([BUILD_WITH_MYSQL], [test "$WITH_MYSQL" != no])
|
||
|
AC_SUBST([MYSQL_LIBS])
|
||
|
AC_SUBST([MYSQL_INCLUDE])
|
||
|
AC_SUBST([MYSQL_CFLAGS])
|
||
|
dnl Checks for pgsql
|
||
|
AC_MSG_NOTICE([----------------------------------------])
|
||
|
-- lighttpd-1.4.52.orig/src/Makefile.am
|
||
|
++ lighttpd-1.4.52/src/Makefile.am
|
||
| ... | ... | |
|
mod_mysql_vhost_la_SOURCES = mod_mysql_vhost.c
|
||
|
mod_mysql_vhost_la_LDFLAGS = $(common_module_ldflags)
|
||
|
mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
|
||
|
mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE)
|
||
|
mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_CFLAGS)
|
||
|
endif
|
||
|
if BUILD_WITH_MYSQL
|
||
| ... | ... | |
|
mod_vhostdb_mysql_la_SOURCES = mod_vhostdb_mysql.c
|
||
|
mod_vhostdb_mysql_la_LDFLAGS = $(common_module_ldflags)
|
||
|
mod_vhostdb_mysql_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
|
||
|
mod_vhostdb_mysql_la_CPPFLAGS = $(MYSQL_INCLUDE)
|
||
|
mod_vhostdb_mysql_la_CPPFLAGS = $(MYSQL_CFLAGS)
|
||
|
endif
|
||
|
if BUILD_WITH_PGSQL
|
||
| ... | ... | |
|
mod_authn_mysql_la_SOURCES = mod_authn_mysql.c
|
||
|
mod_authn_mysql_la_LDFLAGS = $(common_module_ldflags)
|
||
|
mod_authn_mysql_la_LIBADD = $(CRYPT_LIB) $(MYSQL_LIBS) $(common_libadd)
|
||
|
mod_authn_mysql_la_CPPFLAGS = $(MYSQL_INCLUDE)
|
||
|
mod_authn_mysql_la_CPPFLAGS = $(MYSQL_CFLAGS)
|
||
|
endif
|
||
|
if BUILD_WITH_SASL
|
||
| ... | ... | |
|
endif
|
||
|
if BUILD_WITH_MYSQL
|
||
|
lighttpd_SOURCES += mod_authn_mysql.c mod_mysql_vhost.c mod_vhostdb_mysql.c
|
||
|
lighttpd_CPPFLAGS += $(MYSQL_INCLUDE)
|
||
|
lighttpd_CPPFLAGS += $(MYSQL_CFLAGS)
|
||
|
lighttpd_LDADD += $(MYSQL_LIBS)
|
||
|
endif
|
||
|
if BUILD_WITH_PGSQL
|
||