From 836f70875b41c7e6cca1c81cdc32c1f161bb6e9f Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 13 Jun 2014 16:26:47 +0000 Subject: [PATCH] freeradius: moved to github SVN-Revision: 41186 --- net/freeradius2/Config.in | 14 - net/freeradius2/Makefile | 631 --- net/freeradius2/files/radiusd.init | 22 - .../patches/001-fix-makefile.patch | 10 - net/freeradius2/patches/002-config.patch | 588 --- .../patches/004-ldap_configure.patch | 4253 ----------------- .../patches/008-honor_ccpflags.patch | 15 - .../patches/010-disbale-openssl-check.patch | 38 - 8 files changed, 5571 deletions(-) delete mode 100644 net/freeradius2/Config.in delete mode 100644 net/freeradius2/Makefile delete mode 100644 net/freeradius2/files/radiusd.init delete mode 100644 net/freeradius2/patches/001-fix-makefile.patch delete mode 100644 net/freeradius2/patches/002-config.patch delete mode 100644 net/freeradius2/patches/004-ldap_configure.patch delete mode 100644 net/freeradius2/patches/008-honor_ccpflags.patch delete mode 100644 net/freeradius2/patches/010-disbale-openssl-check.patch diff --git a/net/freeradius2/Config.in b/net/freeradius2/Config.in deleted file mode 100644 index cd0141ec94..0000000000 --- a/net/freeradius2/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -# FreeRADIUS avanced configuration - -choice - prompt "SSL library" - default FREERADIUS_OPENSSL - depends on PACKAGE_freeradius2-common - -config FREERADIUS_NOSSL - bool "No SSL support" - -config FREERADIUS_OPENSSL - bool "OpenSSL" - -endchoice diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile deleted file mode 100644 index d36dad51a8..0000000000 --- a/net/freeradius2/Makefile +++ /dev/null @@ -1,631 +0,0 @@ -# -# Copyright (C) 2008-2014 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=freeradius2 -PKG_VERSION:=2.2.3 -PKG_RELEASE:=3 - -PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/ -PKG_MD5SUM:=25fb44cc1bc121f44f61f439bf45a420 - -PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION) -PKG_FIXUP:=autoreconf - -PKG_CONFIG_DEPENDS := \ - FREERADIUS_OPENSSL \ - FREERADIUS_NOSSL - -include $(INCLUDE_DIR)/package.mk - -define Package/freeradius2/config - source "$(SOURCE)/Config.in" -endef - -define Package/freeradius2/Default - SECTION:=net - CATEGORY:=Network - URL:=http://freeradius.org/ - SUBMENU:=FreeRADIUS (version 2) -endef - -define Package/freeradius2 - $(call Package/freeradius2/Default) - DEPENDS:=+libltdl +libreadline +freeradius2-common - TITLE:=A flexible RADIUS server (version 2) -endef - -define Package/freeradius2/conffiles -/etc/freeradius2/clients.conf -/etc/freeradius2/radiusd.conf -/etc/freeradius2/sites/default -endef - -define Package/freeradius2-democerts - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Demo certificates to test the server -endef - -define Package/freeradius2-common - $(call Package/freeradius2/Default) - TITLE:=common files - DEPENDS:=+libpthread +FREERADIUS_OPENSSL:libopenssl -endef - -define Package/freeradius2-mod-chap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=CHAP module -endef - -define Package/freeradius2-mod-chap/conffiles -/etc/freeradius2/modules/chap -endef - -define Package/freeradius2-mod-detail - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Detailed accounting module -endef - -define Package/freeradius2-mod-detail/conffiles -/etc/freeradius2/modules/detail -endef - -define Package/freeradius2-mod-eap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Base EAP module -endef - -define Package/freeradius2-mod-eap/conffiles -/etc/freeradius2/eap.conf -endef - -define Package/freeradius2-mod-eap-gtc - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap - TITLE:=EAP/GTC module -endef - -define Package/freeradius2-mod-eap-md5 - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap - TITLE:=EAP/MD5 module -endef - -define Package/freeradius2-mod-eap-mschapv2 - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap +freeradius2-mod-mschap - TITLE:=EAP/MS-CHAPv2 module -endef - -define Package/freeradius2-mod-eap-peap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL - TITLE:=EAP/PEAP module -endef - -define Package/freeradius2-mod-eap-tls - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap @FREERADIUS_OPENSSL - TITLE:=EAP/TLS module -endef - -define Package/freeradius2-mod-eap-ttls - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap-tls - TITLE:=EAP/TTLS module -endef - -define Package/freeradius2-mod-exec - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=EXEC module -endef - -define Package/freeradius2-mod-exec/conffiles -/etc/freeradius2/modules/exec -endef - -define Package/freeradius2-mod-expiration - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Expiration module -endef - -define Package/freeradius2-mod-expiration/conffiles -/etc/freeradius2/modules/expiration -endef - -define Package/freeradius2-mod-always - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Always module -endef - -define Package/freeradius2-mod-always/conffiles -/etc/freeradius2/modules/always -endef - -define Package/freeradius2-mod-expr - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=EXPR module -endef - -define Package/freeradius2-mod-expr/conffiles -/etc/freeradius2/modules/expr -endef - -define Package/freeradius2-mod-attr-filter - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=ATTR filter module -endef - -define Package/freeradius2-mod-attr-filter/conffiles -/etc/freeradius2/modules/attr_filter -/etc/freeradius2/attrs -/etc/freeradius2/attrs.access_reject -/etc/freeradius2/attrs.accounting_response -/etc/freeradius2/attrs.pre-proxy -endef - -define Package/freeradius2-mod-attr-rewrite - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=ATTR rewrite module -endef - -define Package/freeradius2-mod-attr-rewrite/conffiles -/etc/freeradius2/modules/attr_rewrite -endef - -define Package/freeradius2-mod-files - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Module using local files for authorization -endef - -define Package/freeradius2-mod-files/conffiles -/etc/freeradius2/acct_users -/etc/freeradius2/preproxy_users -/etc/freeradius2/users -/etc/freeradius2/modules/files -endef - -define Package/freeradius2-mod-passwd - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Rlm passwd module -endef - -define Package/freeradius2-mod-passwd/conffiles -/etc/freeradius2/modules/passwd -endef - -define Package/freeradius2-mod-ldap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 +PACKAGE_freeradius2-mod-ldap:libopenldap - TITLE:=LDAP module -endef - -define Package/freeradius2-mod-ldap/conffiles -/etc/freeradius2/ldap.attrmap -/etc/freeradius2/modules/ldap -endef - -define Package/freeradius2-mod-logintime - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Logintime module -endef - -define Package/freeradius2-mod-logintime/conffiles -/etc/freeradius2/modules/logintime -endef - -define Package/freeradius2-mod-mschap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=MS-CHAP and MS-CHAPv2 module -endef - -define Package/freeradius2-mod-mschap/conffiles -/etc/freeradius2/modules/mschap -endef - -define Package/freeradius2-mod-pap - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=PAP module -endef - -define Package/freeradius2-mod-pap/conffiles -/etc/freeradius2/modules/pap -endef - -define Package/freeradius2-mod-preprocess - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Request pre-processing module -endef - -define Package/freeradius2-mod-preprocess/conffiles -/etc/freeradius2/hints -/etc/freeradius2/huntgroups -/etc/freeradius2/modules/preprocess -endef - -define Package/freeradius2-mod-realm - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Realms handling module -endef - -define Package/freeradius2-mod-realm/conffiles -/etc/freeradius2/proxy.conf -/etc/freeradius2/modules/realm -endef - -define Package/freeradius2-mod-sql - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Base SQL module -endef - -define Package/freeradius2-mod-sql/conffiles -/etc/freeradius2/sql.conf -endef - -define Package/freeradius2-mod-sql-mysql - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-sql \ - +PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient-r - TITLE:=MySQL module -endef - -define Package/freeradius2-mod-sql-pgsql - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-sql \ - +PACKAGE_freeradius2-mod-sql-pgsql:libpq - TITLE:=PostgreSQL module -endef - -define Package/freeradius2-mod-sql-sqlite - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-sql \ - +PACKAGE_freeradius2-mod-sql-sqlite:libsqlite3 - TITLE:=SQLite module -endef - -define Package/freeradius2-mod-sqlcounter - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-sql - TITLE:=Generic SQL Counter module -endef - -define Package/freeradius2-mod-radutmp - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=Radius UTMP module -endef - -define Package/freeradius2-mod-radutmp/conffiles -/etc/freeradius2/modules/radutmp -/etc/freeradius2/modules/sradutmp -endef - -define Package/freeradius2-utils - $(call Package/freeradius2/Default) - DEPENDS:=+freeradius2-common - TITLE:=Misc. client utilities -endef - -define Package/freeradius2-mod-sqllog - $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 - TITLE:=SQL Logging module -endef - -CONFIGURE_ARGS+= \ - --libdir=/usr/lib/freeradius2 \ - --libexecdir=/usr/lib/freeradius2 \ - --enable-shared \ - --disable-static \ - --disable-developer \ - --with-threads \ - $(if $(CONFIG_FREERADIUS_OPENSSL),--with,--without)-openssl \ - $(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-includes="$(STAGING_DIR)/usr/include",) \ - $(if $(CONFIG_FREERADIUS_OPENSSL),--with-openssl-libraries="$(STAGING_DIR)/usr/lib",) \ - --with-system-libtool \ - --with-system-libltdl \ - --enable-strict-dependencies \ - --with-raddbdir=/etc/freeradius2 \ - --with-radacctdir=/var/db/radacct \ - --with-logdir=/var/log \ - --without-edir \ - --without-snmp \ - --without-rlm_checkval \ - --without-rlm_dbm \ - --without-rlm_counter \ - --with-rlm_expr \ - --with-rlm_eap \ - --without-rlm_eap_sim \ - --without-rlm_example \ - --without-rlm_ippool \ - --without-rlm_krb5 \ - --without-rlm_otp \ - --without-rlm_smsotp \ - --without-rlm_pam \ - --without-rlm_perl \ - --without-rlm_python \ - --without-rlm_smb \ - --with-rlm_sql \ - --with-rlm_sqlcounter \ - --without-rlm_sqlhpwippool \ - --without-rlm_sqlippool \ - --without-rlm_sql_db2 \ - --without-rlm_sql_firebird \ - --without-rlm_sql_freetds \ - --without-rlm_sql_iodbc \ - --without-rlm_sql_oracle \ - --without-rlm_sql_sybase \ - --without-rlm_sql_unixodbc \ - --without-rlm_sql_log \ - --without-rlm_unix \ - --without-rlm_eap_tnc \ - --without-rlm_eap_ikev2 \ - --without-rlm_opendirectory \ - --without-rlm_wimax \ - --without-rlm_ruby \ - --without-rlm_caching \ - --without-rlm_redis \ - --without-rlm_rediswho \ - --without-rlm_soh \ - --without-rlm_sim \ - --without-rlm_replicate \ - --without-rlm_protocol_filter \ - --without-rlm_policy \ - --without-rlm_linelog \ - --without-rlm_jradius \ - --without-rlm_fastusers \ - --without-rlm_eap_leap \ - --without-rlm_dynamic_clients \ - --without-rlm_digest \ - --without-rlm_cram \ - --without-rlm_copy_packet \ - --without-rlm_acct_unique \ - --without-rlm_acctlog - - -PKG_DICTIONARIES:= \ - freeradius freeradius.internal \ - rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 \ - rfc4372 rfc4675 rfc4679 \ - microsoft \ - wispr \ - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-ldap),) - CONFIGURE_ARGS+= \ - --with-rlm_ldap-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_ldap-lib-dir="$(STAGING_DIR)/usr/lib" - CONFIGURE_LIBS+= -lcrypto -lssl -else - CONFIGURE_ARGS+= --without-rlm_ldap -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),) - CONFIGURE_ARGS+= \ - --with-mysql-include-dir="$(STAGING_DIR)/usr/include" \ - --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" - CONFIGURE_LIBS+= -lz - CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes -else - CONFIGURE_ARGS+= --without-rlm_sql_mysql -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),) - CONFIGURE_ARGS+= \ - --with-rlm_sql_postgresql-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_sql_postgresql-lib-dir="$(STAGING_DIR)/usr/lib" -else - CONFIGURE_ARGS+= --without-rlm_sql_postgresql -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sqllog),) - CONFIGURE_ARGS+= \ - --with-rlm_sql_log \ - --with-experimental-modules \ -else - CONFIGURE_ARGS+= --without-rlm_sql_log -endif - - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-sqlite),) - CONFIGURE_ARGS+= \ - --with-rlm_sql_sqlite \ - --with-experimental-modules \ - --with-sqlite-include-dir="$(STAGING_DIR)/usr/include" \ - --with-sqlite-lib-dir="$(STAGING_DIR)/usr/lib" -else - CONFIGURE_ARGS+= --without-rlm_sql_sqlite -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-peap),) - CONFIGURE_ARGS+= \ - --with-rlm_eap_peap \ - --with-rlm_eap_peap-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_eap_peap-lib-dir="$(STAGING_DIR)/usr/lib" - CONFIGURE_LIBS+= -lcrypto -lssl -else - CONFIGURE_ARGS+= --without-rlm_eap_peap -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-tls),) - CONFIGURE_ARGS+= \ - --with-rlm_eap_tls \ - --with-rlm_eap_tls-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_eap_tls-lib-dir="$(STAGING_DIR)/usr/lib" - CONFIGURE_LIBS+= -lcrypto -lssl -else - CONFIGURE_ARGS+= --without-rlm_eap_tls -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-eap-ttls),) - CONFIGURE_ARGS+= \ - --with-rlm_eap_ttls \ - --with-rlm_eap_ttls-include-dir="$(STAGING_DIR)/usr/include" \ - --with-rlm_eap_ttls-lib-dir="$(STAGING_DIR)/usr/lib" - CONFIGURE_LIBS+= -lcrypto -lssl -else - CONFIGURE_ARGS+= --without-rlm_eap_ttls -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-attr-rewrite),) - CONFIGURE_ARGS+= --with-rlm_attr-rewrite -else - CONFIGURE_ARGS+= --without-rlm_attr-rewrite -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-radutmp),) - CONFIGURE_ARGS+= --with-rlm_radutmp -else - CONFIGURE_ARGS+= --without-rlm_radutmp -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-logintime),) - CONFIGURE_ARGS+= --with-rlm_logintime -else - CONFIGURE_ARGS+= --without-rlm_logintime -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-expiration),) - CONFIGURE_ARGS+= --with-rlm_expiration -else - CONFIGURE_ARGS+= --without-rlm_expiration -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-always),) - CONFIGURE_ARGS+= --with-rlm_always -else - CONFIGURE_ARGS+= --without-rlm_always -endif - -CONFIGURE_VARS+= \ - LDFLAGS="$$$$LDFLAGS" \ - LIBS="$(CONFIGURE_LIBS)" \ - MYSQL_CONFIG="no" \ - ac_cv_lib_readline=no \ - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - R="$(PKG_INSTALL_DIR)" \ - INSTALLSTRIP="" \ - all certs install -endef - -define Package/freeradius2-common/install - $(INSTALL_DIR) $(1)/etc/freeradius2 - chmod 771 $(1)/etc/freeradius2 - $(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/dictionary $(1)/etc/freeradius2/ ; \ - $(INSTALL_DIR) $(1)/usr/lib/freeradius2 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2 - $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-eap{,-*}.so $(1)/usr/lib/freeradius2 - $(INSTALL_DIR) $(1)/usr/share/freeradius2 - $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary $(1)/usr/share/freeradius2/ - $(SED) "s,^\(\$$$$INCLUDE\),#\1,g" $(1)/usr/share/freeradius2/dictionary - for f in $(PKG_DICTIONARIES); do \ - $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$$$${f} $(1)/usr/share/freeradius2/ ; \ - $(SED) "s,^#\(\$$$$INCLUDE dictionary\.$$$${f}\),\1,g" $(1)/usr/share/freeradius2/dictionary ; \ - done -endef - -define Package/freeradius2/install - $(INSTALL_DIR) $(1)/etc/freeradius2/modules - $(INSTALL_DIR) $(1)/etc/freeradius2/sites - for f in clients.conf radiusd.conf policy.conf; do \ - $(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$${f} $(1)/etc/freeradius2/ ; \ - done - $(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/sites-available/default $(1)/etc/freeradius2/sites/default - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd -endef - -define Package/freeradius2-democerts/install - $(INSTALL_DIR) $(1)/etc/freeradius2/certs - $(CP) \ - $(PKG_BUILD_DIR)/raddb/certs/ca.pem \ - $(PKG_BUILD_DIR)/raddb/certs/dh \ - $(PKG_BUILD_DIR)/raddb/certs/random \ - $(PKG_BUILD_DIR)/raddb/certs/server.pem \ - $(1)/etc/freeradius2/certs/ -endef - -define Package/freeradius2-utils/install - $(INSTALL_DIR) $(1)/usr/bin - for f in radclient radeapclient radwho; do \ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$$$${f} $(1)/usr/bin/ ; \ - done -endef - -define BuildPlugin - define Package/$(1)/install - [ -z "$(2)" ] || $(INSTALL_DIR) $$(1)/usr/lib/freeradius2 - for m in $(2); do \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/$$$$$$$${m}{,-*}.so $$(1)/usr/lib/freeradius2 ; \ - done - [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2 - [ -z "$(4)" ] || $(INSTALL_DIR) $$(1)/etc/freeradius2/$(4) - for f in $(3); do \ - $(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$$$$$${f} $$(1)/etc/freeradius2/$$$$$$$${f} ; \ - done - endef - - $$(eval $$(call BuildPackage,$(1))) -endef - -$(eval $(call BuildPackage,freeradius2)) -$(eval $(call BuildPackage,freeradius2-common)) -$(eval $(call BuildPackage,freeradius2-democerts)) -$(eval $(call BuildPlugin,freeradius2-mod-chap,rlm_chap,modules/chap,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-detail,rlm_detail,modules/detail,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap,rlm_eap,eap.conf)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-gtc,rlm_eap_gtc,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-md5,rlm_eap_md5,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-mschapv2,rlm_eap_mschapv2,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-peap,rlm_eap_peap,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-tls,rlm_eap_tls,)) -$(eval $(call BuildPlugin,freeradius2-mod-eap-ttls,rlm_eap_ttls,)) -$(eval $(call BuildPlugin,freeradius2-mod-exec,rlm_exec,modules/exec modules/echo ,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-attr-rewrite,rlm_attr_rewrite,modules/attr_rewrite,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-files,rlm_files,acct_users preproxy_users users modules/files,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-passwd,rlm_passwd,modules/passwd,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-ldap,rlm_ldap,ldap.attrmap modules/ldap,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-mschap,rlm_mschap,modules/mschap,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,)) -$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,)) -$(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,)) -$(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,)) -$(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,)) -$(eval $(call BuildPlugin,freeradius2-mod-sqllog,rlm_sql_log,)) -$(eval $(call BuildPlugin,freeradius2-mod-radutmp,rlm_radutmp,modules/radutmp modules/sradutmp,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-logintime,rlm_logintime,modules/logintime,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-expr,rlm_expr,modules/expr,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-attr-filter,rlm_attr_filter,modules/attr_filter attrs attrs.access_reject attrs.accounting_response attrs.pre-proxy,modules,,)) -$(eval $(call BuildPlugin,freeradius2-mod-expiration,rlm_expiration,modules/expiration,modules,)) -$(eval $(call BuildPlugin,freeradius2-mod-always,rlm_always,modules/always,modules,)) -$(eval $(call BuildPackage,freeradius2-utils)) diff --git a/net/freeradius2/files/radiusd.init b/net/freeradius2/files/radiusd.init deleted file mode 100644 index 27f75c6ef0..0000000000 --- a/net/freeradius2/files/radiusd.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org -START=50 - -DEFAULT=/etc/default/radiusd -LOG_D=/var/log -RUN_D=/var/run -PID_F=$RUN_D/radiusd.pid -RADACCT_D=/var/db/radacct -IPADDR=$(ifconfig br-lan | sed -n 's/.*dr:\(.*\)Bc.*/\1/p') - -start() { - [ -f $DEFAULT ] && . $DEFAULT - mkdir -p $LOG_D - mkdir -p $RUN_D - mkdir -p $RADACCT_D - radiusd -i $IPADDR -p 1812,1813 $OPTIONS -} - -stop() { - [ -f $PID_F ] && kill $(cat $PID_F) -} diff --git a/net/freeradius2/patches/001-fix-makefile.patch b/net/freeradius2/patches/001-fix-makefile.patch deleted file mode 100644 index 2daaec8230..0000000000 --- a/net/freeradius2/patches/001-fix-makefile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Make.inc.in -+++ b/Make.inc.in -@@ -5,6 +5,7 @@ - # - - # Location of files. -+SHELL = @SHELL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - sysconfdir = @sysconfdir@ diff --git a/net/freeradius2/patches/002-config.patch b/net/freeradius2/patches/002-config.patch deleted file mode 100644 index 69132ff387..0000000000 --- a/net/freeradius2/patches/002-config.patch +++ /dev/null @@ -1,588 +0,0 @@ ---- a/raddb/dictionary.in -+++ b/raddb/dictionary.in -@@ -11,7 +11,7 @@ - # - # The filename given here should be an absolute path. - # --$INCLUDE @prefix@/share/freeradius/dictionary -+$INCLUDE @prefix@/share/freeradius2/dictionary - - # - # Place additional attributes or $INCLUDEs here. They will ---- a/raddb/eap.conf -+++ b/raddb/eap.conf -@@ -27,7 +27,7 @@ - # then that EAP type takes precedence over the - # default type configured here. - # -- default_eap_type = md5 -+ default_eap_type = peap - - # A list is maintained to correlate EAP-Response - # packets with EAP-Request packets. After a -@@ -72,8 +72,8 @@ - # for wireless connections. It is insecure, and does - # not provide for dynamic WEP keys. - # -- md5 { -- } -+# md5 { -+# } - - # Cisco LEAP - # -@@ -87,8 +87,8 @@ - # User-Password, or the NT-Password attributes. - # 'System' authentication is impossible with LEAP. - # -- leap { -- } -+# leap { -+# } - - # Generic Token Card. - # -@@ -101,7 +101,7 @@ - # the users password will go over the wire in plain-text, - # for anyone to see. - # -- gtc { -+# gtc { - # The default challenge, which many clients - # ignore.. - #challenge = "Password: " -@@ -118,8 +118,8 @@ - # configured for the request, and do the - # authentication itself. - # -- auth_type = PAP -- } -+# auth_type = PAP -+# } - - ## EAP-TLS - # -@@ -215,7 +215,7 @@ - # In these cases, fragment size should be - # 1024 or less. - # -- # fragment_size = 1024 -+ fragment_size = 1024 - - # include_length is a flag which is - # by default set to yes If set to -@@ -225,7 +225,7 @@ - # message is included ONLY in the - # First packet of a fragment series. - # -- # include_length = yes -+ include_length = yes - - # Check the Certificate Revocation List - # -@@ -297,7 +297,7 @@ - # for the server to print out an error message, - # and refuse to start. - # -- make_cert_command = "${certdir}/bootstrap" -+ # make_cert_command = "${certdir}/bootstrap" - - # - # Elliptical cryptography configuration -@@ -332,7 +332,7 @@ - # You probably also want "use_tunneled_reply = yes" - # when using fast session resumption. - # -- cache { -+ # cache { - # - # Enable it. The default is "no". - # Deleting the entire "cache" subsection -@@ -348,14 +348,14 @@ - # enable resumption for just one user - # by setting the above attribute to "yes". - # -- enable = no -+ # enable = no - - # - # Lifetime of the cached entries, in hours. - # The sessions will be deleted after this - # time. - # -- lifetime = 24 # hours -+ # lifetime = 24 # hours - - # - # The maximum number of entries in the -@@ -364,8 +364,8 @@ - # This could be set to the number of users - # who are logged in... which can be a LOT. - # -- max_entries = 255 -- } -+ # max_entries = 255 -+ # } - - # - # As of version 2.1.10, client certificates can be -@@ -503,7 +503,7 @@ - # - # in the control items for a request. - # -- ttls { -+# ttls { - # The tunneled EAP session needs a default - # EAP type which is separate from the one for - # the non-tunneled EAP module. Inside of the -@@ -511,7 +511,7 @@ - # If the request does not contain an EAP - # conversation, then this configuration entry - # is ignored. -- default_eap_type = md5 -+# default_eap_type = mschapv2 - - # The tunneled authentication request does - # not usually contain useful attributes -@@ -527,7 +527,7 @@ - # is copied to the tunneled request. - # - # allowed values: {no, yes} -- copy_request_to_tunnel = no -+# copy_request_to_tunnel = yes - - # The reply attributes sent to the NAS are - # usually based on the name of the user -@@ -540,7 +540,7 @@ - # the tunneled request. - # - # allowed values: {no, yes} -- use_tunneled_reply = no -+# use_tunneled_reply = no - - # - # The inner tunneled request can be sent -@@ -552,13 +552,13 @@ - # the virtual server that processed the - # outer requests. - # -- virtual_server = "inner-tunnel" -+# virtual_server = "inner-tunnel" - - # This has the same meaning as the - # same field in the "tls" module, above. - # The default value here is "yes". - # include_length = yes -- } -+# } - - ################################################## - # -@@ -627,14 +627,14 @@ - - # the PEAP module also has these configuration - # items, which are the same as for TTLS. -- copy_request_to_tunnel = no -- use_tunneled_reply = no -+ copy_request_to_tunnel = yes -+ use_tunneled_reply = yes - - # When the tunneled session is proxied, the - # home server may not understand EAP-MSCHAP-V2. - # Set this entry to "no" to proxy the tunneled - # EAP-MSCHAP-V2 as normal MSCHAPv2. -- # proxy_tunneled_request_as_eap = yes -+ proxy_tunneled_request_as_eap = no - - # - # The inner tunneled request can be sent -@@ -646,7 +646,8 @@ - # the virtual server that processed the - # outer requests. - # -- virtual_server = "inner-tunnel" -+ # virtual_server = "inner-tunnel" -+ EAP-TLS-Require-Client-Cert = no - - # This option enables support for MS-SoH - # see doc/SoH.txt for more info. ---- a/raddb/modules/counter -+++ b/raddb/modules/counter -@@ -69,7 +69,7 @@ - # 'check-name' attribute. - # - counter daily { -- filename = ${db_dir}/db.daily -+ filename = ${radacctdir}/db.daily - key = User-Name - count-attribute = Acct-Session-Time - reset = daily ---- a/raddb/modules/pap -+++ b/raddb/modules/pap -@@ -18,5 +18,5 @@ - # - # http://www.openldap.org/faq/data/cache/347.html - pap { -- auto_header = no -+ auto_header = yes - } ---- a/raddb/modules/radutmp -+++ b/raddb/modules/radutmp -@@ -12,7 +12,7 @@ radutmp { - # Where the file is stored. It's not a log file, - # so it doesn't need rotating. - # -- filename = ${logdir}/radutmp -+ filename = ${radacctdir}/radutmp - - # The field in the packet to key on for the - # 'user' name, If you have other fields which you want ---- a/raddb/modules/sradutmp -+++ b/raddb/modules/sradutmp -@@ -10,7 +10,7 @@ - # then name "sradutmp" to identify it later in the "accounting" - # section. - radutmp sradutmp { -- filename = ${logdir}/sradutmp -+ filename = ${radacctdir}/sradutmp - perm = 0644 - callerid = "no" - } ---- a/raddb/radiusd.conf.in -+++ b/raddb/radiusd.conf.in -@@ -66,7 +66,7 @@ name = radiusd - - # Location of config and logfiles. - confdir = ${raddbdir} --run_dir = ${localstatedir}/run/${name} -+run_dir = ${localstatedir}/run - - # Should likely be ${localstatedir}/lib/radiusd - db_dir = ${raddbdir} -@@ -290,7 +290,7 @@ listen { - # If your system does not support this feature, you will - # get an error if you try to use it. - # --# interface = eth0 -+ interface = br-lan - - # Per-socket lists of clients. This is a very useful feature. - # -@@ -317,7 +317,7 @@ listen { - # ipv6addr = :: - port = 0 - type = acct --# interface = eth0 -+ interface = br-lan - # clients = per_socket_clients - } - -@@ -541,8 +541,8 @@ security { - # - # allowed values: {no, yes} - # --proxy_requests = yes --$INCLUDE proxy.conf -+proxy_requests = no -+#$INCLUDE proxy.conf - - - # CLIENTS CONFIGURATION -@@ -739,7 +739,7 @@ instantiate { - # The entire command line (and output) must fit into 253 bytes. - # - # e.g. Framed-Pool = `%{exec:/bin/echo foo}` -- exec -+# exec - - # - # The expression module doesn't do authorization, -@@ -756,15 +756,15 @@ instantiate { - # other xlat functions such as md5, sha1 and lc. - # - # We do not recommend removing it's listing here. -- expr -+# expr - - # - # We add the counter module here so that it registers - # the check-name attribute before any module which sets - # it - # daily -- expiration -- logintime -+# expiration -+# logintime - - # subsections here can be thought of as "virtual" modules. - # -@@ -788,7 +788,7 @@ instantiate { - # to multiple times. - # - ###################################################################### --$INCLUDE policy.conf -+#$INCLUDE policy.conf - - ###################################################################### - # -@@ -798,9 +798,9 @@ $INCLUDE policy.conf - # match the regular expression: /[a-zA-Z0-9_.]+/ - # - # It allows you to define new virtual servers simply by placing --# a file into the raddb/sites-enabled/ directory. -+# a file into the /etc/freeradius2/sites/ directory. - # --$INCLUDE sites-enabled/ -+$INCLUDE sites/ - - ###################################################################### - # -@@ -808,7 +808,7 @@ $INCLUDE sites-enabled/ - # "authenticate {}", "accounting {}", have been moved to the - # the file: - # --# raddb/sites-available/default -+# /etc/freeradius2/sites/default - # - # This is the "default" virtual server that has the same - # configuration as in version 1.0.x and 1.1.x. The default ---- a/raddb/sites-available/default -+++ b/raddb/sites-available/default -@@ -85,7 +85,7 @@ authorize { - # - # It takes care of processing the 'raddb/hints' and the - # 'raddb/huntgroups' files. -- preprocess -+# preprocess - - # - # If you want to have a log of authentication requests, -@@ -96,7 +96,7 @@ authorize { - # - # The chap module will set 'Auth-Type := CHAP' if we are - # handling a CHAP request and Auth-Type has not already been set -- chap -+# chap - - # - # If the users are logging in with an MS-CHAP-Challenge -@@ -104,13 +104,13 @@ authorize { - # the MS-CHAP-Challenge attribute, and add 'Auth-Type := MS-CHAP' - # to the request, which will cause the server to then use - # the mschap module for authentication. -- mschap -+# mschap - - # - # If you have a Cisco SIP server authenticating against - # FreeRADIUS, uncomment the following line, and the 'digest' - # line in the 'authenticate' section. -- digest -+# digest - - # - # The WiMAX specification says that the Calling-Station-Id -@@ -133,7 +133,7 @@ authorize { - # Otherwise, when the first style of realm doesn't match, - # the other styles won't be checked. - # -- suffix -+# suffix - # ntdomain - - # -@@ -195,8 +195,8 @@ authorize { - # Use the checkval module - # checkval - -- expiration -- logintime -+# expiration -+# logintime - - # - # If no other module has claimed responsibility for -@@ -277,7 +277,7 @@ authenticate { - # If you have a Cisco SIP server authenticating against - # FreeRADIUS, uncomment the following line, and the 'digest' - # line in the 'authorize' section. -- digest -+# digest - - # - # Pluggable Authentication Modules. -@@ -294,7 +294,7 @@ authenticate { - # be used for authentication ONLY for compatibility with legacy - # FreeRADIUS configurations. - # -- unix -+# unix - - # Uncomment it if you want to use ldap for authentication - # -@@ -330,8 +330,8 @@ authenticate { - # - # Pre-accounting. Decide which accounting type to use. - # --preacct { -- preprocess -+#preacct { -+# preprocess - - # - # Session start times are *implied* in RADIUS. -@@ -354,7 +354,7 @@ preacct { - # - # Ensure that we have a semi-unique identifier for every - # request, and many NAS boxes are broken. -- acct_unique -+# acct_unique - - # - # Look for IPASS-style 'realm/', and if not found, look for -@@ -364,13 +364,13 @@ preacct { - # Accounting requests are generally proxied to the same - # home server as authentication requests. - # IPASS -- suffix -+# suffix - # ntdomain - - # - # Read the 'acct_users' file -- files --} -+# files -+#} - - # - # Accounting. Log the accounting data. -@@ -380,7 +380,7 @@ accounting { - # Create a 'detail'ed log of the packets. - # Note that accounting requests which are proxied - # are also logged in the detail file. -- detail -+# detail - # daily - - # Update the wtmp file -@@ -432,7 +432,7 @@ accounting { - exec - - # Filter attributes from the accounting response. -- attr_filter.accounting_response -+ #attr_filter.accounting_response - - # - # See "Autz-Type Status-Server" for how this works. -@@ -458,7 +458,7 @@ session { - # Post-Authentication - # Once we KNOW that the user has been authenticated, there are - # additional steps we can take. --post-auth { -+#post-auth { - # Get an address from the IP Pool. - # main_pool - -@@ -488,7 +488,7 @@ post-auth { - # ldap - - # For Exec-Program and Exec-Program-Wait -- exec -+# exec - - # - # Calculate the various WiMAX keys. In order for this to work, -@@ -572,12 +572,12 @@ post-auth { - # Add the ldap module name (or instance) if you have set - # 'edir_account_policy_check = yes' in the ldap module configuration - # -- Post-Auth-Type REJECT { -- # log failed authentications in SQL, too. -+# Post-Auth-Type REJECT { -+# # log failed authentications in SQL, too. - # sql -- attr_filter.access_reject -- } --} -+# attr_filter.access_reject -+# } -+#} - - # - # When the server decides to proxy a request to a home server, -@@ -587,7 +587,7 @@ post-auth { - # - # Only a few modules currently have this method. - # --pre-proxy { -+#pre-proxy { - # attr_rewrite - - # Uncomment the following line if you want to change attributes -@@ -603,14 +603,14 @@ pre-proxy { - # server, un-comment the following line, and the - # 'detail pre_proxy_log' section, above. - # pre_proxy_log --} -+#} - - # - # When the server receives a reply to a request it proxied - # to a home server, the request may be massaged here, in the - # post-proxy stage. - # --post-proxy { -+#post-proxy { - - # If you want to have a log of replies from a home server, - # un-comment the following line, and the 'detail post_proxy_log' -@@ -634,7 +634,7 @@ post-proxy { - # hidden inside of the EAP packet, and the end server will - # reject the EAP request. - # -- eap -+# eap - - # - # If the server tries to proxy a request and fails, then the -@@ -656,5 +656,5 @@ post-proxy { - # Post-Proxy-Type Fail { - # detail - # } --} -+#} - ---- a/raddb/users -+++ b/raddb/users -@@ -169,22 +169,22 @@ - # by the terminal server in which case there may not be a "P" suffix. - # The terminal server sends "Framed-Protocol = PPP" for auto PPP. - # --DEFAULT Framed-Protocol == PPP -- Framed-Protocol = PPP, -- Framed-Compression = Van-Jacobson-TCP-IP -+#DEFAULT Framed-Protocol == PPP -+# Framed-Protocol = PPP, -+# Framed-Compression = Van-Jacobson-TCP-IP - - # - # Default for CSLIP: dynamic IP address, SLIP mode, VJ-compression. - # --DEFAULT Hint == "CSLIP" -- Framed-Protocol = SLIP, -- Framed-Compression = Van-Jacobson-TCP-IP -+#DEFAULT Hint == "CSLIP" -+# Framed-Protocol = SLIP, -+# Framed-Compression = Van-Jacobson-TCP-IP - - # - # Default for SLIP: dynamic IP address, SLIP mode. - # --DEFAULT Hint == "SLIP" -- Framed-Protocol = SLIP -+#DEFAULT Hint == "SLIP" -+# Framed-Protocol = SLIP - - # - # Last default: rlogin to our main server. diff --git a/net/freeradius2/patches/004-ldap_configure.patch b/net/freeradius2/patches/004-ldap_configure.patch deleted file mode 100644 index 7f3e240174..0000000000 --- a/net/freeradius2/patches/004-ldap_configure.patch +++ /dev/null @@ -1,4253 +0,0 @@ ---- a/src/modules/rlm_ldap/configure -+++ b/src/modules/rlm_ldap/configure -@@ -1,10 +1,10 @@ - #! /bin/sh - # From configure.in Revision. - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.61. -+# Generated by GNU Autoconf 2.63. - # - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -16,7 +16,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -38,17 +38,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' - else -- PATH_SEPARATOR=: -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' - fi -- rm -f conf$$.sh -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -64,8 +92,6 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -88,7 +114,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -101,17 +127,10 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -133,7 +152,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -159,7 +178,7 @@ else - as_have_required=no - fi - -- if test $as_have_required = yes && (eval ": -+ if test $as_have_required = yes && (eval ": - (as_func_return () { - (exit \$1) - } -@@ -241,7 +260,7 @@ IFS=$as_save_IFS - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -262,7 +281,7 @@ _ASEOF - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -342,10 +361,10 @@ fi - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV -- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- done -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} - fi - - -@@ -414,9 +433,10 @@ fi - - test \$exitcode = 0") || { - echo No shell found that supports shell functions. -- echo Please tell autoconf@gnu.org about your system, -- echo including any error possibly output before this -- echo message -+ echo Please tell bug-autoconf@gnu.org about your system, -+ echo including any error possibly output before this message. -+ echo This can help us improve future autoconf versions. -+ echo Configuration will now proceed without shell functions. - } - - -@@ -452,7 +472,7 @@ test \$exitcode = 0") || { - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -480,7 +500,6 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -493,19 +512,22 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -530,10 +552,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -578,57 +600,65 @@ PACKAGE_STRING= - PACKAGE_BUGREPORT= - - ac_unique_file="rlm_ldap.c" --ac_subst_vars='SHELL --PATH_SEPARATOR --PACKAGE_NAME --PACKAGE_TARNAME --PACKAGE_VERSION --PACKAGE_STRING --PACKAGE_BUGREPORT --exec_prefix --prefix --program_transform_name --bindir --sbindir --libexecdir --datarootdir --datadir --sysconfdir --sharedstatedir --localstatedir --includedir --oldincludedir --docdir --infodir --htmldir --dvidir --pdfdir --psdir --libdir --localedir --mandir --DEFS --ECHO_C --ECHO_N --ECHO_T --LIBS --build_alias --host_alias --target_alias --CC --CFLAGS --LDFLAGS --CPPFLAGS --ac_ct_CC --EXEEXT --OBJEXT --edir --ldap_ldflags --ldap_cflags --targetname -+ac_subst_vars='LTLIBOBJS - LIBOBJS --LTLIBOBJS' -+targetname -+ldap_cflags -+ldap_ldflags -+edir -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_rlm_ldap_lib_dir -+with_rlm_ldap_include_dir -+enable_shared -+with_threads -+with_edir -+' - ac_precious_vars='build_alias - host_alias - target_alias -@@ -642,6 +672,8 @@ CPPFLAGS' - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -740,13 +772,21 @@ do - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; -@@ -759,13 +799,21 @@ do - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -- eval enable_$ac_feature=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -956,22 +1004,38 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=\$ac_optarg ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -- eval with_$ac_package=no ;; -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -991,7 +1055,7 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option -+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; -@@ -1000,16 +1064,16 @@ Try \`$0 --help' for more information." - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -1018,22 +1082,38 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute directory names. -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 -+ { (exit 1); exit 1; }; } ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; -+ esac -+fi -+ -+# Check all directory arguments for consistency. - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir - do - eval ac_val=\$$ac_var -+ # Remove trailing slashes. -+ case $ac_val in -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; -+ esac -+ # Be sure to have absolute directory names. - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } - done - -@@ -1048,7 +1128,7 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -1064,10 +1144,10 @@ test "$silent" = yes && exec 6>/dev/null - ac_pwd=`pwd` && test -n "$ac_pwd" && - ac_ls_di=`ls -di .` && - ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -- { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } - test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -- { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -@@ -1075,12 +1155,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. -- ac_confdir=`$as_dirname -- "$0" || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X"$0" | -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -1107,12 +1187,12 @@ else - fi - if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi - ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" - ac_abs_confdir=`( -- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` - # When building in place, set srcdir=. -@@ -1161,9 +1241,9 @@ Configuration: - - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -1173,25 +1253,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -- --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -- --infodir=DIR info documentation [DATAROOTDIR/info] -- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -- --htmldir=DIR html documentation [DOCDIR] -- --dvidir=DIR dvi documentation [DOCDIR] -- --pdfdir=DIR pdf documentation [DOCDIR] -- --psdir=DIR ps documentation [DOCDIR] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1203,6 +1283,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-shared[=PKGS] build shared libraries [default=yes] -@@ -1234,15 +1315,17 @@ fi - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d "$ac_dir" || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -1278,7 +1361,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -@@ -1288,10 +1371,10 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - configure --generated by GNU Autoconf 2.61 -+generated by GNU Autoconf 2.63 - - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -1302,7 +1385,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - $ $0 $@ - -@@ -1338,7 +1421,7 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" -+ $as_echo "PATH: $as_dir" - done - IFS=$as_save_IFS - -@@ -1373,7 +1456,7 @@ do - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -@@ -1425,11 +1508,12 @@ _ASBOX - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -1459,9 +1543,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - -@@ -1476,9 +1560,9 @@ _ASBOX - do - eval ac_val=\$$ac_var - case $ac_val in -- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac -- echo "$ac_var='\''$ac_val'\''" -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1494,8 +1578,8 @@ _ASBOX - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && -@@ -1537,21 +1621,24 @@ _ACEOF - - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE - if test -n "$CONFIG_SITE"; then -- set x "$CONFIG_SITE" -+ ac_site_file1=$CONFIG_SITE - elif test "x$prefix" != xNONE; then -- set x "$prefix/share/config.site" "$prefix/etc/config.site" -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site - else -- set x "$ac_default_prefix/share/config.site" \ -- "$ac_default_prefix/etc/config.site" -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --shift --for ac_site_file -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" - do -+ test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -1561,16 +1648,16 @@ if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - -@@ -1584,29 +1671,38 @@ for ac_var in $ac_precious_vars; do - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1616,10 +1712,12 @@ echo "$as_me: current value: $ac_new_v - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi - -@@ -1662,10 +1760,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1678,7 +1776,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1689,11 +1787,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1702,10 +1800,10 @@ if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1718,7 +1816,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1729,11 +1827,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "x$ac_ct_CC" = x; then -@@ -1741,12 +1839,8 @@ fi - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -1759,10 +1853,10 @@ if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1775,7 +1869,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1786,11 +1880,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1799,10 +1893,10 @@ fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1820,7 +1914,7 @@ do - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1843,11 +1937,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1858,10 +1952,10 @@ if test -z "$CC"; then - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1874,7 +1968,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1885,11 +1979,11 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- { echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1902,10 +1996,10 @@ if test -z "$CC"; then - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --{ echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1918,7 +2012,7 @@ do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done -@@ -1929,11 +2023,11 @@ fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6; } -+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - -@@ -1945,12 +2039,8 @@ done - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&5 --echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools --whose name does not start with the host triplet. If you think this --configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac - CC=$ac_ct_CC -@@ -1960,44 +2050,50 @@ fi - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH -+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO: checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` -+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 - { (ac_try="$ac_compiler --version >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -v >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { (ac_try="$ac_compiler -V >&5" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF -@@ -2016,27 +2112,22 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --# --# List of possible output files, starting from the most likely. --# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) --# only as a last resort. b.out is created by i960 compilers. --ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' --# --# The IRIX 6 linker writes into existing files which may not be --# executable, retaining their permissions. Remove them first so a --# subsequent execution test works. -+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ - ac_rmfiles= - for ac_file in $ac_files - do - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac - done -@@ -2047,10 +2138,11 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. - # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -@@ -2061,7 +2153,7 @@ for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most -@@ -2088,25 +2180,27 @@ else - ac_file='' - fi - --{ echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - if test -z "$ac_file"; then -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables - See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables -+$as_echo "$as_me: error: C compiler cannot create executables - See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+ { (exit 77); exit 77; }; }; } - fi - - ac_exeext=$ac_cv_exeext - - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then -@@ -2115,49 +2209,53 @@ if test "$cross_compiling" != yes; then - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. -+$as_echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'. - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - fi - fi --{ echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } --{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } - --{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } - if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -2166,31 +2264,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest$ac_cv_exeext --{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } - if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2213,40 +2313,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile -+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { (exit 1); exit 1; }; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -2272,20 +2375,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -@@ -2295,15 +2399,19 @@ rm -f core conftest.err conftest.$ac_obj - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes -@@ -2330,20 +2438,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" -@@ -2368,20 +2477,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag -@@ -2407,20 +2517,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -2435,8 +2546,8 @@ fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag - fi --{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2452,10 +2563,10 @@ else - CFLAGS= - fi - fi --{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 --echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } - if test "${ac_cv_prog_cc_c89+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_cv_prog_cc_c89=no - ac_save_CC=$CC -@@ -2526,20 +2637,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -@@ -2555,15 +2667,15 @@ fi - # AC_CACHE_VAL - case "x$ac_cv_prog_cc_c89" in - x) -- { echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; - xno) -- { echo "$as_me:$LINENO: result: unsupported" >&5 --echo "${ECHO_T}unsupported" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" -- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac - - -@@ -2581,8 +2693,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "${with_rlm_ldap_lib_dir+set}" = set; then - withval=$with_rlm_ldap_lib_dir; case "$withval" in - no) -- { { echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5 --echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-lib-dir" >&5 -+$as_echo "$as_me: error: Need rlm-ldap-lib-dir" >&2;} - { (exit 1); exit 1; }; } - ;; - yes) -@@ -2601,8 +2713,8 @@ fi - if test "${with_rlm_ldap_include_dir+set}" = set; then - withval=$with_rlm_ldap_include_dir; case "$withval" in - no) -- { { echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5 --echo "$as_me: error: Need rlm-ldap-include-dir" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: Need rlm-ldap-include-dir" >&5 -+$as_echo "$as_me: error: Need rlm-ldap-include-dir" >&2;} - { (exit 1); exit 1; }; } - ;; - yes) -@@ -2641,8 +2753,8 @@ fi - - - if test "x$enable_shared" = "xno"; then -- { echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5 --echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: Static linking with libldap will probably result in unresolved symbols." >&5 -+$as_echo "$as_me: WARNING: Static linking with libldap will probably result in unresolved symbols." >&2;} - fi - - rlm_ldap_with_threads=yes -@@ -2661,10 +2773,10 @@ fi - - - if test "x$rlm_ldap_with_threads" = "xyes"; then -- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -+$as_echo_n "checking for pthread_create in -lpthread... " >&6; } - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthread $LIBS" -@@ -2696,39 +2808,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_pthread_pthread_create=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_pthread_pthread_create=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } --if test $ac_cv_lib_pthread_pthread_create = yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } -+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then - LIBS="-lpthread $LIBS" - else -- { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 --echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 -+$as_echo_n "checking for pthread_create in -lc_r... " >&6; } - if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lc_r $LIBS" -@@ -2761,33 +2877,37 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_lib_c_r_pthread_create=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_c_r_pthread_create=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 --echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6; } --if test $ac_cv_lib_c_r_pthread_create = yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 -+$as_echo "$ac_cv_lib_c_r_pthread_create" >&6; } -+if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then - LIBS="-lc_r $LIBS" - else - rlm_ldap_with_threads="no" -@@ -2799,14 +2919,12 @@ fi - - fi - -- smart_try_dir=$rlm_ldap_lib_dir -- if test "x$rlm_ldap_with_threads" = "xyes"; then - - --sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'` --sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` --{ echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5 --echo $ECHO_N "checking for ldap_init in -lldap_r... $ECHO_C" >&6; } -+sm_lib_safe=`echo "sasl" | sed 'y%./+-%__p_%'` -+sm_func_safe=`echo "sasl_encode" | sed 'y%./+-%__p_%'` -+{ $as_echo "$as_me:$LINENO: checking for sasl_encode in -lsasl" >&5 -+$as_echo_n "checking for sasl_encode in -lsasl... " >&6; } - - old_LIBS="$LIBS" - smart_lib= -@@ -2814,18 +2932,18 @@ smart_lib_dir= - - if test "x$smart_try_dir" != "x"; then - for try in $smart_try_dir; do -- LIBS="-L$try -lldap_r $old_LIBS" -+ LIBS="-L$try -lsasl $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char sasl_encode(); - int - main () - { -- ldap_init() -+ sasl_encode() - ; - return 0; - } -@@ -2836,26 +2954,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-L$try -lldap_r" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lsasl" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "x$smart_lib" != "x"; then -@@ -2866,18 +2988,18 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "x$smart_lib" = "x"; then -- LIBS="-lldap_r $old_LIBS" -+ LIBS="-lsasl $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char sasl_encode(); - int - main () - { -- ldap_init() -+ sasl_encode() - ; - return 0; - } -@@ -2888,26 +3010,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-lldap_r" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-lsasl" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$old_LIBS" -@@ -2918,7 +3044,7 @@ if test "x$smart_lib" = "x"; then - - if test "x$LOCATE" != "x"; then - DIRS= -- file=libldap_r${libltdl_cv_shlibext} -+ file=libsasl${libltdl_cv_shlibext} - - for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` -@@ -2945,7 +3071,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D - - if test "x$LOCATE" != "x"; then - DIRS= -- file=libldap_r.a -+ file=libsasl.a - - for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` -@@ -2970,18 +3096,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D - - - for try in $smart_lib_dir /usr/local/lib /opt/lib; do -- LIBS="-L$try -lldap_r $old_LIBS" -+ LIBS="-L$try -lsasl $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char sasl_encode(); - int - main () - { -- ldap_init() -+ sasl_encode() - ; - return 0; - } -@@ -2992,26 +3118,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-L$try -lldap_r" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lsasl" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "x$smart_lib" != "x"; then -@@ -3022,26 +3152,22 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "x$smart_lib" != "x"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" - LIBS="$smart_lib $old_LIBS" - SMART_LIBS="$smart_lib $SMART_LIBS" - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then -- fail="$fail libldap_r" -- fi -- else - - --sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'` --sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` --{ echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5 --echo $ECHO_N "checking for ldap_init in -lldap... $ECHO_C" >&6; } -+sm_lib_safe=`echo "lber" | sed 'y%./+-%__p_%'` -+sm_func_safe=`echo "ber_init" | sed 'y%./+-%__p_%'` -+{ $as_echo "$as_me:$LINENO: checking for ber_init in -llber" >&5 -+$as_echo_n "checking for ber_init in -llber... " >&6; } - - old_LIBS="$LIBS" - smart_lib= -@@ -3049,18 +3175,18 @@ smart_lib_dir= - - if test "x$smart_try_dir" != "x"; then - for try in $smart_try_dir; do -- LIBS="-L$try -lldap $old_LIBS" -+ LIBS="-L$try -llber $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char ber_init(); - int - main () - { -- ldap_init() -+ ber_init() - ; - return 0; - } -@@ -3071,26 +3197,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-L$try -lldap" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -llber" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "x$smart_lib" != "x"; then -@@ -3101,18 +3231,18 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "x$smart_lib" = "x"; then -- LIBS="-lldap $old_LIBS" -+ LIBS="-llber $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char ber_init(); - int - main () - { -- ldap_init() -+ ber_init() - ; - return 0; - } -@@ -3123,26 +3253,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-lldap" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-llber" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$old_LIBS" -@@ -3153,7 +3287,7 @@ if test "x$smart_lib" = "x"; then - - if test "x$LOCATE" != "x"; then - DIRS= -- file=libldap${libltdl_cv_shlibext} -+ file=liblber${libltdl_cv_shlibext} - - for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` -@@ -3180,7 +3314,7 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D - - if test "x$LOCATE" != "x"; then - DIRS= -- file=libldap.a -+ file=liblber.a - - for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` -@@ -3205,18 +3339,18 @@ eval "smart_lib_dir=\"\$smart_lib_dir $D - - - for try in $smart_lib_dir /usr/local/lib /opt/lib; do -- LIBS="-L$try -lldap $old_LIBS" -+ LIBS="-L$try -llber $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --extern char ldap_init(); -+extern char ber_init(); - int - main () - { -- ldap_init() -+ ber_init() - ; - return 0; - } -@@ -3227,26 +3361,30 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -- smart_lib="-L$try -lldap" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -llber" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test "x$smart_lib" != "x"; then -@@ -3257,136 +3395,145 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "x$smart_lib" != "x"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" - LIBS="$smart_lib $old_LIBS" - SMART_LIBS="$smart_lib $SMART_LIBS" - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then -- fail="$fail libldap" -- fi -- fi -- - -- smart_try_dir=$rlm_ldap_include_dir -+ smart_try_dir=$rlm_ldap_lib_dir -+ if test "x$rlm_ldap_with_threads" = "xyes"; then - - --ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'` --{ echo "$as_me:$LINENO: checking for ldap.h" >&5 --echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6; } -+sm_lib_safe=`echo "ldap_r" | sed 'y%./+-%__p_%'` -+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` -+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap_r" >&5 -+$as_echo_n "checking for ldap_init in -lldap_r... " >&6; } - --old_CFLAGS="$CFLAGS" --smart_include= --smart_include_dir= -+old_LIBS="$LIBS" -+smart_lib= -+smart_lib_dir= - - if test "x$smart_try_dir" != "x"; then - for try in $smart_try_dir; do -- CFLAGS="$old_CFLAGS -I$try" -+ LIBS="-L$try -lldap_r $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- -- #include -+extern char ldap_init(); - int - main () - { -- int a = 1; -+ ldap_init() - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- smart_include="-I$try" -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lldap_r" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- smart_include= -+ - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test "x$smart_include" != "x"; then -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "x$smart_lib" != "x"; then - break; - fi - done -- CFLAGS="$old_CFLAGS" -+ LIBS="$old_LIBS" - fi - --if test "x$smart_include" = "x"; then -+if test "x$smart_lib" = "x"; then -+ LIBS="-lldap_r $old_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -- -- #include -+extern char ldap_init(); - int - main () - { -- int a = 1; -+ ldap_init() - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- smart_include=" " -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-lldap_r" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- smart_include= -+ - fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$old_LIBS" - fi - --if test "x$smart_include" = "x"; then -+if test "x$smart_lib" = "x"; then - - - if test "x$LOCATE" != "x"; then - DIRS= -- file=ldap.h -+ file=libldap_r${libltdl_cv_shlibext} - - for x in `${LOCATE} $file 2>/dev/null`; do - base=`echo $x | sed "s%/${file}%%"` -@@ -3400,19 +3547,505 @@ if test "x$LOCATE" != "x"; then - continue - fi - -- already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}` -+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` - if test "x$already" = "x"; then - DIRS="$DIRS $dir" - fi - done - fi - --eval "smart_include_dir=\"\$smart_include_dir $DIRS\"" -+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" - - -- for try in $smart_include_dir /usr/local/include /opt/include; do -- CFLAGS="$old_CFLAGS -I$try" -- cat >conftest.$ac_ext <<_ACEOF -+ -+if test "x$LOCATE" != "x"; then -+ DIRS= -+ file=libldap_r.a -+ -+ for x in `${LOCATE} $file 2>/dev/null`; do -+ base=`echo $x | sed "s%/${file}%%"` -+ if test "x$x" = "x$base"; then -+ continue; -+ fi -+ -+ dir=`${DIRNAME} $x 2>/dev/null` -+ exclude=`echo ${dir} | ${GREP} /home` -+ if test "x$exclude" != "x"; then -+ continue -+ fi -+ -+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` -+ if test "x$already" = "x"; then -+ DIRS="$DIRS $dir" -+ fi -+ done -+fi -+ -+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" -+ -+ -+ for try in $smart_lib_dir /usr/local/lib /opt/lib; do -+ LIBS="-L$try -lldap_r $old_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+extern char ldap_init(); -+int -+main () -+{ -+ ldap_init() -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lldap_r" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "x$smart_lib" != "x"; then -+ break; -+ fi -+ done -+ LIBS="$old_LIBS" -+fi -+ -+if test "x$smart_lib" != "x"; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" -+ LIBS="$smart_lib $old_LIBS" -+ SMART_LIBS="$smart_lib $SMART_LIBS" -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_cv_lib_ldap_r_ldap_init" != "xyes"; then -+ fail="$fail libldap_r" -+ fi -+ else -+ -+ -+sm_lib_safe=`echo "ldap" | sed 'y%./+-%__p_%'` -+sm_func_safe=`echo "ldap_init" | sed 'y%./+-%__p_%'` -+{ $as_echo "$as_me:$LINENO: checking for ldap_init in -lldap" >&5 -+$as_echo_n "checking for ldap_init in -lldap... " >&6; } -+ -+old_LIBS="$LIBS" -+smart_lib= -+smart_lib_dir= -+ -+if test "x$smart_try_dir" != "x"; then -+ for try in $smart_try_dir; do -+ LIBS="-L$try -lldap $old_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+extern char ldap_init(); -+int -+main () -+{ -+ ldap_init() -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lldap" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "x$smart_lib" != "x"; then -+ break; -+ fi -+ done -+ LIBS="$old_LIBS" -+fi -+ -+if test "x$smart_lib" = "x"; then -+ LIBS="-lldap $old_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+extern char ldap_init(); -+int -+main () -+{ -+ ldap_init() -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-lldap" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$old_LIBS" -+fi -+ -+if test "x$smart_lib" = "x"; then -+ -+ -+if test "x$LOCATE" != "x"; then -+ DIRS= -+ file=libldap${libltdl_cv_shlibext} -+ -+ for x in `${LOCATE} $file 2>/dev/null`; do -+ base=`echo $x | sed "s%/${file}%%"` -+ if test "x$x" = "x$base"; then -+ continue; -+ fi -+ -+ dir=`${DIRNAME} $x 2>/dev/null` -+ exclude=`echo ${dir} | ${GREP} /home` -+ if test "x$exclude" != "x"; then -+ continue -+ fi -+ -+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` -+ if test "x$already" = "x"; then -+ DIRS="$DIRS $dir" -+ fi -+ done -+fi -+ -+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" -+ -+ -+ -+if test "x$LOCATE" != "x"; then -+ DIRS= -+ file=libldap.a -+ -+ for x in `${LOCATE} $file 2>/dev/null`; do -+ base=`echo $x | sed "s%/${file}%%"` -+ if test "x$x" = "x$base"; then -+ continue; -+ fi -+ -+ dir=`${DIRNAME} $x 2>/dev/null` -+ exclude=`echo ${dir} | ${GREP} /home` -+ if test "x$exclude" != "x"; then -+ continue -+ fi -+ -+ already=`echo \$smart_lib_dir ${DIRS} | ${GREP} ${dir}` -+ if test "x$already" = "x"; then -+ DIRS="$DIRS $dir" -+ fi -+ done -+fi -+ -+eval "smart_lib_dir=\"\$smart_lib_dir $DIRS\"" -+ -+ -+ for try in $smart_lib_dir /usr/local/lib /opt/lib; do -+ LIBS="-L$try -lldap $old_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+extern char ldap_init(); -+int -+main () -+{ -+ ldap_init() -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then -+ smart_lib="-L$try -lldap" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ -+fi -+ -+rm -rf conftest.dSYM -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+ if test "x$smart_lib" != "x"; then -+ break; -+ fi -+ done -+ LIBS="$old_LIBS" -+fi -+ -+if test "x$smart_lib" != "x"; then -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } -+ eval "ac_cv_lib_${sm_lib_safe}_${sm_func_safe}=yes" -+ LIBS="$smart_lib $old_LIBS" -+ SMART_LIBS="$smart_lib $SMART_LIBS" -+else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } -+fi -+ -+ if test "x$ac_cv_lib_ldap_ldap_init" != "xyes"; then -+ fail="$fail libldap" -+ fi -+ fi -+ -+ -+ smart_try_dir=$rlm_ldap_include_dir -+ -+ -+ac_safe=`echo "ldap.h" | sed 'y%./+-%__pm%'` -+{ $as_echo "$as_me:$LINENO: checking for ldap.h" >&5 -+$as_echo_n "checking for ldap.h... " >&6; } -+ -+old_CFLAGS="$CFLAGS" -+smart_include= -+smart_include_dir= -+ -+if test "x$smart_try_dir" != "x"; then -+ for try in $smart_try_dir; do -+ CFLAGS="$old_CFLAGS -I$try" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include -+int -+main () -+{ -+ int a = 1; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ smart_include="-I$try" -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ smart_include= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ if test "x$smart_include" != "x"; then -+ break; -+ fi -+ done -+ CFLAGS="$old_CFLAGS" -+fi -+ -+if test "x$smart_include" = "x"; then -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include -+int -+main () -+{ -+ int a = 1; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ smart_include=" " -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ smart_include= -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+if test "x$smart_include" = "x"; then -+ -+ -+if test "x$LOCATE" != "x"; then -+ DIRS= -+ file=ldap.h -+ -+ for x in `${LOCATE} $file 2>/dev/null`; do -+ base=`echo $x | sed "s%/${file}%%"` -+ if test "x$x" = "x$base"; then -+ continue; -+ fi -+ -+ dir=`${DIRNAME} $x 2>/dev/null` -+ exclude=`echo ${dir} | ${GREP} /home` -+ if test "x$exclude" != "x"; then -+ continue -+ fi -+ -+ already=`echo \$smart_include_dir ${DIRS} | ${GREP} ${dir}` -+ if test "x$already" = "x"; then -+ DIRS="$DIRS $dir" -+ fi -+ done -+fi -+ -+eval "smart_include_dir=\"\$smart_include_dir $DIRS\"" -+ -+ -+ for try in $smart_include_dir /usr/local/include /opt/include; do -+ CFLAGS="$old_CFLAGS -I$try" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -3434,20 +4067,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - smart_include="-I$try" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - smart_include= -@@ -3462,14 +4096,14 @@ rm -f core conftest.err conftest.$ac_obj - fi - - if test "x$smart_include" != "x"; then -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } - eval "ac_cv_header_$ac_safe=yes" - CFLAGS="$old_CFLAGS $smart_include" - SMART_CFLAGS="$SMART_CFLAGS $smart_include" - else -- { echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } - fi - - if test "$ac_cv_header_ldap_h" != "yes"; then -@@ -3478,10 +4112,10 @@ fi - - - if test "x$fail" = "x"; then -- { echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5 --echo $ECHO_N "checking for ldap_start_tls_s... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ldap_start_tls_s" >&5 -+$as_echo_n "checking for ldap_start_tls_s... " >&6; } - if test "${ac_cv_func_ldap_start_tls_s+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3534,39 +4168,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_ldap_start_tls_s=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_ldap_start_tls_s=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5 --echo "${ECHO_T}$ac_cv_func_ldap_start_tls_s" >&6; } --if test $ac_cv_func_ldap_start_tls_s = yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_start_tls_s" >&5 -+$as_echo "$ac_cv_func_ldap_start_tls_s" >&6; } -+if test "x$ac_cv_func_ldap_start_tls_s" = x""yes; then - SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_START_TLS" - fi - -- { echo "$as_me:$LINENO: checking for ldap_initialize" >&5 --echo $ECHO_N "checking for ldap_initialize... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ldap_initialize" >&5 -+$as_echo_n "checking for ldap_initialize... " >&6; } - if test "${ac_cv_func_ldap_initialize+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3619,39 +4257,43 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_ldap_initialize=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_ldap_initialize=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5 --echo "${ECHO_T}$ac_cv_func_ldap_initialize" >&6; } --if test $ac_cv_func_ldap_initialize = yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_initialize" >&5 -+$as_echo "$ac_cv_func_ldap_initialize" >&6; } -+if test "x$ac_cv_func_ldap_initialize" = x""yes; then - SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INITIALIZE" - fi - -- { echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5 --echo $ECHO_N "checking for ldap_int_tls_config... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking for ldap_int_tls_config" >&5 -+$as_echo_n "checking for ldap_int_tls_config... " >&6; } - if test "${ac_cv_func_ldap_int_tls_config+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3704,32 +4346,36 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - ac_cv_func_ldap_int_tls_config=yes - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_ldap_int_tls_config=no - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5 --echo "${ECHO_T}$ac_cv_func_ldap_int_tls_config" >&6; } --if test $ac_cv_func_ldap_int_tls_config = yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_ldap_int_tls_config" >&5 -+$as_echo "$ac_cv_func_ldap_int_tls_config" >&6; } -+if test "x$ac_cv_func_ldap_int_tls_config" = x""yes; then - SMART_CFLAGS="$SMART_CFLAGS -DHAVE_LDAP_INT_TLS_CONFIG" - fi - -@@ -3738,11 +4384,11 @@ fi - - for ac_func in ldap_set_rebind_proc - do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --{ echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -+$as_echo_n "checking for $ac_func... " >&6; } - if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3795,44 +4441,51 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err -- } && test -s conftest$ac_exeext && -- $as_test_x conftest$ac_exeext; then -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then - eval "$as_ac_var=yes" - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" - fi - -+rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --ac_res=`eval echo '${'$as_ac_var'}'` -- { echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6; } --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ac_res=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+as_val=`eval 'as_val=${'$as_ac_var'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - -- { echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5 --echo $ECHO_N "checking whether ldap_set_rebind_proc takes 3 arguments... $ECHO_C" >&6; } -+ { $as_echo "$as_me:$LINENO: checking whether ldap_set_rebind_proc takes 3 arguments" >&5 -+$as_echo_n "checking whether ldap_set_rebind_proc takes 3 arguments... " >&6; } - if test "${ac_cv_ldap_set_rebind_proc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ $as_echo_n "(cached) " >&6 - else - - cat >conftest.$ac_ext <<_ACEOF -@@ -3858,20 +4511,21 @@ case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_ldap_set_rebind_proc=3 - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_ldap_set_rebind_proc=2 -@@ -3879,8 +4533,8 @@ fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5 --echo "${ECHO_T}$ac_cv_ldap_set_rebind_proc" >&6; } -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_ldap_set_rebind_proc" >&5 -+$as_echo "$ac_cv_ldap_set_rebind_proc" >&6; } - fi - - targetname=rlm_ldap -@@ -3891,21 +4545,21 @@ fi - - if test x"$fail" != x""; then - if test x"${enable_strict_dependencies}" = x"yes"; then -- { { echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5 --echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: set --without-rlm_ldap to disable it explicitly." >&5 -+$as_echo "$as_me: error: set --without-rlm_ldap to disable it explicitly." >&2;} - { (exit 1); exit 1; }; } - else -- { echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5 --echo "$as_me: WARNING: silently not building rlm_ldap." >&2;} -- { echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5 --echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: silently not building rlm_ldap." >&5 -+$as_echo "$as_me: WARNING: silently not building rlm_ldap." >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: FAILURE: rlm_ldap requires: $fail." >&5 -+$as_echo "$as_me: WARNING: FAILURE: rlm_ldap requires: $fail." >&2;} - if test x"$headersuggestion" != x; then -- { echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5 --echo "$as_me: WARNING: $headersuggestion" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $headersuggestion" >&5 -+$as_echo "$as_me: WARNING: $headersuggestion" >&2;} - fi - if test x"$libsuggestion" != x; then -- { echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5 --echo "$as_me: WARNING: $libsuggestion" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $libsuggestion" >&5 -+$as_echo "$as_me: WARNING: $libsuggestion" >&2;} - fi - targetname="" - fi -@@ -3966,11 +4620,12 @@ _ACEOF - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( -- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 --echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac -@@ -4003,12 +4658,12 @@ echo "$as_me: WARNING: Cache variable $a - if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && -- { echo "$as_me:$LINENO: updating cache $cache_file" >&5 --echo "$as_me: updating cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 --echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -4025,6 +4680,12 @@ test "x$exec_prefix" = xNONE && exec_pre - # take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. - ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear - :clear - s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -@@ -4054,7 +4715,7 @@ ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -- ac_i=`echo "$ac_i" | sed "$ac_script"` -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -@@ -4067,11 +4728,12 @@ LTLIBOBJS=$ac_ltlibobjs - - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -4084,7 +4746,7 @@ ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## -@@ -4094,7 +4756,7 @@ DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -@@ -4116,17 +4778,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' - else -- PATH_SEPARATOR=: -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' - fi -- rm -f conf$$.sh -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - # Support unset when possible. -@@ -4142,8 +4832,6 @@ fi - # there to prevent editors from complaining about space-tab. - # (If _AS_PATH_WALK were called with IFS unset, it would disable word - # splitting by setting IFS to empty value.) --as_nl=' --' - IFS=" "" $as_nl" - - # Find who we are. Look in the path if we contain no directory separator. -@@ -4166,7 +4854,7 @@ if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then -- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } - fi - -@@ -4179,17 +4867,10 @@ PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE - - # Required to use basename. - if expr a : '\(a\)' >/dev/null 2>&1 && -@@ -4211,7 +4892,7 @@ as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || --echo X/"$0" | -+$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q -@@ -4262,7 +4943,7 @@ $as_unset CDPATH - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems -@@ -4290,7 +4971,6 @@ case `echo -n x` in - *) - ECHO_N='-n';; - esac -- - if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -@@ -4303,19 +4983,22 @@ if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file - else - rm -f conf$$.dir -- mkdir conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- as_ln_s='ln -s' -- # ... but there are two gotchas: -- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -- # In both cases, we have to default to `cp -p'. -- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else - as_ln_s='cp -p' --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln -+ fi - else - as_ln_s='cp -p' - fi -@@ -4340,10 +5023,10 @@ else - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then -- test -d "$1/."; -+ test -d "$1/."; - else - case $1 in -- -*)set "./$1";; -+ -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi -@@ -4366,7 +5049,7 @@ exec 6>&1 - # values after options handling. - ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.61. Invocation command line was -+generated by GNU Autoconf 2.63. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -4379,26 +5062,33 @@ on `(hostname || uname -n) 2>/dev/null | - - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac -+ -+ -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - # Files that config.status was made for. - config_files="$ac_config_files" - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit -- -q, --quiet do not print progress messages -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files -@@ -4406,23 +5096,23 @@ $config_files - Report bugs to ." - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.61, -- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.63, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2006 Free Software Foundation, Inc. -+Copyright (C) 2008 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - - ac_pwd='$ac_pwd' - srcdir='$srcdir' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do -@@ -4444,21 +5134,24 @@ do - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -- echo "$ac_cs_version"; exit ;; -+ $as_echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" - ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) -- echo "$ac_cs_usage"; exit ;; -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { echo "$as_me: error: unrecognized option: $1 -+ -*) { $as_echo "$as_me: error: unrecognized option: $1 - Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -@@ -4477,30 +5170,32 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- CONFIG_SHELL=$SHELL -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' - export CONFIG_SHELL -- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ exec "\$@" - fi - - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - exec 5>>config.log - { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX - ## Running $as_me. ## - _ASBOX -- echo "$ac_log" -+ $as_echo "$ac_log" - } >&5 - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - - # Handling of arguments. - for ac_config_target in $ac_config_targets -@@ -4508,8 +5203,8 @@ do - case $ac_config_target in - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done -@@ -4548,114 +5243,143 @@ $debug || - (umask 077 && mkdir "$tmp") - } || - { -- echo "$me: cannot create a temporary directory in ." >&2 -+ $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --# --# Set up the sed scripts for CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. - if test -n "$CONFIG_FILES"; then - --_ACEOF - -+ac_cr=' ' -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF - - -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` - ac_delim='%!_!# ' - for ac_last_try in false false false false false :; do -- cat >conf$$subs.sed <<_ACEOF --SHELL!$SHELL$ac_delim --PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim --PACKAGE_NAME!$PACKAGE_NAME$ac_delim --PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim --PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim --PACKAGE_STRING!$PACKAGE_STRING$ac_delim --PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim --exec_prefix!$exec_prefix$ac_delim --prefix!$prefix$ac_delim --program_transform_name!$program_transform_name$ac_delim --bindir!$bindir$ac_delim --sbindir!$sbindir$ac_delim --libexecdir!$libexecdir$ac_delim --datarootdir!$datarootdir$ac_delim --datadir!$datadir$ac_delim --sysconfdir!$sysconfdir$ac_delim --sharedstatedir!$sharedstatedir$ac_delim --localstatedir!$localstatedir$ac_delim --includedir!$includedir$ac_delim --oldincludedir!$oldincludedir$ac_delim --docdir!$docdir$ac_delim --infodir!$infodir$ac_delim --htmldir!$htmldir$ac_delim --dvidir!$dvidir$ac_delim --pdfdir!$pdfdir$ac_delim --psdir!$psdir$ac_delim --libdir!$libdir$ac_delim --localedir!$localedir$ac_delim --mandir!$mandir$ac_delim --DEFS!$DEFS$ac_delim --ECHO_C!$ECHO_C$ac_delim --ECHO_N!$ECHO_N$ac_delim --ECHO_T!$ECHO_T$ac_delim --LIBS!$LIBS$ac_delim --build_alias!$build_alias$ac_delim --host_alias!$host_alias$ac_delim --target_alias!$target_alias$ac_delim --CC!$CC$ac_delim --CFLAGS!$CFLAGS$ac_delim --LDFLAGS!$LDFLAGS$ac_delim --CPPFLAGS!$CPPFLAGS$ac_delim --ac_ct_CC!$ac_ct_CC$ac_delim --EXEEXT!$EXEEXT$ac_delim --OBJEXT!$OBJEXT$ac_delim --edir!$edir$ac_delim --ldap_ldflags!$ldap_ldflags$ac_delim --ldap_cflags!$ldap_cflags$ac_delim --targetname!$targetname$ac_delim --LIBOBJS!$LIBOBJS$ac_delim --LTLIBOBJS!$LTLIBOBJS$ac_delim --_ACEOF -+ . ./conf$$subs.sh || -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then -- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi - done -+rm -f conf$$subs.sh - --ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` --if test -n "$ac_eof"; then -- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -- ac_eof=`expr $ac_eof + 1` --fi -- --cat >>$CONFIG_STATUS <<_ACEOF --cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end --_ACEOF --sed ' --s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g --s/^/s,@/; s/!/@,|#_!!_#|/ --:n --t n --s/'"$ac_delim"'$/,g/; t --s/$/\\/; p --N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n --' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF --:end --s/|#_!!_#|//g --CEOF$ac_eof -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && - _ACEOF -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -+$as_echo "$as_me: error: could not setup config files machinery" >&2;} -+ { (exit 1); exit 1; }; } -+_ACEOF - - # VPATH may cause trouble with some makes, so we remove $(srcdir), - # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -@@ -4672,19 +5396,21 @@ s/^[^=]*=[ ]*$// - }' - fi - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - fi # test -n "$CONFIG_FILES" - - --for ac_tag in :F $CONFIG_FILES -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag - do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 --echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -@@ -4713,26 +5439,38 @@ echo "$as_me: error: Invalid tag $ac_tag - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 --echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac -- ac_file_inputs="$ac_file_inputs $ac_f" -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ ac_file_inputs="$ac_file_inputs '$ac_f'" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -- configure_input="Generated from "`IFS=: -- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - - case $ac_tag in -- *:-:* | *:-) cat >"$tmp/stdin";; -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } ;; - esac - ;; - esac -@@ -4742,7 +5480,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || --echo X"$ac_file" | -+$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -4768,7 +5506,7 @@ echo X"$ac_file" | - as_dirs= - while :; do - case $as_dir in #( -- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" -@@ -4777,7 +5515,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || --echo X"$as_dir" | -+$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -4798,17 +5536,17 @@ echo X"$as_dir" | - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" -- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 --echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - - case "$ac_dir" in - .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. -- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -@@ -4844,12 +5582,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ - - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - # If the template does not know about datarootdir, expand it. - # FIXME: This hack should be removed a few years after 2.60. - ac_datarootdir_hack=; ac_datarootdir_seen= - --case `sed -n '/datarootdir/ { -+ac_sed_dataroot=' -+/datarootdir/ { - p - q - } -@@ -4858,13 +5597,14 @@ case `sed -n '/datarootdir/ { - /@infodir@/p - /@localedir@/p - /@mandir@/p --' $ac_file_inputs` in -+' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in - *datarootdir*) ac_datarootdir_seen=yes;; - *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 --echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g -@@ -4878,15 +5618,16 @@ _ACEOF - # Neutralize VPATH when `$srcdir' = `.'. - # Shell code in configure.ac might set extrasub. - # FIXME: do we really want to maintain this feature? --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s&@configure_input@&$configure_input&;t t -+s|@configure_input@|$ac_sed_conf_input|;t t - s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t - s&@srcdir@&$ac_srcdir&;t t - s&@abs_srcdir@&$ac_abs_srcdir&;t t - s&@top_srcdir@&$ac_top_srcdir&;t t -@@ -4895,21 +5636,28 @@ s&@builddir@&$ac_builddir&;t t - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - $ac_datarootdir_hack --" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - - test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 --echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in -- -) cat "$tmp/out"; rm -f "$tmp/out";; -- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; -- esac -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -+$as_echo "$as_me: error: could not create $ac_file" >&2;} -+ { (exit 1); exit 1; }; } - ;; - - -@@ -4924,6 +5672,11 @@ _ACEOF - chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -4945,5 +5698,9 @@ if test "$no_create" != yes; then - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } - fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} -+fi - - ---- a/src/modules/rlm_ldap/configure.in -+++ b/src/modules/rlm_ldap/configure.in -@@ -87,6 +87,9 @@ if test x$with_[]modname != xno; then - ) - fi - -+ FR_SMART_CHECK_LIB(sasl, sasl_encode) -+ FR_SMART_CHECK_LIB(lber, ber_init) -+ - dnl Try only "-lldap_r" or "-lldap" - dnl Static linking will probably not work, but nobody ever - dnl complained about it. diff --git a/net/freeradius2/patches/008-honor_ccpflags.patch b/net/freeradius2/patches/008-honor_ccpflags.patch deleted file mode 100644 index bb5f81a1a9..0000000000 --- a/net/freeradius2/patches/008-honor_ccpflags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/modules/rules.mak -+++ b/src/modules/rules.mak -@@ -63,10 +63,10 @@ $(LT_OBJS): $(SERVER_HEADERS) - # - ####################################################################### - %.lo: %.c -- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(RLM_CFLAGS) -c $< -+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< - - %.lo: %.cpp -- $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(RLM_CFLAGS) -c $< -+ $(LIBTOOL) --mode=compile $(CXX) $(CFLAGS) $(CPPFLAGS) $(RLM_CFLAGS) -c $< - - ifneq ($(TARGET),) - ####################################################################### diff --git a/net/freeradius2/patches/010-disbale-openssl-check.patch b/net/freeradius2/patches/010-disbale-openssl-check.patch deleted file mode 100644 index 7f63e667f6..0000000000 --- a/net/freeradius2/patches/010-disbale-openssl-check.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -831,35 +831,6 @@ if test "x$WITH_OPENSSL" = xyes; then - OPENSSL_INCLUDE="-DOPENSSL_NO_KRB5" - fi - -- dnl # -- dnl # Now check that the header versions match the library -- dnl # -- AC_MSG_CHECKING([OpenSSL library and header version consistency]) -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [[ -- #include -- #include -- #include -- ]], -- [[ -- if (SSLeay() == OPENSSL_VERSION_NUMBER) { -- return 0; -- } else { -- printf("library: %lx header: %lx... ", (unsigned long) SSLeay(), (unsigned long) OPENSSL_VERSION_NUMBER); -- return 1; -- } -- ]] -- )], -- [ -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- AC_MSG_FAILURE([OpenSSL library version does not match header version]) -- ] -- ) -- - if test "x$OPENSSL_LIBS" = x; then - LIBS=$old_LIBS - LDFLAGS="$old_LDFLAGS" -- 2.30.2