Author: iratqq
Date: Tue Dec 25 00:24:50 2007
New Revision: 5066
Modified:
trunk/uim/Makefile.am
trunk/uim/uim-notify.c
trunk/uim/uim-notify.h
trunk/uim/uim-util.c
Log:
* uim/uim-notify.h, uim/uim-notify.c, uim/uim-util.c
: add UIM_NOTIFY_INTERNAL guard.
* uim/Makefile.am (pkginclude_HEADERS): install uim-notify.h
Modified: trunk/uim/Makefile.am
==============================================================================
--- trunk/uim/Makefile.am (original)
+++ trunk/uim/Makefile.am Tue Dec 25 00:24:50 2007
@@ -39,7 +39,7 @@
pkginclude_HEADERS = uim-scm.h uim-scm-abbrev.h uim.h \
uim-util.h plugin.h \
uim-helper.h uim-im-switcher.h \
- uim-custom.h
+ uim-custom.h uim-notify.h
pkginclude_HEADERS += bsdlook.h
libuim_la_SOURCES = \
Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c (original)
+++ trunk/uim/uim-notify.c Tue Dec 25 00:24:50 2007
@@ -49,6 +49,8 @@
#include "uim-scm.h"
#include "uim-scm-abbrev.h"
#include "uim-internal.h"
+
+#define UIM_NOTIFY_INTERNAL
#include "uim-notify.h"
#ifndef HAVE_DLFUNC
Modified: trunk/uim/uim-notify.h
==============================================================================
--- trunk/uim/uim-notify.h (original)
+++ trunk/uim/uim-notify.h Tue Dec 25 00:24:50 2007
@@ -21,10 +21,11 @@
extern "C" {
#endif
+#ifdef UIM_NOTIFY_INTERNAL
+#define NOTIFY_PLUGIN_PATH LIBDIR "/uim/notify"
#define NOTIFY_PLUGIN_PREFIX "libuimnotify-"
#define NOTIFY_PLUGIN_SUFFIX ".so"
-
-#define NOTIFY_PLUGIN_PATH LIBDIR "/uim/notify"
+#endif
int uim_notify_load(const char *);
int uim_notify_init(void);
Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c (original)
+++ trunk/uim/uim-util.c Tue Dec 25 00:24:50 2007
@@ -45,6 +45,8 @@
#include "uim-scm.h"
#include "uim-scm-abbrev.h"
#include "uim-util.h"
+
+#define UIM_NOTIFY_INTERNAL
#include "uim-notify.h"
static uim_lisp protected;
