Revision: 7401
Author: nogu.dev
Date: Sun Jan 8 23:05:25 2012
Log: * configure.ac
- Revert r7400.
* gtk2/candwin/Makefile.am
- (uim_candwin_horizontal_gtk_LDADD): Add "-lm" to avoid link error.
http://code.google.com/p/uim/source/detail?r=7401
Modified:
/trunk/configure.ac
/trunk/gtk2/candwin/Makefile.am
=======================================
--- /trunk/configure.ac Sun Jan 8 06:24:34 2012
+++ /trunk/configure.ac Sun Jan 8 23:05:25 2012
@@ -824,13 +824,11 @@
yes|*)
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0,
use_gtk2="yes",use_gtk2="no")
PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0,
use_gtk2_4="yes",use_gtk2_4="no")
- AC_CHECK_LIB(m, floor)
;;
esac
],
[ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0,
use_gtk2="yes",use_gtk2="no")
- PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0,
use_gtk2_4="yes",use_gtk2_4="no")
- AC_CHECK_LIB(m, floor)])
+ PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0,
use_gtk2_4="yes",use_gtk2_4="no") ])
AC_ARG_ENABLE(gnome-applet,
AC_HELP_STRING([--disable-gnome-applet],
=======================================
--- /trunk/gtk2/candwin/Makefile.am Fri Jun 17 02:17:18 2011
+++ /trunk/gtk2/candwin/Makefile.am Sun Jan 8 23:05:25 2012
@@ -21,7 +21,7 @@
../immodule/caret-state-indicator.c \
../immodule/caret-state-indicator.h
uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@
$(top_builddir)/uim/libuim-scm.la \
- $(top_builddir)/uim/libuim.la
+ $(top_builddir)/uim/libuim.la -lm
uim_candwin_horizontal_gtk_CPPFLAGS = -I$(top_srcdir)
uim_candwin_horizontal_gtk_CFLAGS = @GTK2_CFLAGS@
endif
