pidgin: ae62d71f: Standardize on AC_MSG_ERROR.
qulogic at pidgin.im
qulogic at pidgin.im
Wed Mar 10 00:26:12 EST 2010
-----------------------------------------------------------------
Revision: ae62d71f355ef0e45c96f35d7a17292c70e48a91
Ancestor: 787f7fde86bbd0028625e43d9b661df27b8ad4ee
Author: qulogic at pidgin.im
Date: 2010-03-08T00:32:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ae62d71f355ef0e45c96f35d7a17292c70e48a91
Modified files:
configure.ac
ChangeLog:
Standardize on AC_MSG_ERROR.
-------------- next part --------------
============================================================
--- configure.ac 0abb3043874f984e33d4c15860a687eac2af874b
+++ configure.ac 40839d2f3e7a5050157163a568299938c059bfd5
@@ -152,7 +152,7 @@ then
if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
then
- AC_ERROR([
+ AC_MSG_ERROR([
The msgfmt command is required to build libpurple. If it is installed
on your system, ensure that it is in your path. If it is not, install
@@ -198,11 +198,11 @@ AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB
dnl Check for inet_aton
AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
- [AC_ERROR(inet_aton not found)])])
+ [AC_MSG_ERROR([inet_aton not found])])])
AC_CHECK_LIB(resolv, __res_query)
AC_CHECK_LIB(nsl, gethostent)
AC_CHECK_FUNC(socket, ,
- [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
+ [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
dnl If all goes well, by this point the previous two checks will have
dnl pulled in -lsocket and -lnsl if we need them.
AC_CHECK_FUNC(getaddrinfo,
@@ -2286,7 +2286,7 @@ if test "x$enable_cyrus_sasl" = "xyes" ;
SASL_LIBS=-"lsasl2"
], [
AM_CONDITIONAL(USE_CYRUS_SASL, false)
- AC_ERROR(Cyrus SASL library not found)
+ AC_MSG_ERROR([Cyrus SASL library not found])
])
else
AM_CONDITIONAL(USE_CYRUS_SASL, false)
@@ -2319,7 +2319,7 @@ if test "$kerberos" != "no" ; then
[KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
[AC_CHECK_LIB(krb, krb_rd_req,
[KRB4_LIBS="-lkrb -ldes"],
- [AC_ERROR(Kerberos 4 libraries not found)],
+ [AC_MSG_ERROR([Kerberos 4 libraries not found])],
-ldes)],
-ldes425 -lkrb5 -lk5crypto -lcom_err)
orig_LIBS="$LIBS"
@@ -2353,7 +2353,7 @@ if test "$zephyr" != "no" ; then
LDFLAGS="$LDFLAGS $ZEPHYR_LDFLAGS"
AC_CHECK_LIB(zephyr, ZInitialize,
[ZEPHYR_LIBS="-lzephyr"],
- [AC_ERROR(Zephyr libraries not found)],
+ [AC_MSG_ERROR([Zephyr libraries not found])],
-lzephyr)
orig_LIBS="$LIBS"
LIBS="$orig_LIBS"
More information about the Commits
mailing list