waf: Fix com_err detection with MIT krb5.

Signed-off-by: Simo Sorce <idra@samba.org>
Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Fri May  4 18:43:05 CEST 2012 on sn-devel-104

diff --git a/wscript_configure_krb5 b/wscript_configure_krb5
index 4dbf2aee592fdd26417fc9207b20308b0faa235b..9a2fe1b66c9220e243770d1fb80f1db3d861f251 100644 (file)
--- a/wscript_configure_krb5
+++ b/wscript_configure_krb5
@@ -3,6 +3,10 @@ import Logs, Options
 # Check for kerberos
 have_gssapi=False
 
+conf.check_cfg(args="--cflags --libs", package="com_err", uselib_store="com_err")
+conf.CHECK_FUNCS_IN('_et_list', 'com_err')
+conf.CHECK_HEADERS('com_err.h', lib='com_err')
+
 Logs.info("Looking for kerberos features")
 conf.find_program('krb5-config.heimdal', var='HEIMDAL_KRB5_CONFIG')
 conf.find_program('krb5-config', var='KRB5_CONFIG')
@@ -16,12 +20,11 @@ if conf.env.KRB5_CONFIG:
         del conf.env.HEIMDAL_KRB5_CONFIG
 
 conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
-conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h', lib='krb5')
+conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h', lib='krb5')
 
 if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
     conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
 
-conf.CHECK_FUNCS_IN('_et_list', 'com_err')
 conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
 conf.CHECK_FUNCS_IN('des_set_key','crypto')
 conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')