gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename configure option 'enable-alternate-addrbook' to 'enable-alternate-addressbook'

Browse source
This commit is contained in:
Paul 2015-12-07 10:48:51 +00:00
parent 225ab1ccaf
commit c388fc69bf
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure.ac
View file

@ -275,9 +275,9 @@ AC_ARG_ENABLE(valgrind,
[ --disable-valgrind Do not build valgrind support for debugging], [ --disable-valgrind Do not build valgrind support for debugging],
[enable_valgrind=$enableval], [enable_valgrind=yes]) [enable_valgrind=$enableval], [enable_valgrind=yes])
AC_ARG_ENABLE(alternate-addrbook, AC_ARG_ENABLE(alternate-addressbook,
[ --enable-alternate-addrbook Build alternate external address book support], [ --enable-alternate-addressbook Build alternate external address book support],
[enable_alternate_addrbook=$enableval], [enable_alternate_addrbook=no]) [enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
AC_ARG_ENABLE(gtk3, AC_ARG_ENABLE(gtk3,
[ --enable-gtk3 Build GTK3 support], [ --enable-gtk3 Build GTK3 support],
@ -687,31 +687,31 @@ AC_MSG_CHECKING([whether DBUS support for alternate address book is present])
if test x"$enable_dbus_glib" = xyes; then if test x"$enable_dbus_glib" = xyes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether to enable alternate address book]) AC_MSG_CHECKING([whether to enable alternate address book])
if test x"$enable_alternate_addrbook" = xyes; then if test x"$enable_alternate_addressbook" = xyes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES(CONTACTS, [claws-contacts], PKG_CHECK_MODULES(CONTACTS, [claws-contacts],
[ [
AC_DEFINE(USE_ALT_ADDRBOOK, 1, [Define if alternate address book is to be activated.]) AC_DEFINE(USE_ALT_ADDRBOOK, 1, [Define if alternate address book is to be activated.])
enable_alternate_addrbook=yes enable_alternate_addressbook=yes
AC_SUBST(CONTACTS_CFLAGS) AC_SUBST(CONTACTS_CFLAGS)
AC_SUBST(CONTACTS_LIBS) AC_SUBST(CONTACTS_LIBS)
], ],
[ [
enable_alternate_addrbook=no enable_alternate_addressbook=no
]) ])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
enable_alternate_addrbook=no enable_alternate_addressbook=no
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
enable_alternate_addrbook=no enable_alternate_addressbook=no
fi fi
dnl ####################################################################### dnl #######################################################################
dnl # Check for old address book support dnl # Check for old address book support
dnl ####################################################################### dnl #######################################################################
if test x"$enable_alternate_addrbook" = xno; then if test x"$enable_alternate_addressbook" = xno; then
dnl for LDAP support in addressbook dnl for LDAP support in addressbook
dnl no check for libraries; dynamically loaded dnl no check for libraries; dynamically loaded
AC_MSG_CHECKING([whether to use LDAP]) AC_MSG_CHECKING([whether to use LDAP])
@ -817,7 +817,7 @@ if test x"$enable_alternate_addrbook" = xno; then
fi fi
fi fi
AM_CONDITIONAL(BUILD_ALTADDRBOOK, test x"$enable_alternate_addrbook" = x"yes") AM_CONDITIONAL(BUILD_ALTADDRBOOK, test x"$enable_alternate_addressbook" = x"yes")
dnl ####################################################################### dnl #######################################################################
dnl # Check for NetworkManager support dnl # Check for NetworkManager support
@ -1925,7 +1925,7 @@ dnl Output the configuration summary
echo "" echo ""
echo "$PACKAGE $VERSION" echo "$PACKAGE $VERSION"
echo "" echo ""
if test x"$enable_alternate_addrbook" = xyes; then if test x"$enable_alternate_addressbook" = xyes; then
echo "Using Address Book : Alternate experimental interface" echo "Using Address Book : Alternate experimental interface"
else else
echo "Using Address Book : Original stable interface" echo "Using Address Book : Original stable interface"