← Back to branch summary

~jtaylor/ubuntu/oneiric/bitlbee/fix-879730

« back to all changes in this revision

Viewing changes to configure

  • Committer: Bazaar Package Importer
  • Author(s): Wilmer van der Gaast
  • Date: 2009-11-19 23:02:43 UTC
  • mfrom: (3.2.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091119230243-h9jb4iqat2v5l5ia
Tags: 1.2.4-2
http://bugs.debian.org/551775
* Merging in some changes from bzr-head:
* Use libresolv.so where possible. (Closes: #551775)
* Some include file changes that make the bitlbee-dev package useful again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure
266
266
 
267
267
detect_ldap()
268
268
{
269
 
        TMPFILE=`mktemp`
 
269
        TMPFILE=$(mktemp)
270
270
        if $CC -o $TMPFILE -shared -lldap 2>/dev/null >/dev/null; then
271
271
                cat<<EOF>>Makefile.settings
272
272
EFLAGS+=-lldap
281
281
        fi
282
282
}
283
283
 
 
284
RESOLV_TESTCODE='
 
285
#include <arpa/nameser.h>
 
286
#include <resolv.h> 
 
287
 
 
288
int main()
 
289
{
 
290
        ns_initparse( NULL, 0, NULL );
 
291
        ns_parserr( NULL, ns_s_an, 0, NULL );
 
292
}
 
293
'
 
294
 
 
295
detect_resolv_dynamic()
 
296
{
 
297
        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -lresolv >/dev/null 2>/dev/null
 
298
        if [ "$?" = "0" ]; then
 
299
                echo 'EFLAGS+=-lresolv' >> Makefile.settings
 
300
                return 0
 
301
        fi
 
302
 
 
303
        return 1
 
304
}
 
305
 
 
306
detect_resolv_static()
 
307
{
 
308
        for i in $systemlibdirs; do
 
309
                if [ -f $i/libresolv.a ]; then
 
310
                        echo "$RESOLV_TESTCODE" | $CC -o /dev/null -x c - -Wl,$i/libresolv.a >/dev/null 2>/dev/null
 
311
                        if [ "$?" = "0" ]; then
 
312
                                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
 
313
                                return 0
 
314
                        fi
 
315
                fi
 
316
        done
 
317
 
 
318
        return 1
 
319
}
 
320
 
284
321
if [ "$ssl" = "auto" ]; then
285
322
        detect_gnutls
286
323
        if [ "$ret" = "0" ]; then
348
385
 
349
386
echo 'SSL_CLIENT=ssl_'$ssl'.o' >> Makefile.settings
350
387
 
351
 
for i in $systemlibdirs; do
352
 
        if [ -f $i/libresolv.a ]; then
353
 
                echo '#define HAVE_RESOLV_A' >> config.h
354
 
                echo 'EFLAGS+='$i'/libresolv.a' >> Makefile.settings
355
 
                break
356
 
        fi
357
 
done
 
388
if detect_resolv_dynamic || detect_resolv_static; then
 
389
        echo '#define HAVE_RESOLV_A' >> config.h
 
390
fi
358
391
 
359
392
STORAGES="text xml"
360
393