Репозитории ALT
S: | 5.33.0-alt1 |
5.1: | 5.2.5-alt0.M51.1 |
4.1: | 5.0-alt0.1 |
4.0: | 5.2.5-alt0.M40.1 |
3.0: | 4.1.1-alt1.1 |
Группа :: Мониторинг
Пакет: monit
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: monit-5.2-pkgconfig-configure.patch
Скачать
Скачать
diff -Naur monit-5.2.orig/configure.ac monit-5.2/configure.ac
--- monit-5.2.orig/configure.ac 2010-09-18 19:33:10.000000000 +0000
+++ monit-5.2/configure.ac 2010-09-24 06:26:08.897637088 +0000
@@ -559,7 +559,7 @@
# Check for ssl includes (taken from the stunnel project)
checksslincldir() { :
if test -f "$1/openssl/ssl.h"; then
- sslincldir="$1"
+ libssl_CFLAGS="-I$1"
return 0
fi
return 1
@@ -569,7 +569,7 @@
checkssllibdirdynamic() { :
if test "(" -f "$1/libcrypto.so" -o -f "$1/libcrypto.dylib" ")" -a \
"(" -f "$1/libssl.so" -o -f "$1/libssl.dylib" ")" ; then
- ssllibdir="$1"
+ libssl_LIBS="-L$1 -lssl -lcrypto"
return 0
fi
return 1
@@ -604,8 +604,8 @@
AC_DEFINE([HAVE_OPENSSL], 1, [Define to 1 if you have openssl.])
AC_SUBST(sslincldir)
AC_SUBST(ssllibdir)
- CFLAGS="$CFLAGS -I$sslincldir"
- LIBS="$LIBS $ssllibdir/libssl.a $ssllibdir/libcrypto.a"
+ CFLAGS="$CFLAGS $libssl_CFLAGS"
+ LIBS="$LIBS $libssl_LIBS"
],
[
use_sslstatic=0
@@ -661,7 +661,7 @@
checksslincldir "$withval"
],
[
- if test -z "$sslincldir"; then
+ if test -z "$libssl_CFLAGS"; then
dnl Search default locations of SSL includes
for maindir in /usr /usr/local /usr/lib /usr/pkg /var /opt /usr/sfw; do
for dir in "$maindir/include"\
@@ -674,7 +674,7 @@
fi
]
)
- if test -z "$sslincldir"; then
+ if test -z "$libssl_CFLAGS"; then
AC_MSG_RESULT([Not found])
echo
echo "Couldn't find your SSL header files."
@@ -683,7 +683,7 @@
echo
exit 1
fi
- AC_MSG_RESULT([$sslincldir])
+ AC_MSG_RESULT([$libssl_CFLAGS])
AC_MSG_CHECKING([for SSL library directory])
AC_ARG_WITH(ssl-lib-dir,
@@ -693,7 +693,7 @@
checkssllibdirdynamic "$withval"
],
[
- if test -z "$ssllibdir"; then
+ if test -z "$libssl_LIBS"; then
dnl Search default locations of SSL libraries
for maindir in /usr \
/usr/local \
@@ -721,16 +721,18 @@
fi
]
)
- if test -z "$ssllibdir"; then
+ if test -z "$libssl_LIBS"; then
AC_MSG_RESULT([Not found])
+ PKG_CHECK_MODULES([libssl], [openssl], [], [
echo
echo "Couldn't find your SSL library files."
echo "Use --with-ssl-lib-dir option to fix this problem or disable the"
echo "SSL support with --without-ssl"
echo
exit 1
+ ])
fi
- AC_MSG_RESULT([$ssllibdir])
+ AC_MSG_RESULT([$libssl_LIBS])
AC_DEFINE([HAVE_OPENSSL], 1, [Define to 1 if you have openssl.])
AC_SUBST(sslincldir)
@@ -738,18 +740,18 @@
fi
# Add SSL includes and libraries
- if test "$sslincldir" -a "$ssllibdir"
+ if test "$libssl_CFLAGS" -a "$libssl_LIBS"
then
if test "x$ARCH" = "xDARWIN"; then
# Darwin already knows about ssldirs
LIBS="$LIBS -lssl -lcrypto"
elif test -f "/usr/kerberos/include/krb5.h"; then
# Redhat 9 compilation fix:
- CFLAGS="$CFLAGS -I$sslincldir -I/usr/kerberos/include"
- LIBS="$LIBS -L$ssllibdir -lssl -lcrypto"
+ CFLAGS="$CFLAGS $libssl_CFLAGS -I/usr/kerberos/include"
+ LIBS="$LIBS $libssl_LIBS"
else
- CFLAGS="$CFLAGS -I$sslincldir"
- LIBS="$LIBS -L$ssllibdir -lssl -lcrypto"
+ CFLAGS="$CFLAGS $libssl_CFLAGS"
+ LIBS="$LIBS $libssl_LIBS"
fi
fi
fi