From b2c9da8feff7ac653fc488301141f87d0399a531 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Sun, 30 Dec 2012 22:47:03 +0000 Subject: [PATCH] Fix the AC_CHECK_PLUGIN_SUPPORT configure macro so that it matches FreeBSD-1.* instead of FreeBSD-1*, which fixes building with plugins on FreeBSD-10. Also a similar fix for the FreeBSD-2.* case. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@217 13b04d17-f746-0410-82c6-800466cd88b0 --- Changelog | 2 ++ aclocal.m4 | 7 ++----- configure | 14 ++++---------- macros/pluginsupport.m4 | 7 ++----- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Changelog b/Changelog index 84cd4b6..876fe47 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,7 @@ [Changes 1.2c01] +* Fix building plugins on FreeBSD-10. (caf) + * Messages sent to channels should use lastlog level PUBLIC, not MSG. (caf) * panasync OK'd releasing tcl.c, so here it is. (caf) diff --git a/aclocal.m4 b/aclocal.m4 index dba5faf..f640e1a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1344,14 +1344,11 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT, SHLIB_LD="ld -shared" fi ;; - FreeBSD-1*) + FreeBSD-1.*) dnl It sucks that I to have to do this. AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version) ;; - FreeBSD-2.2*) - SHLIB_LD="ld -Bshareable" - ;; - FreeBSD-2*) + FreeBSD-2.*) SHLIB_LD="ld -Bshareable" ;; FreeBSD*) diff --git a/configure b/configure index 8e6173d..9fc4caf 100755 --- a/configure +++ b/configure @@ -14756,15 +14756,12 @@ echo "${ECHO_T}$ac_cv_system_version" >&6 SHLIB_LD="ld -shared" fi ;; - FreeBSD-1*) + FreeBSD-1.*) { { echo "$as_me:$LINENO: error: sorry" >&5 echo "$as_me: error: sorry" >&2;} { (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; } ;; - FreeBSD-2.2*) - SHLIB_LD="ld -Bshareable" - ;; - FreeBSD-2*) + FreeBSD-2.*) SHLIB_LD="ld -Bshareable" ;; FreeBSD*) @@ -16242,15 +16239,12 @@ echo "${ECHO_T}$ac_cv_system_version" >&6 SHLIB_LD="ld -shared" fi ;; - FreeBSD-1*) + FreeBSD-1.*) { { echo "$as_me:$LINENO: error: sorry" >&5 echo "$as_me: error: sorry" >&2;} { (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; } ;; - FreeBSD-2.2*) - SHLIB_LD="ld -Bshareable" - ;; - FreeBSD-2*) + FreeBSD-2.*) SHLIB_LD="ld -Bshareable" ;; FreeBSD*) diff --git a/macros/pluginsupport.m4 b/macros/pluginsupport.m4 index c8c5c3b..546acf6 100644 --- a/macros/pluginsupport.m4 +++ b/macros/pluginsupport.m4 @@ -63,14 +63,11 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT, SHLIB_LD="ld -shared" fi ;; - FreeBSD-1*) + FreeBSD-1.*) dnl It sucks that I to have to do this. AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version) ;; - FreeBSD-2.2*) - SHLIB_LD="ld -Bshareable" - ;; - FreeBSD-2*) + FreeBSD-2.*) SHLIB_LD="ld -Bshareable" ;; FreeBSD*)