storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* acinclude.m4 (AC_W3M_SSL): use PKG_CHECK_MODULES

Browse Source 
From: Akira TAGOH <at@gclab.org>
This commit is contained in:
Fumitoshi UKAI
2003-09-30 15:42:38 +00:00
parent 44f4bc70f7
commit 742b489496
4 changed files with 219 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
aclocal.m4 vendored
View File

@@ -499,23 +499,25 @@ AC_ARG_WITH(ssl,
AC_MSG_RESULT($with_ssl)
if test x"$with_ssl" != xno; then
AC_DEFINE(USE_SSL)
AC_MSG_CHECKING(for SSL library/header)
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
AC_MSG_RESULT($with_ssl)
for dir in $with_ssl
do
if test -f "$dir/include/openssl/ssl.h"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl"
if test "$dir" != "/usr"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
SSL_LIBS="$SSL_LIBS -L$dir/lib"
fi
done
PKG_CHECK_MODULES(SSL, openssl,,[
AC_MSG_CHECKING(for SSL library/header)
test x"$with_ssl" = xyes && with_ssl="/usr/openssl /usr/ssl /usr /usr/local/openssl /usr/local/ssl /usr/local"
AC_MSG_RESULT($with_ssl)
for dir in $with_ssl
do
if test -f "$dir/include/openssl/ssl.h"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include/openssl"
if test "$dir" != "/usr"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi
elif test "$dir" != "/usr" -a -f "$dir/include/ssl.h"; then
SSL_CFLAGS="$SSL_CFLAGS -I$dir/include"
fi
if test "$dir" != "/usr" -a -f "$dir/lib/libssl.a"; then
SSL_LIBS="$SSL_LIBS -L$dir/lib"
fi
done
])
AC_CHECK_LIB(ssl, SSL_new,
[w3m_ssl="found"; CFLAGS="$CFLAGS $SSL_CFLAGS" W3M_LIBS="$W3M_LIBS $SSL_LIBS -lssl -lcrypto"],
[w3m_ssl="not found"],
@@ -1611,6 +1613,64 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_LIB_PROG_LD_GNU
])
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN(PKG_CHECK_MODULES, [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])
# gettext.m4 serial 20 (gettext-0.12)
dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU