tallship
/
bitchx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Kevin Easton 2012-12-30 22:47:03 +00:00
parent 1541299fa1
commit b2c9da8fef
4 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -1,5 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Fix building plugins on FreeBSD-10. (caf)
* Messages sent to channels should use lastlog level PUBLIC, not MSG. (caf) * Messages sent to channels should use lastlog level PUBLIC, not MSG. (caf)
* panasync OK'd releasing tcl.c, so here it is. (caf) * panasync OK'd releasing tcl.c, so here it is. (caf)

7
aclocal.m4 vendored
View File

@ -1344,14 +1344,11 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT,
SHLIB_LD="ld -shared" SHLIB_LD="ld -shared"
fi fi
;; ;;
FreeBSD-1*) FreeBSD-1.*)
dnl It sucks that I to have to do this. dnl It sucks that I to have to do this.
AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version) AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version)
;; ;;
FreeBSD-2.2*) FreeBSD-2.*)
SHLIB_LD="ld -Bshareable"
;;
FreeBSD-2*)
SHLIB_LD="ld -Bshareable" SHLIB_LD="ld -Bshareable"
;; ;;
FreeBSD*) FreeBSD*)

14
configure vendored
View File

@ -14756,15 +14756,12 @@ echo "${ECHO_T}$ac_cv_system_version" >&6
SHLIB_LD="ld -shared" SHLIB_LD="ld -shared"
fi fi
;; ;;
FreeBSD-1*) FreeBSD-1.*)
{ { echo "$as_me:$LINENO: error: sorry" >&5 { { echo "$as_me:$LINENO: error: sorry" >&5
echo "$as_me: error: sorry" >&2;} echo "$as_me: error: sorry" >&2;}
{ (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; } { (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; }
;; ;;
FreeBSD-2.2*) FreeBSD-2.*)
SHLIB_LD="ld -Bshareable"
;;
FreeBSD-2*)
SHLIB_LD="ld -Bshareable" SHLIB_LD="ld -Bshareable"
;; ;;
FreeBSD*) FreeBSD*)
@ -16242,15 +16239,12 @@ echo "${ECHO_T}$ac_cv_system_version" >&6
SHLIB_LD="ld -shared" SHLIB_LD="ld -shared"
fi fi
;; ;;
FreeBSD-1*) FreeBSD-1.*)
{ { echo "$as_me:$LINENO: error: sorry" >&5 { { echo "$as_me:$LINENO: error: sorry" >&5
echo "$as_me: error: sorry" >&2;} echo "$as_me: error: sorry" >&2;}
{ (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; } { (exit no plugins on $ac_cv_system_version); exit no plugins on $ac_cv_system_version; }; }
;; ;;
FreeBSD-2.2*) FreeBSD-2.*)
SHLIB_LD="ld -Bshareable"
;;
FreeBSD-2*)
SHLIB_LD="ld -Bshareable" SHLIB_LD="ld -Bshareable"
;; ;;
FreeBSD*) FreeBSD*)

7
macros/pluginsupport.m4
View File

@ -63,14 +63,11 @@ AC_DEFUN(AC_CHECK_PLUGIN_SUPPORT,
SHLIB_LD="ld -shared" SHLIB_LD="ld -shared"
fi fi
;; ;;
FreeBSD-1*) FreeBSD-1.*)
dnl It sucks that I to have to do this. dnl It sucks that I to have to do this.
AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version) AC_MSG_ERROR(sorry, no plugins on $ac_cv_system_version)
;; ;;
FreeBSD-2.2*) FreeBSD-2.*)
SHLIB_LD="ld -Bshareable"
;;
FreeBSD-2*)
SHLIB_LD="ld -Bshareable" SHLIB_LD="ld -Bshareable"
;; ;;
FreeBSD*) FreeBSD*)