comparison configure.ac @ 29565:0b4ae43d7f1a

Standardize on AC_MSG_ERROR.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 08 Mar 2010 00:32:07 +0000
parents 9cb96fe7e414
children 013192509944
comparison
equal deleted inserted replaced
29551:80724c326423 29565:0b4ae43d7f1a
150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that 150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
151 dnl AM_GLIB_GNU_GETTEXT found it. 151 dnl AM_GLIB_GNU_GETTEXT found it.
152 152
153 if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x 153 if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x
154 then 154 then
155 AC_ERROR([ 155 AC_MSG_ERROR([
156 156
157 The msgfmt command is required to build libpurple. If it is installed 157 The msgfmt command is required to build libpurple. If it is installed
158 on your system, ensure that it is in your path. If it is not, install 158 on your system, ensure that it is in your path. If it is not, install
159 GNU gettext to continue. 159 GNU gettext to continue.
160 160
196 AC_LIBOBJ(getopt1) 196 AC_LIBOBJ(getopt1)
197 ]) 197 ])
198 198
199 dnl Check for inet_aton 199 dnl Check for inet_aton
200 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , 200 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
201 [AC_ERROR(inet_aton not found)])]) 201 [AC_MSG_ERROR([inet_aton not found])])])
202 AC_CHECK_LIB(resolv, __res_query) 202 AC_CHECK_LIB(resolv, __res_query)
203 AC_CHECK_LIB(nsl, gethostent) 203 AC_CHECK_LIB(nsl, gethostent)
204 AC_CHECK_FUNC(socket, , 204 AC_CHECK_FUNC(socket, ,
205 [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])]) 205 [AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
206 dnl If all goes well, by this point the previous two checks will have 206 dnl If all goes well, by this point the previous two checks will have
207 dnl pulled in -lsocket and -lnsl if we need them. 207 dnl pulled in -lsocket and -lnsl if we need them.
208 AC_CHECK_FUNC(getaddrinfo, 208 AC_CHECK_FUNC(getaddrinfo,
209 [AC_DEFINE([HAVE_GETADDRINFO], [1], 209 [AC_DEFINE([HAVE_GETADDRINFO], [1],
210 [Define to 1 if you have the getaddrinfo function.])], 210 [Define to 1 if you have the getaddrinfo function.])],
2284 AM_CONDITIONAL(USE_CYRUS_SASL, true) 2284 AM_CONDITIONAL(USE_CYRUS_SASL, true)
2285 AC_DEFINE(HAVE_CYRUS_SASL, [1], [Define to 1 if Cyrus SASL is present]) 2285 AC_DEFINE(HAVE_CYRUS_SASL, [1], [Define to 1 if Cyrus SASL is present])
2286 SASL_LIBS=-"lsasl2" 2286 SASL_LIBS=-"lsasl2"
2287 ], [ 2287 ], [
2288 AM_CONDITIONAL(USE_CYRUS_SASL, false) 2288 AM_CONDITIONAL(USE_CYRUS_SASL, false)
2289 AC_ERROR(Cyrus SASL library not found) 2289 AC_MSG_ERROR([Cyrus SASL library not found])
2290 ]) 2290 ])
2291 else 2291 else
2292 AM_CONDITIONAL(USE_CYRUS_SASL, false) 2292 AM_CONDITIONAL(USE_CYRUS_SASL, false)
2293 fi 2293 fi
2294 2294
2317 LDFLAGS="$LDFLAGS $KRB4_LDFLAGS" 2317 LDFLAGS="$LDFLAGS $KRB4_LDFLAGS"
2318 AC_CHECK_LIB(krb4, krb_rd_req, 2318 AC_CHECK_LIB(krb4, krb_rd_req,
2319 [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"], 2319 [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
2320 [AC_CHECK_LIB(krb, krb_rd_req, 2320 [AC_CHECK_LIB(krb, krb_rd_req,
2321 [KRB4_LIBS="-lkrb -ldes"], 2321 [KRB4_LIBS="-lkrb -ldes"],
2322 [AC_ERROR(Kerberos 4 libraries not found)], 2322 [AC_MSG_ERROR([Kerberos 4 libraries not found])],
2323 -ldes)], 2323 -ldes)],
2324 -ldes425 -lkrb5 -lk5crypto -lcom_err) 2324 -ldes425 -lkrb5 -lk5crypto -lcom_err)
2325 orig_LIBS="$LIBS" 2325 orig_LIBS="$LIBS"
2326 LIBS="$LIBS $KRB4_LIBS" 2326 LIBS="$LIBS $KRB4_LIBS"
2327 AC_CHECK_FUNCS(krb_set_key krb_rd_req krb_get_lrealm) 2327 AC_CHECK_FUNCS(krb_set_key krb_rd_req krb_get_lrealm)
2351 AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") 2351 AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno")
2352 orig_LDFLAGS="$LDFLAGS" 2352 orig_LDFLAGS="$LDFLAGS"
2353 LDFLAGS="$LDFLAGS $ZEPHYR_LDFLAGS" 2353 LDFLAGS="$LDFLAGS $ZEPHYR_LDFLAGS"
2354 AC_CHECK_LIB(zephyr, ZInitialize, 2354 AC_CHECK_LIB(zephyr, ZInitialize,
2355 [ZEPHYR_LIBS="-lzephyr"], 2355 [ZEPHYR_LIBS="-lzephyr"],
2356 [AC_ERROR(Zephyr libraries not found)], 2356 [AC_MSG_ERROR([Zephyr libraries not found])],
2357 -lzephyr) 2357 -lzephyr)
2358 orig_LIBS="$LIBS" 2358 orig_LIBS="$LIBS"
2359 LIBS="$orig_LIBS" 2359 LIBS="$orig_LIBS"
2360 LDFLAGS="$orig_LDFLAGS" 2360 LDFLAGS="$orig_LDFLAGS"
2361 fi 2361 fi