Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 404099
Collapse All | Expand All

(-)configure.in.orig (-32 / +64 lines)
Lines 368-374 Link Here
368
#fi
368
#fi
369
#DAG_VERSION_NUM=$dag_drv_v
369
#DAG_VERSION_NUM=$dag_drv_v
370
370
371
have_ncurses=yes
372
371
373
# Checks for various "optional" libraries
372
# Checks for various "optional" libraries
374
AC_CHECK_LIB(z, deflate, have_zlib=1, have_zlib=0)
373
AC_CHECK_LIB(z, deflate, have_zlib=1, have_zlib=0)
Lines 381-387 Link Here
381
LIBS=
380
LIBS=
382
381
383
# These libraries have to be explicitly linked in OpenSolaris
382
# These libraries have to be explicitly linked in OpenSolaris
384
AC_SEARCH_LIBS(getservent, socket, have_socket=1, have_socket=0, -lnsl)		
383
AC_SEARCH_LIBS(getservent, socket, have_socket=1, have_socket=0, -lnsl)
385
LIBS=
384
LIBS=
386
385
387
AC_SEARCH_LIBS(inet_ntop, nsl, have_nsl=1, have_nsl=0, -lsocket)
386
AC_SEARCH_LIBS(inet_ntop, nsl, have_nsl=1, have_nsl=0, -lsocket)
Lines 399-430 Link Here
399
	LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_dlopen"
398
	LIBPKTDUMP_LIBS="$LIBPKTDUMP_LIBS $ac_cv_search_dlopen"
400
fi
399
fi
401
400
402
403
if test "$have_zlib" = 1; then
404
	LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
405
	AC_DEFINE(HAVE_LIBZ, 1, [Set to 1 if zlib is supported])
406
fi
407
408
if test "$have_bzip" = 1; then
409
	LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
410
	AC_DEFINE(HAVE_LIBBZ2, 1, [Set to 1 if bzip2 is supported])
411
fi
412
413
if test "$have_lzo" = 1; then
414
	LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
415
	AC_DEFINE(HAVE_LIBLZO2, 1, [Set to 1 if lzo2 is supported])
416
fi
417
418
if test "$have_pthread" = 1; then
401
if test "$have_pthread" = 1; then
419
	LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
402
	LIBTRACE_LIBS="$LIBTRACE_LIBS -lpthread"
420
	AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
403
	AC_DEFINE(HAVE_LIBPTHREAD, 1, [Set to 1 if pthreads are supported])
421
fi
404
fi
422
405
423
if test "$have_ncurses" = "yes"; then
424
	if test "$ac_cv_search_mvprintw" != "none required"; then
425
		TOOLS_LIBS="$TOOLS_LIBS $ac_cv_search_mvprintw"
426
	fi
427
fi
428
406
429
if test "$have_nsl" = 1; then
407
if test "$have_nsl" = 1; then
430
	if test "$ac_cv_search_inet_ntop" != "none required"; then
408
	if test "$ac_cv_search_inet_ntop" != "none required"; then
Lines 445-451 Link Here
445
# just set libs to null here to avoid linking against them by default
423
# just set libs to null here to avoid linking against them by default
446
LIBS=
424
LIBS=
447
425
448
449
# For now, the user has to explicitly ask for the LLVM stuff, as it's a bit
426
# For now, the user has to explicitly ask for the LLVM stuff, as it's a bit
450
# rough around the edges :(
427
# rough around the edges :(
451
AC_ARG_WITH([llvm],
428
AC_ARG_WITH([llvm],
Lines 489-507 Link Here
489
	fi
466
	fi
490
fi
467
fi
491
468
469
AC_ARG_WITH([ncurses],
470
	[AC_HELP_STRING([--with-ncurses],
471
		[build tracetop (requires ncurses)])])
472
AS_IF([test "x$with_ncurses" = "xyes"], [
473
		if test "$have_ncurses" -a "$ac_cv_search_mvprintw" != "none required"; then
474
				TOOLS_LIBS="$TOOLS_LIBS $ac_cv_search_mvprintw"
475
				HAVE_NCURSES=1
476
				with_ncurses=yes
477
		else
478
			HAVE_NCURSES=0
479
			with_ncurses=no
480
		fi
481
])
482
AM_CONDITIONAL([HAVE_NCURSES], [test "$HAVE_NCURSES"])
483
484
AC_ARG_WITH([bzip2],
485
	[AC_HELP_STRING([--with-bzip2],
486
		[build support for bzip2 compressed file])])
487
AS_IF([test "x$with_bzip2" = "xyes"], [
488
		if test "$have_bzip" -a "$ac_cv_lib_bz2_BZ2_bzDecompressInit" != "none required"; then
489
				LIBTRACE_LIBS="$LIBTRACE_LIBS -lbz2"
490
				HAVE_LIBBZ2=1
491
				with_bzip2=yes
492
		else
493
			HAVE_LIBBZ2=0
494
			with_bzip2=no
495
		fi
496
])
497
AM_CONDITIONAL([HAVE_BZLIB], [test "$HAVE_LIBBZ2"])
498
499
AC_ARG_WITH([zlib],
500
	[AC_HELP_STRING([--with-zlib],
501
		[build support for zlib compressed file])]])
502
AS_IF([test "x$with_zlib" = "xyes"], [
503
		if test "$have_zlib" -a "$ac_cv_lib_z_deflate" != "none required"; then
504
				LIBTRACE_LIBS="$LIBTRACE_LIBS -lz"
505
				HAVE_LIBZ=1
506
				with_zlib=yes
507
		else
508
			HAVE_LIBZ=0
509
			with_zlib=no
510
		fi
511
])
512
AM_CONDITIONAL([HAVE_ZLIB], [test "$HAVE_LIBZ"])
513
514
AC_ARG_WITH([lzo],
515
	[AC_HELP_STRING([--with-lzo],
516
		[build support for lzo compression (only for write)])])
517
AS_IF([test "x$with_lzo" = "xyes"], [
518
		if test "$have_lzo" -a "$ac_cv_lib_lzo2_lzo1x_1_compress" != "none required"; then
519
				LIBTRACE_LIBS="$LIBTRACE_LIBS -llzo2"
520
				HAVE_LIBLZO2=1
521
				with_lzo=yes
522
		else
523
				HAVE_LIBLZO2=0
524
				with_lzo=no
525
		fi
526
])
527
AM_CONDITIONAL([HAVE_LZO], [ test "$HAVE_LIBLZO2"])
492
528
493
# Define automake conditionals for use in our Makefile.am files
529
# Define automake conditionals for use in our Makefile.am files
494
AM_CONDITIONAL([HAVE_BPF_CAPTURE], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
530
AM_CONDITIONAL([HAVE_BPF_CAPTURE], [test "$ac_cv_have_decl_BIOCSETIF" = yes ])
495
AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
531
AM_CONDITIONAL([HAVE_DAG], [test "$libtrace_dag" = true])
496
AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24])
532
AM_CONDITIONAL([DAG2_4], [test "$libtrace_dag_version" = 24])
497
AM_CONDITIONAL([DAG2_5], [test "$libtrace_dag_version" = 25])
533
AM_CONDITIONAL([DAG2_5], [test "$libtrace_dag_version" = 25])
498
AM_CONDITIONAL([HAVE_ZLIB], [test "$have_zlib" = 1])
499
AM_CONDITIONAL([HAVE_BZLIB], [test "$have_bzip" = 1])
500
AM_CONDITIONAL([HAVE_LZO], [test "$have_lzo" = 1])
501
AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
534
AM_CONDITIONAL([HAVE_NETPACKET_PACKET_H], [test "$libtrace_netpacket_packet_h" = true])
502
AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
535
AM_CONDITIONAL([HAVE_LIBGDC], [test "$ac_cv_header_gdc_h" = yes])
503
AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
536
AM_CONDITIONAL([HAVE_LLVM], [test "x$JIT" != "xno" ])
504
AM_CONDITIONAL([HAVE_NCURSES], [test "x$have_ncurses" = "xyes"])
505
537
506
# Check for miscellaneous programs
538
# Check for miscellaneous programs
507
AC_CHECK_PROG([libtrace_doxygen], [doxygen], [true], [false])
539
AC_CHECK_PROG([libtrace_doxygen], [doxygen], [true], [false])
Lines 552-560 Link Here
552
	AC_MSG_NOTICE([Compiled with PCAP support: < 1.0])
584
	AC_MSG_NOTICE([Compiled with PCAP support: < 1.0])
553
fi
585
fi
554
586
555
reportopt "Compiled with compressed trace (zlib) support" $ac_cv_lib_z_deflate
587
reportopt "Compiled with compressed trace (zlib) support" $with_zlib
556
reportopt "Compiled with compressed trace (bz2) support" $ac_cv_lib_bz2_BZ2_bzDecompressInit
588
reportopt "Compiled with compressed trace (bz2) support" $with_bzip2
557
reportopt "Compiled with compressed trace (lzo write only) support" $ac_cv_lib_lzo2_lzo1x_1_compress
589
reportopt "Compiled with compressed trace (lzo write only) support" $with_lzo
558
if test x"$libtrace_dag" = xtrue; then
590
if test x"$libtrace_dag" = xtrue; then
559
	if test "$libtrace_dag_version" = 24; then
591
	if test "$libtrace_dag_version" = 24; then
560
		AC_MSG_NOTICE([Compiled with DAG live capture support: 2.4])
592
		AC_MSG_NOTICE([Compiled with DAG live capture support: 2.4])
Lines 568-574 Link Here
568
fi
600
fi
569
reportopt "Compiled with LLVM BPF JIT support" $JIT
601
reportopt "Compiled with LLVM BPF JIT support" $JIT
570
reportopt "Building man pages/documentation" $libtrace_doxygen
602
reportopt "Building man pages/documentation" $libtrace_doxygen
571
reportopt "Building tracetop (requires libncurses)" $have_ncurses
603
reportopt "Building tracetop (requires libncurses)" $with_ncurses
572
604
573
# Report any errors relating to missing bison, flex, etc.
605
# Report any errors relating to missing bison, flex, etc.
574
echo 
606
echo 

Return to bug 404099