Mercurial > hg > xemacs-beta

comparison configure.ac @ 5724:ede80ef92a74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make soft links in src for module source files, if built in to the executable. This ensures that those files are built with the same compiler flags as all other source files. See these xemacs-beta messages: <CAHCOHQn+q=Xuwq+y68dvqi7afAP9f-TdB7=8YiZ8VYO816sjHg@mail.gmail.com> <f5by5ejqiyk.fsf@calexico.inf.ed.ac.uk>
author Jerry James <james@xemacs.org>
date Sat, 02 Mar 2013 14:32:37 -0700
parents dede3f658f8e
children 1af0602ff9a2
comparison
equal deleted inserted replaced
5722:fffa15138019 5724:ede80ef92a74
3611 fi 3611 fi
3612 XE_PREPEND(-lldap, ldap_libs) 3612 XE_PREPEND(-lldap, ldap_libs)
3613 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs" 3613 save_LIBS="$LIBS" LIBS="$LIBS $ldap_libs"
3614 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) 3614 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
3615 LIBS="$save_LIBS" 3615 LIBS="$save_LIBS"
3616 XE_APPEND(modules/ldap, MAKE_SUBDIR)
3617 need_modules_common=yes
3618 if test "$with_modules" = "yes"; then 3616 if test "$with_modules" = "yes"; then
3617 XE_APPEND(modules/ldap, MAKE_SUBDIR)
3619 XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR) 3618 XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR)
3619 else
3620 mkdir src
3621 for fil in eldap.c eldap.h; do
3622 ${LN_S} "$srcdir/modules/ldap/$fil" "src/$fil"
3623 done
3620 fi 3624 fi
3621 fi 3625 fi
3622 AC_SUBST(ldap_libs) 3626 AC_SUBST(ldap_libs)
3623 3627
3624 dnl Autodetect PostgreSQL 3628 dnl Autodetect PostgreSQL
3662 AC_CHECK_LIB(pq,PQconnectStart, [ 3666 AC_CHECK_LIB(pq,PQconnectStart, [
3663 with_postgresqlv7=yes; 3667 with_postgresqlv7=yes;
3664 AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs) 3668 AC_DEFINE(HAVE_POSTGRESQLV7)], [:], $extra_libs)
3665 AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file") 3669 AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
3666 XE_PREPEND([$pq_libs], postgresql_libs) 3670 XE_PREPEND([$pq_libs], postgresql_libs)
3667 XE_APPEND(modules/postgresql, MAKE_SUBDIR)
3668 need_modules_common=yes
3669 if test "$with_modules" = "yes"; then 3671 if test "$with_modules" = "yes"; then
3672 XE_APPEND(modules/postgresql, MAKE_SUBDIR)
3670 XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR) 3673 XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
3674 else
3675 mkdir src
3676 for fil in postgresql.c postgresql.h; do
3677 ${LN_S} "$srcdir/modules/postgresql/$fil" "src/$fil"
3678 done
3671 fi 3679 fi
3672 elif test "$with_postgresql" = "yes"; then 3680 elif test "$with_postgresql" = "yes"; then
3673 XE_DIE("Required PostgreSQL support cannot be provided. Check --with-site-prefixes.") 3681 XE_DIE("Required PostgreSQL support cannot be provided. Check --with-site-prefixes.")
3674 fi 3682 fi
3675 fi 3683 fi
4338 test "$have_canna" = "yes" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],have_canna=no) } 4346 test "$have_canna" = "yes" && { AC_CHECK_LIB(RKC, RkBgnBun, [:],have_canna=no) }
4339 test "$have_canna" = "yes" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],have_canna=no) } 4347 test "$have_canna" = "yes" && { AC_CHECK_LIB(canna,jrKanjiControl,[:],have_canna=no) }
4340 if test "$have_canna" = "yes"; then 4348 if test "$have_canna" = "yes"; then
4341 AC_DEFINE(HAVE_CANNA) 4349 AC_DEFINE(HAVE_CANNA)
4342 test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE) 4350 test -n "$canna_wchar_aware" && AC_DEFINE(CANNA_NEW_WCHAR_AWARE)
4343 XE_APPEND(modules/canna, MAKE_SUBDIR)
4344 need_modules_common=yes
4345 if test "$with_modules" = "yes"; then 4351 if test "$with_modules" = "yes"; then
4352 XE_APPEND(modules/canna, MAKE_SUBDIR)
4346 XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR) 4353 XE_APPEND(modules/canna, INSTALL_ARCH_DEP_SUBDIR)
4354 else
4355 mkdir src
4356 ${LN_S} "$srcdir/modules/canna/canna_api.c" "src/canna_api.c"
4347 fi 4357 fi
4348 XE_PREPEND(-lcanna -lRKC, canna_libs) 4358 XE_PREPEND(-lcanna -lRKC, canna_libs)
4349 elif test "$with_canna" != "no"; then 4359 elif test "$with_canna" != "no"; then
4350 AC_MSG_WARN([Canna configuration failed. If you expected success, 4360 AC_MSG_WARN([Canna configuration failed. If you expected success,
4351 maybe you need --with-site-prefixes=/usr/local/canna?]) 4361 maybe you need --with-site-prefixes=/usr/local/canna?])