r11160 - in libprelude/trunk: . m4 prelude-admin
[email protected] Wed, 22 Apr 2009 11:43:25 +0200 (CEST)
Newsgroups
gmane.comp.security.ids.prelude.cvs
Message-ID
<[email protected] >
Author: yoann
Date: 2009-04-22 11:43:24 +0200 (Wed, 22 Apr 2009)
New Revision: 11160
Added:
libprelude/trunk/m4/pkg.m4
Modified:
libprelude/trunk/configure.in
libprelude/trunk/prelude-admin/prelude-admin.c
libprelude/trunk/prelude-admin/server.c
Log:
Remove COMMON_LIBS, since GnuLib is now used to detect theses library.
When available, use pkg-config for GnuTLS/Gnutls-Extra checking.
Check for Gnutls-Extra SRP support have been modified to be more flexible,
this simplify the SRP support code.
Modified: libprelude/trunk/configure.in
===================================================================
--- libprelude/trunk/configure.in 2009-04-22 09:43:21 UTC (rev 11159)
+++ libprelude/trunk/configure.in 2009-04-22 09:43:24 UTC (rev 11160)
@@ -151,26 +151,15 @@
AC_C_BIGENDIAN(AC_DEFINE_UNQUOTED(PRELUDE_WORDS_BIGENDIAN, , Byte ordering))
-dnl **************************************************
-dnl * Check for networking function *
-dnl **************************************************
-LIBS_bkp=$LIBS
-LIBS=""
-AC_SEARCH_LIBS(socket, socket nsl resolv)
-COMMON_LIBS="$LIBS"
-LIBS=$LIBS_bkp
-
-
-
dnl **************************************************
dnl * Check for GnuTLS. *
dnl **************************************************
+GNUTLS_MIN_VERSION=1.0.17
-AM_PATH_LIBGNUTLS(1.0.17, gnutls=yes, gnutls=no)
-if test x$gnutls != xyes; then
- AC_MSG_ERROR(libgnutls is required in order to build libprelude.)
-fi
+PKG_CHECK_EXISTS(gnutls,
+ [PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION])],
+ [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, [], [AC_MSG_ERROR(libgnutls is required in order to build libprelude.)])])
old_LIBS=$LIBS
old_CPPFLAGS=$CPPFLAGS
@@ -203,28 +192,26 @@
dnl **************************************************
dnl * Check for SRP function in GnuTLS extra. *
dnl **************************************************
+ PKG_CHECK_EXISTS(gnutls-extra,
+ [PKG_CHECK_MODULES([LIBGNUTLS_EXTRA], [gnutls-extra >= $GNUTLS_MIN_VERSION], [AC_CHECK_HEADER(gnutls/extra.h, gnutls_extra=yes, gnutls_extra=no)], gnutls_extra=no)],
+ [AM_PATH_LIBGNUTLS_EXTRA($GNUTLS_MIN_VERSION, [AC_CHECK_HEADER(gnutls/extra.h, gnutls_extra=yes, gnutls_extra=no)], gnutls_extra=no)])
- AM_PATH_LIBGNUTLS_EXTRA(1.0.17, gnutls_extra=yes, gnutls_extra=no)
- if test x$gnutls_extra != xyes; then
- AC_MSG_ERROR(libgnutls-extra is required in order to build libprelude.)
- fi
+ if test x$gnutls_extra = xyes; then
+ old_LIBS=$LIBS
+ LIBS="$LIBGNUTLS_EXTRA_LIBS"
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$LIBGNUTLS_EXTRA_CFLAGS"
- old_LIBS=$LIBS
- LIBS="$LIBGNUTLS_EXTRA_LIBS"
- old_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$LIBGNUTLS_EXTRA_CFLAGS"
+ AC_CHECK_LIB(gnutls-extra, gnutls_srp_verifier, srp_available=yes, srp_available=no)
+ if test x$srp_available = xyes; then
+ AC_DEFINE_UNQUOTED(GNUTLS_SRP_ENABLED, , Define whether SRP support is enabled)
+ PRELUDE_ADMIN_CFLAGS="-DNEED_GNUTLS_EXTRA $LIBGNUTLS_EXTRA_CFLAGS"
+ PRELUDE_ADMIN_LIBS="$LIBGNUTLS_EXTRA_LIBS"
+ fi
- AC_CHECK_HEADER(gnutls/extra.h, ,
- AC_MSG_ERROR("libgnutls-extra development headers are required to build libprelude"))
-
- AC_CHECK_LIB(gnutls-extra, gnutls_srp_verifier, srp_available=yes, AC_DEFINE_UNQUOTED(GNUTLS_SRP_DISABLED, , Define whether SRP support is disabled))
- if test x$srp_available = xyes; then
- PRELUDE_ADMIN_CFLAGS="-DNEED_GNUTLS_EXTRA $LIBGNUTLS_EXTRA_CFLAGS"
- PRELUDE_ADMIN_LIBS="$LIBGNUTLS_EXTRA_LIBS $COMMON_LIBS"
+ LIBS=$old_LIBS
+ CPPFLAGS=$old_CPPFLAGS
fi
-
- LIBS=$old_LIBS
- CPPFLAGS=$old_CPPFLAGS
fi
@@ -243,7 +230,7 @@
]]))
-LIBPRELUDE_LIBS="$LIBPRELUDE_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $COMMON_LIBS"
+LIBPRELUDE_LIBS="$LIBPRELUDE_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS"
dnl **************************************************
Added: libprelude/trunk/m4/pkg.m4
===================================================================
--- libprelude/trunk/m4/pkg.m4 (rev 0)
+++ libprelude/trunk/m4/pkg.m4 2009-04-22 09:43:24 UTC (rev 11160)
@@ -0,0 +1,155 @@
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <[email protected] >.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
Modified: libprelude/trunk/prelude-admin/prelude-admin.c
===================================================================
--- libprelude/trunk/prelude-admin/prelude-admin.c 2009-04-22 09:43:21 UTC (rev 11159)
+++ libprelude/trunk/prelude-admin/prelude-admin.c 2009-04-22 09:43:24 UTC (rev 11160)
@@ -846,7 +846,7 @@
const int kx_priority[] = {
GNUTLS_KX_ANON_DH,
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS, GNUTLS_KX_SRP_RSA,
#endif
0
@@ -861,7 +861,7 @@
gnutls_set_default_priority(session);
gnutls_kx_set_priority(session, kx_priority);
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
{
gnutls_srp_client_credentials srpcred;
gnutls_srp_allocate_client_credentials(&srpcred);
Modified: libprelude/trunk/prelude-admin/server.c
===================================================================
--- libprelude/trunk/prelude-admin/server.c 2009-04-22 09:43:21 UTC (rev 11159)
+++ libprelude/trunk/prelude-admin/server.c 2009-04-22 09:43:24 UTC (rev 11160)
@@ -56,7 +56,7 @@
static gnutls_anon_server_credentials anoncred;
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
static gnutls_srp_server_credentials srpcred;
#endif
@@ -104,7 +104,7 @@
gnutls_session session;
const int kx_priority[] = {
GNUTLS_KX_ANON_DH,
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS, GNUTLS_KX_SRP_RSA,
#endif
0 };
@@ -118,7 +118,7 @@
gnutls_set_default_priority(session);
gnutls_kx_set_priority(session, kx_priority);
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
gnutls_credentials_set(session, GNUTLS_CRD_SRP, srpcred);
gnutls_certificate_server_set_request(session, GNUTLS_CERT_IGNORE);
#endif
@@ -328,7 +328,7 @@
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
static int copy_datum(gnutls_datum *dst, const gnutls_datum *src)
{
@@ -387,7 +387,7 @@
struct pollfd pfd[128];
gnutls_dh_params dh_params;
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
int ret;
ret = gnutls_srp_allocate_server_credentials(&srpcred);
@@ -415,7 +415,7 @@
wait_connection(cp, sock, pfd, size, keepalive, key, cacrt, crt);
-#ifndef GNUTLS_SRP_DISABLED
+#ifdef GNUTLS_SRP_ENABLED
gnutls_srp_free_server_credentials(srpcred);
#endif
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog