X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=configure.in;h=59e705b14d55c449ca3f2a618cd31c400f8d8dd7;hb=026925cf0ba24d4cac784345fdaf591757c45496;hp=c99f352d7141bdb593316086268f69ef82b7234b;hpb=eaca75aa6c133cc6ff3d707f7ae8dbfbe51a6d2a;p=dockapps%2Fwmnotify.git diff --git a/configure.in b/configure.in index c99f352..59e705b 100644 --- a/configure.in +++ b/configure.in @@ -23,9 +23,6 @@ AC_C_CONST AC_TYPE_PID_T AC_TYPE_SIZE_T -dnl Checks for '--enable-debug' option -HV_CHECK_FOR_DEBUG - dnl Basic CFLAGS values CFLAGS="${CFLAGS} -Wall" @@ -71,29 +68,21 @@ else AC_MSG_RESULT(no) fi -dnl Check for OpenSSL +dnl Checks for OpenSSL AC_ARG_ENABLE(ssl, [ --enable-ssl Enable SSL support using OpenSSL (default=yes)], [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=yes]) AC_MSG_CHECKING([whether to use OpenSSL]) if test $ac_cv_enable_ssl = yes; then AC_MSG_RESULT(yes) - AC_MSG_CHECKING([if openssl is available]) - LIBS="$LIBS -lssl -lcrypto" - AC_TRY_LINK([ -#include -], [ return OPENSSL_VERSION_NUMBER; ], - [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_SSL, 1, Define if you use OpenSSL to support SSL.) ], - [ AC_MSG_RESULT(no) - LIBS="$ac_save_LIBS" - ac_cv_enable_ssl=no ]) + PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.8,dnl + AC_DEFINE([HAVE_SSL],1,[Set to 1 to enable OpenSSL support.])dnl + CFLAGS="${CFLAGS} ${OPENSSL_CFLAGS}"dnl + LIBS="${LIBS} ${OPENSSL_LIBS}", ac_cv_enable_ssl=no) else AC_MSG_RESULT(no) fi - - AC_SUBST(CFLAGS) AC_SUBST(LIBS) AC_SUBST(ac_aux_dir) @@ -110,12 +99,6 @@ echo " Compiler: ${CC}" echo " Compiler flags: ${CFLAGS}" echo " Linker flags: ${LIBS}" echo -echo -n " Debugging: " -if test x"${debug_messages}" = x1; then - echo "yes" -else - echo "no" -fi echo " OpenSSL: $ac_cv_enable_ssl" echo " libsndfile: $ac_cv_enable_libsndfile"