rename configure option 'enable-alternate-addrbook' to 'enable-alternate-addressbook'
This commit is contained in:
parent
225ab1ccaf
commit
c388fc69bf
22
configure.ac
22
configure.ac
|
@ -275,9 +275,9 @@ AC_ARG_ENABLE(valgrind,
|
|||
[ --disable-valgrind Do not build valgrind support for debugging],
|
||||
[enable_valgrind=$enableval], [enable_valgrind=yes])
|
||||
|
||||
AC_ARG_ENABLE(alternate-addrbook,
|
||||
[ --enable-alternate-addrbook Build alternate external address book support],
|
||||
[enable_alternate_addrbook=$enableval], [enable_alternate_addrbook=no])
|
||||
AC_ARG_ENABLE(alternate-addressbook,
|
||||
[ --enable-alternate-addressbook Build alternate external address book support],
|
||||
[enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
|
||||
|
||||
AC_ARG_ENABLE(gtk3,
|
||||
[ --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
|
||||
AC_MSG_RESULT([yes])
|
||||
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])
|
||||
PKG_CHECK_MODULES(CONTACTS, [claws-contacts],
|
||||
[
|
||||
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_LIBS)
|
||||
],
|
||||
[
|
||||
enable_alternate_addrbook=no
|
||||
enable_alternate_addressbook=no
|
||||
])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
enable_alternate_addrbook=no
|
||||
enable_alternate_addressbook=no
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
enable_alternate_addrbook=no
|
||||
enable_alternate_addressbook=no
|
||||
fi
|
||||
|
||||
dnl #######################################################################
|
||||
dnl # Check for old address book support
|
||||
dnl #######################################################################
|
||||
if test x"$enable_alternate_addrbook" = xno; then
|
||||
if test x"$enable_alternate_addressbook" = xno; then
|
||||
dnl for LDAP support in addressbook
|
||||
dnl no check for libraries; dynamically loaded
|
||||
AC_MSG_CHECKING([whether to use LDAP])
|
||||
|
@ -817,7 +817,7 @@ if test x"$enable_alternate_addrbook" = xno; then
|
|||
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 # Check for NetworkManager support
|
||||
|
@ -1925,7 +1925,7 @@ dnl Output the configuration summary
|
|||
echo ""
|
||||
echo "$PACKAGE $VERSION"
|
||||
echo ""
|
||||
if test x"$enable_alternate_addrbook" = xyes; then
|
||||
if test x"$enable_alternate_addressbook" = xyes; then
|
||||
echo "Using Address Book : Alternate experimental interface"
|
||||
else
|
||||
echo "Using Address Book : Original stable interface"
|
||||
|
|
Loading…
Reference in a new issue