[pisa-src] r1241 - in trunk: configure.ac test/Makefile.am
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 21 Oct 2009 11:30:43 +0200
Author: tjansen
Date: Wed Oct 21 11:30:43 2009
New Revision: 1241
Log:
Deprecated --{en,dis}able-preauth configure option.
Modified:
trunk/configure.ac
trunk/test/Makefile.am
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Mon Oct 19 22:47:11 2009 (r1240)
+++ trunk/configure.ac Wed Oct 21 11:30:43 2009 (r1241)
@@ -112,18 +112,19 @@
fi
AM_CONDITIONAL(PISA_OPENWRT, test x"$ac_cv_use_openwrt" = x"yes")
-AC_ARG_ENABLE(preauth,
- AC_HELP_STRING([--enable-preauth],
- [enable the experimental pre-authentication
extension (default=yes)]),
- [ac_cv_use_preauth=$enableval],
- [ac_cv_use_preauth=yes])
-AC_CACHE_CHECK([whether to enable pre-authentication extension],
- [ac_cv_use_preauth], [ac_cv_use_preauth=yes])
-if test x"$ac_cv_use_preauth" = x"yes"; then
- AC_DEFINE(CONFIG_PISA_PREAUTH, AC_PREREQ(2.53))
- AH_TEMPLATE(CONFIG_PISA_PREAUTH)
-fi
-AM_CONDITIONAL(PISA_PREAUTH, test x"$ac_cv_use_preauth" = x"yes")
+# Preauth is deprecated and marked for removal. -- Thomas
+#AC_ARG_ENABLE(preauth,
+# AC_HELP_STRING([--enable-preauth],
+# [enable the experimental pre-authentication
extension (default=yes)]),
+# [ac_cv_use_preauth=$enableval],
+# [ac_cv_use_preauth=yes])
+#AC_CACHE_CHECK([whether to enable pre-authentication extension],
+# [ac_cv_use_preauth], [ac_cv_use_preauth=yes])
+#if test x"$ac_cv_use_preauth" = x"yes"; then
+# AC_DEFINE(CONFIG_PISA_PREAUTH, AC_PREREQ(2.53))
+# AH_TEMPLATE(CONFIG_PISA_PREAUTH)
+#fi
+#AM_CONDITIONAL(PISA_PREAUTH, test x"$ac_cv_use_preauth" = x"yes")
AC_PREFIX_DEFAULT("/usr/local")
Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am Mon Oct 19 22:47:11 2009 (r1240)
+++ trunk/test/Makefile.am Wed Oct 21 11:30:43 2009 (r1241)
@@ -18,14 +18,16 @@
bin_PROGRAMS += sendnereq
bin_PROGRAMS += udpserver
bin_PROGRAMS += udpclient
-if PISA_PREAUTH
-bin_PROGRAMS += hipl
-bin_PROGRAMS += parsepares
-bin_PROGRAMS += sendpareq
-bin_PROGRAMS += sendbureq
-bin_PROGRAMS += sendbures
-bin_PROGRAMS += sendvrfyreq
-endif
+
+## Preauth is deprecated and marked for removal. -- Thomas
+#if PISA_PREAUTH
+#bin_PROGRAMS += hipl
+#bin_PROGRAMS += parsepares
+#bin_PROGRAMS += sendpareq
+#bin_PROGRAMS += sendbureq
+#bin_PROGRAMS += sendbures
+#bin_PROGRAMS += sendvrfyreq
+#endif
EXTRA_DIST += packaging/create-package.sh
EXTRA_DIST += packaging/debbuild
@@ -63,53 +65,54 @@
nodist_sendnereq_SOURCES += @PISA_PISAND@/ndctx.c
+## Preauth is deprecated and marked for removal. -- Thomas
#
# Any module for pre-authentication must only stay here, inside the
# PISA_PREAUTH clause, to make sure that the original softwares can be stable
# enough as before.
#
-if PISA_PREAUTH
+#if PISA_PREAUTH
-hipl_SOURCES = hipl.c
-hipl_LDADD = -lcrypto
+#hipl_SOURCES = hipl.c
+#hipl_LDADD = -lcrypto
-if PISA_WITH_HIPL
-hipl_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
-hipl_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
-
-INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6/include
-INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6
-INCLUDES += -I@PISA_HIPL_SRCDIR@/libhiptool
-INCLUDES += -I@PISA_HIPL_SRCDIR@/opendht
-INCLUDES += -I@PISA_HIPL_SRCDIR@/hipd
-INCLUDES += -I@PISA_HIPL_SRCDIR@/i3/i3_client
-INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjnath/include
-INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib/include
-INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include
-endif
-
-parsepares_SOURCES = parsepares.c
-nodist_parsepares_SOURCES = @PISA_PISACD@/cdmsg.c
-nodist_parsepares_SOURCES += @PISA_PISACD@/cdconf.c
-nodist_parsepares_SOURCES += @PISA_PISACD@/cdctx.c
-
-sendpareq_SOURCES = sendpareq.c
-nodist_sendpareq_SOURCES = @PISA_PISACD@/cdmsg.c
-nodist_sendpareq_SOURCES += @PISA_PISACD@/cdconf.c
-nodist_sendpareq_SOURCES += @PISA_PISACD@/cdctx.c
-
-sendbureq_SOURCES = sendbureq.c
-nodist_sendbureq_SOURCES = @PISA_PISACD@/cdmsg.c
-nodist_sendbureq_SOURCES += @PISA_PISACD@/cdconf.c
-nodist_sendbureq_SOURCES += @PISA_PISACD@/cdctx.c
-
-sendbures_SOURCES = sendbures.c
-nodist_sendbures_SOURCES = @PISA_PISACD@/cdmsg.c
-nodist_sendbures_SOURCES += @PISA_PISACD@/cdconf.c
-nodist_sendbures_SOURCES += @PISA_PISACD@/cdctx.c
-
-sendvrfyreq_SOURCES = sendvrfyreq.c
-nodist_sendvrfyreq_SOURCES = @PISA_PISASD@/sdmsg.c
-nodist_sendvrfyreq_SOURCES += @PISA_PISASD@/sdconf.c
-nodist_sendvrfyreq_SOURCES += @PISA_PISASD@/sdctx.c
-endif
+#if PISA_WITH_HIPL
+#hipl_LDADD += @PISA_HIPL_SRCDIR@/libinet6/.libs/libinet6.a
+#hipl_LDADD += @PISA_HIPL_SRCDIR@/libhiptool/.libs/libhiptool.a
+
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6/include
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/libinet6
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/libhiptool
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/opendht
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/hipd
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/i3/i3_client
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjnath/include
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib/include
+#INCLUDES += -I@PISA_HIPL_SRCDIR@/pjproject/pjlib-util/include
+#endif
+
+#parsepares_SOURCES = parsepares.c
+#nodist_parsepares_SOURCES = @PISA_PISACD@/cdmsg.c
+#nodist_parsepares_SOURCES += @PISA_PISACD@/cdconf.c
+#nodist_parsepares_SOURCES += @PISA_PISACD@/cdctx.c
+
+#sendpareq_SOURCES = sendpareq.c
+#nodist_sendpareq_SOURCES = @PISA_PISACD@/cdmsg.c
+#nodist_sendpareq_SOURCES += @PISA_PISACD@/cdconf.c
+#nodist_sendpareq_SOURCES += @PISA_PISACD@/cdctx.c
+
+#sendbureq_SOURCES = sendbureq.c
+#nodist_sendbureq_SOURCES = @PISA_PISACD@/cdmsg.c
+#nodist_sendbureq_SOURCES += @PISA_PISACD@/cdconf.c
+#nodist_sendbureq_SOURCES += @PISA_PISACD@/cdctx.c
+
+#sendbures_SOURCES = sendbures.c
+#nodist_sendbures_SOURCES = @PISA_PISACD@/cdmsg.c
+#nodist_sendbures_SOURCES += @PISA_PISACD@/cdconf.c
+#nodist_sendbures_SOURCES += @PISA_PISACD@/cdctx.c
+
+#sendvrfyreq_SOURCES = sendvrfyreq.c
+#nodist_sendvrfyreq_SOURCES = @PISA_PISASD@/sdmsg.c
+#nodist_sendvrfyreq_SOURCES += @PISA_PISASD@/sdconf.c
+#nodist_sendvrfyreq_SOURCES += @PISA_PISASD@/sdctx.c
+#endif
Other related posts:
- » [pisa-src] r1241 - in trunk: configure.ac test/Makefile.am - Thomas Jansen
