diff options
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/PYUtil.h | 34 |
3 files changed, 2 insertions, 76 deletions
diff --git a/configure.ac b/configure.ac index 190f1fc..e0feed6 100644 --- a/configure.ac +++ b/configure.ac @@ -71,32 +71,6 @@ LIBPINYIN_DATADIR=`$PKG_CONFIG --variable=pkgdatadir libpinyin` AC_SUBST(LIBPINYIN_DATADIR) -# check uuid -AC_CHECK_FUNCS([uuid_create], [], [ - PKG_CHECK_MODULES(LIBUUID, uuid, [ - # uuid.pc exist - AC_DEFINE(HAVE_LIBUUID, 1, [Define if found libuuid]) - HAVE_LIBUUID=yes - ], [ - # uuid.pc does not exist - uuid_old_LIBS=$LIBS - AC_CHECK_HEADERS(uuid/uuid.h, [ - AC_SEARCH_LIBS(uuid_generate, uuid, [ - test x"$ac_cv_search_uuid_generate" != x"none required" && LIBUUID_LIBS=$ac_cv_search_uuid_generate - AC_DEFINE(HAVE_LIBUUID, 1, [Define if found libuuid]) - HAVE_LIBUUID=yes - ], [ - AC_MSG_ERROR([Can not find uuid_create and uuid_generate in libc or libuuid]) - ]) - ], [ - AC_MSG_ERROR([Can not find uuid_create and uuid_generate in libc or libuuid]) - ]) - LIBS=$uuid_old_LIBS - ]) -]) - -AM_CONDITIONAL(HAVE_LIBUUID, test x"$HAVE_LIBUUID" = x"yes") - # check if ibus_config_get_values, which is available in ibus-1.3.99+ (git master) save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" diff --git a/src/Makefile.am b/src/Makefile.am index 3224d8b..087957c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,19 +18,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# @MAINTAINER_MODE_FALSE@skip_gentable=test -f $@ || - -# AM_CFLAGS = \ -# @IBUS_CFLAGS@ \ -# @SQLITE_CFLAGS@ \ -# -DPKGDATADIR=\"$(pkgdatadir)\" \ -# $(NULL) -# AM_CXXFLAGS = $(AM_CFLAGS) -# AM_LDADD = \ -# @IBUS_LIBS@ \ -# @SQLITE_LIBS@ \ -# $(NULL) -# libexec_PROGRAMS = ibus-engine-libpinyin ibus_engine_libpinyin_built_c_sources = \ @@ -144,11 +131,6 @@ ibus_engine_libpinyin_LDADD = \ @OPENCC_LIBS@ \ $(NULL) -if HAVE_LIBUUID -ibus_engine_libpinyin_CXXFLAGS += $(LIBUUID_CFLAGS) -ibus_engine_libpinyin_LDADD += $(LIBUUID_LIBS) -endif - ibus_engine_libpinyin_CXXFLAGS += \ -DLIBPINYIN_DATADIR=\"@LIBPINYIN_DATADIR@\/data\" \ $(NULL) diff --git a/src/PYUtil.h b/src/PYUtil.h index 46b0116..9d3b365 100644 --- a/src/PYUtil.h +++ b/src/PYUtil.h @@ -25,13 +25,7 @@ # include <config.h> #endif -#if defined(HAVE_UUID_CREATE) -# include <uuid.h> -#elif defined(HAVE_LIBUUID) -# include <uuid/uuid.h> -#endif -#include <sys/utsname.h> #include <cstdlib> #include <string> @@ -89,32 +83,7 @@ scmshm_test (guint modifiers, guint mask) return scmshm_filter (modifiers) == mask; } -class UUID { -public: - UUID (void) - { - uuid_t u; -#if defined(HAVE_UUID_CREATE) - gchar* uuid; - uuid_create (&u, 0); - uuid_to_string (&u, &uuid, 0); - g_strlcpy (m_uuid, uuid, sizeof(m_uuid)); - free(uuid); -#elif defined(HAVE_LIBUUID) - uuid_generate (u); - uuid_unparse_lower (u, m_uuid); -#endif - } - - operator const gchar * (void) const - { - return m_uuid; - } - -private: - gchar m_uuid[256]; -}; - +#if 0 class Uname { public: Uname (void) @@ -149,6 +118,7 @@ public: return c_str(); } }; +#endif }; #endif |