projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge r21-4-12-chise-0_21-pre9-for-libchise-b1.
[chise/xemacs-chise.git.1]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
8c1d0df
..
bdfc910
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2939,7
+2939,7
@@
if test "$with_msw" != "no"; then
fi
install_pp="$blddir/lib-src/installexe.sh"
fi
install_pp="$blddir/lib-src/installexe.sh"
- XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool, libs_system)
+ XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lkernel32 -lwinspool, libs_system)
test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
if test "$window_system" != x11; then
window_system=msw
test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
if test "$window_system" != x11; then
window_system=msw
@@
-3723,7
+3723,8
@@
if test "$with_mule" = "yes" ; then
test -z "$with_chise" && with_chise=yes
if test "$with_chise" = "yes"; then
test -z "$with_chise" && with_chise=yes
if test "$with_chise" = "yes"; then
- AC_DEFINE(CHISE)
+ AC_DEFINE(HAVE_CHISE)
+ AC_DEFINE(HAVE_LIBCHISE)
XE_PREPEND(-lchise, libs_x)
fi
XE_PREPEND(-lchise, libs_x)
fi
@@
-4470,8
+4471,8
@@
if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no"; then
AC_DEFINE(HAVE_DATABASE)
XE_ADD_OBJS(database.o)
!= "no no no"; then
AC_DEFINE(HAVE_DATABASE)
XE_ADD_OBJS(database.o)
- if test "$with_utf_2000" = "yes"; then
- AC_DEFINE(HAVE_CHISE_CLIENT)
+ if test "$with_utf_2000" = "yes" -a "$with_chise" != "yes" ; then
+ AC_DEFINE(HAVE_CHISE)
fi
fi
fi
fi