with_xfs | \
with_i18n3 | \
with_mule | \
- with_utf_2000 | \
- with_chise | \
- with_text_coding| \
with_file_coding| \
with_canna | \
with_wnn | \
with_workshop | \
with_sparcworks | \
with_tooltalk | \
- with_concord | \
with_ldap | \
with_postgresql | \
with_pop | \
dnl XEmacs supported mingw and cygnus have made this incompatible change
dnl so we just go with the flow.
case "$opsys" in mingw* | cygwin*)
- cygwin_include=`eval "gcc -print-file-name=libc.a"` ;
- cygwin_include=`eval "dirname $cygwin_include"` ;
- cygwin_include="-I$cygwin_include/../include" ;
+ cygwin_include=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_include=`eval "cd $cygwin_include/../../../..; pwd"`
+ cygwin_include="-I$cygwin_include/include" ;
extra_includes="$cygwin_include/mingw $cygwin_include" ;
case "$opsys" in mingw*)
XE_APPEND($extra_includes, c_switch_system) ;;
echo "Setting ldap_libs to $ldap_libs"],dnl
[AC_CHECK_LIB(ldap, ldap_open,dnl
[with_ldap=yes],dnl
+dnl If logic of setting these vars change, change it the same way below.
[ldap_needs_lber=yes ldap_other_libs=-llber
dnl This requires `AC_CACHE_VAL' (which is called by `AC_CHECK_LIB')
dnl to be redefined to ignore cached (shell variable) value, as it is
$ldap_other_libs)],dnl
$ldap_other_libs)],dnl
$ldap_other_libs)])
+ if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
+dnl Need this check since `LDAP_OPT_ON' is (currently) used only with
+dnl `ldap_set_option', and the latter may not exist at all, for which
+dnl is testing later. So `LDAP_OPT_ON' is not necessarily defined.
+ AC_CACHE_CHECK([for LDAP_OPT_ON definition],xe_cv_have_LDAP_OPT_ON,
+ [AC_TRY_COMPILE(
+[#include <lber.h>
+#include <ldap.h>
+#ifdef LDAP_OPT_ON
+/* Relying on const defined by ac_c_const (upper case). */
+const void *const v = LDAP_OPT_ON;
+#else /* !defined (LDAP_OPT_ON) */
+choke me
+#endif /* !defined (LDAP_OPT_ON) */],[],
+ [xe_cv_have_LDAP_OPT_ON=yes],
+ [xe_cv_have_LDAP_OPT_ON=no])])
+ if test yes = "$xe_cv_have_LDAP_OPT_ON";then
+ AC_CACHE_CHECK([LDAP_OPT_ON linking],
+ xe_cv_LDAP_OPT_ON_links,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $LIBS"
+AC_TRY_LINK(
+[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;],[],
+ xe_cv_LDAP_OPT_ON_links=yes,
+ xe_cv_LDAP_OPT_ON_links=no)
+ LIBS="$xe_save_LIBS"])
+dnl In some openldap installations other `ldap_*' functions link with
+dnl `-lldap' alone, but `LDAP_OPT_ON' requires `-llber'.
+ if test yes != "$xe_cv_LDAP_OPT_ON_links";then
+ ldap_needs_lber=yes ldap_other_libs=-llber
+ AC_CACHE_CHECK([LDAP_OPT_ON linking with -llber],
+ xe_cv_LDAP_OPT_ON_links_w_lber,
+ [xe_save_LIBS="$LIBS"
+ LIBS="-lldap $ldap_other_libs $LIBS"
+AC_TRY_LINK(
+[#include <lber.h>
+#include <ldap.h>
+const void *const v = LDAP_OPT_ON;],[],
+ xe_cv_LDAP_OPT_ON_links_w_lber=yes,
+ xe_cv_LDAP_OPT_ON_links_w_lber=no)
+ LIBS="$xe_save_LIBS"])
+ if test yes != "$xe_cv_LDAP_OPT_ON_links_w_lber";then
+ with_ldap=no
+ fi
+ fi
+ fi
+ fi
if test yes = "$with_ldap";then
if test yes = "$ldap_needs_des";then
XE_PREPEND(-ldes, ldap_libs)
dnl -- should only happen if CYGWIN && WITH_XPM && WITH_MSW && !WITH_X
libpath_xpm=
incpath_xpm=
+ libname_xpm="-lXpm"
case "$opsys" in
cygwin*)
- cygwin_top=`eval "gcc -print-file-name=libc.a"` ;
- cygwin_top=`eval "dirname ${cygwin_top}"`;
- cygwin_top="${cygwin_top}/..";
+ cygwin_top=`eval gcc -print-search-dirs | sed -ne s'/install: //p'`
+ cygwin_top=`eval "cd $cygwin_top/../../../..; pwd"`
case "$window_system" in
dnl use "standard" search pattern
x11) ;;
dnl hardcode "standard" non-X11 xpm lib/inc dirs
msw) libpath_xpm="-L${cygwin_top}/lib/noX"
incpath_xpm="-I${cygwin_top}/include/noX"
+ libname_xpm="-lXpm-noX"
;;
dnl not supported on cygwin (yet?)
gtk) ;;
XE_PREPEND("$incpath_xpm", CFLAGS)
XE_PREPEND("$libpath_xpm", LDFLAGS)
AC_MSG_CHECKING(for Xpm - no older than 3.4f)
- xe_check_libs=-lXpm
+ xe_check_libs="$libname_xpm"
AC_TRY_RUN([#define XPM_NUMBERS
#include <X11/xpm.h>
int main(int c, char **v) {
dnl #### but doesn't actually verify this assumption.
AC_DEFINE(HAVE_XPM)
XE_PREPEND("$libpath_xpm", LDFLAGS)
- XE_PREPEND(-lXpm, libs_x)
+ XE_PREPEND("$libname_xpm", libs_x)
XE_PREPEND("$incpath_xpm", CFLAGS)
AC_MSG_CHECKING(for \"FOR_MSW\" xpm)
- xe_check_libs=-lXpm
+ xe_check_libs="$libname_xpm"
AC_TRY_LINK(, [XpmCreatePixmapFromData()],
[xpm_for_msw=no],
[xpm_for_msw=yes])
XE_ADD_OBJS(file-coding.o)
fi
-dnl Autodetect concord
-concord_includes_found=no
-if test "$with_concord" != "no"; then
- AC_CHECK_HEADER(concord.h, ,with_concord=no)
-fi
-if test "$concord_includes_found" = "no" -a "$with_concord" != "no" -a \
- -d "/usr/local/concord/include"; then
- save_c_switch_site="$c_switch_site"
- c_switch_site="$c_switch_site -I/usr/local/concord/include"
- AC_CHECK_HEADER(concord.h,concord_includes_found=yes)
- if test "$concord_includes_found" != "yes"; then
- c_switch_site="$save_c_switch_site"
- with_concord="no"
- fi
-fi
-
-test -z "$with_concord" && with_concord=yes
-if test "$with_concord" = "yes"; then
- AC_DEFINE(HAVE_CONCORD)
- XE_PREPEND(-lconcord, libs_x)
- XE_ADD_OBJS(concord.o)
-fi
-
-test -z "$with_chise" && with_chise=yes
-if test "$with_chise" = "yes"; then
- with_mule=yes
- with_utf_2000=yes
- with_text_coding=yes
-fi
-
if test "$with_mule" = "yes" ; then
AC_CHECKING(for Mule-related features)
AC_DEFINE(MULE)
-
- dnl Autodetect chise
- chise_includes_found=no
- if test "$with_chise" != "no"; then
- AC_CHECK_HEADER(chise.h, ,with_chise=no)
- fi
- if test "$chise_includes_found" = "no" -a "$with_chise" != "no" -a \
- -d "/usr/local/chise/include"; then
- save_c_switch_site="$c_switch_site"
- c_switch_site="$c_switch_site -I/usr/local/chise/include"
- AC_CHECK_HEADER(chise.h,chise_includes_found=yes)
- if test "$chise_includes_found" != "yes"; then
- c_switch_site="$save_c_switch_site"
- with_chise="no"
- fi
- fi
-
- test -z "$with_chise" && with_chise=yes
- if test "$with_chise" = "yes"; then
- AC_DEFINE(HAVE_CHISE)
- AC_DEFINE(HAVE_LIBCHISE)
- XE_PREPEND(-lchise, libs_x)
- fi
-
AC_DEFINE(FILE_CODING)
- XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o)
- if test "$with_utf_2000" = "yes" && test "$with_text_coding" = "yes"; then
- AC_DEFINE(TEXT_CODING)
- XE_ADD_OBJS(text-coding.o)
- else
- XE_ADD_OBJS(file-coding.o)
- fi
+ XE_ADD_OBJS(mule.o mule-ccl.o mule-charset.o file-coding.o)
+
dnl Use -lintl to get internationalized strerror for Mule
AC_CHECK_HEADERS(libintl.h)
AC_CHECK_LIB(intl, strerror)
- if test "$with_utf_2000" = "yes" ; then
- AC_DEFINE(CHAR_IS_UCS4)
- AC_DEFINE(UTF2000)
- with_wnn=no
- with_wnn6=no
- fi
-
AC_CHECKING(for Mule input methods)
dnl Do we have the XmIm* routines? And if so, do we want to use them?
dnl XIM seems to be flaky except on Solaris...
!= "no no no"; then
AC_DEFINE(HAVE_DATABASE)
XE_ADD_OBJS(database.o)
- if test "$with_utf_2000" = "yes" -a "$with_chise" != "yes" ; then
- AC_DEFINE(HAVE_CHISE)
- fi
fi
dnl Socks support
echo " - Using PostgreSQL header file: $libpq_fe_h_file"
test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7 bindings."
fi
-if test "$with_concord" = yes; then
- echo " Compiling in support for CONCORD."
-fi
echo "
-Multiscriptization / Multilingualization / Internationalization:"
+Internationalization:"
test "$with_mule" = yes && echo " Compiling in support for Mule (multi-lingual Emacs)."
-test "$with_chise" = yes && echo " Using CHISE (CHaracter Information Service Environment) support."
-test "$with_utf_2000" = yes && echo " Using UTF-2000 (UTF-8) buffer/string representation."
-test "$with_text_coding" = yes && echo " Compiling in support for text coding."
test "$with_file_coding" = yes && echo " Compiling in support for file coding."
test "$with_xim" != no && echo " Compiling in support for XIM (X11R5+ I18N input method)."
test "$with_xim" = motif && echo " - Using Motif to provide XIM support."
projects / chise / xemacs-chise.git.1 / blobdiff