diff options
| author | Benedikt Meurer <benny@xfce.org> | 2004-07-24 17:28:16 +0000 |
|---|---|---|
| committer | Benedikt Meurer <benny@xfce.org> | 2004-07-24 17:28:16 +0000 |
| commit | cf4e7d081e3995b6d24f80e05ed06d3816ef6b15 (patch) | |
| tree | 9bae0bc15ed6a07227385b169c94312a72b60ba7 /m4 | |
| parent | af3275a83c6b10cc731bb75475755dc143371dd8 (diff) | |
| download | xfce4-panel-cf4e7d081e3995b6d24f80e05ed06d3816ef6b15.tar.gz | |
Extended the XFCE_PANEL_PLUGIN macro to include some magic for threaded panels.
(Old svn revision: 4084)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/depends.m4 | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/m4/depends.m4 b/m4/depends.m4 index c5548199..e4b296e1 100644 --- a/m4/depends.m4 +++ b/m4/depends.m4 @@ -40,6 +40,17 @@ AC_DEFUN([XFCE_PANEL_PLUGIN], [ BM_DEPEND([$1], [xfce4-panel-1.0], [$2]) + dnl Check if the panel is threaded + ac_CFLAGS=$$1_CFLAGS + AC_MSG_CHECKING([whether the panel is threaded]) + if $PKG_CONFIG --atleast-version=4.1.8 xfce4-panel-1.0; then + $1_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_THREADED=1 -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\) -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)" + AC_MSG_RESULT([yes]) + else + $1_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\) -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)" + AC_MSG_RESULT([no]) + fi + dnl Check where to put the plugins to AC_ARG_WITH([pluginsdir], AC_HELP_STRING([--with-pluginsdir=DIR], [Install plugins dir DIR]), @@ -50,19 +61,3 @@ AC_HELP_STRING([--with-pluginsdir=DIR], [Install plugins dir DIR]), AC_SUBST([$1_PLUGINSDIR]) AC_MSG_RESULT([$$1_PLUGINSDIR]) ]) - -dnl -dnl XFCE_MCS_PLUGIN(var, version) -dnl -dnl sets $var_CFLAGS, $var_LIBS and $var_PLUGINSDIR -dnl -AC_DEFUN([XFCE_MCS_PLUGIN], -[ - BM_DEPEND([$1], [xfce-mcs-manager], [$2]) - - dnl Check where to put the plugins to - AC_MSG_CHECKING([where to install MCS plugins]) - $1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce-mcs-manager` - AC_SUBST([$1_PLUGINSDIR]) - AC_MSG_RESULT([$$1_PLUGINSDIR]) -]) |