luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable lxt support if libbzip2 is not found. 

Configure was checking for libbzip2, but it was not doing anything with
the result. This patch disables lxt support if libbzip2 is not found.
This commit is contained in:
Cary R 2007-09-16 11:23:19 -07:00 committed by Stephen Williams
parent 230d0f24de
commit 3543c0605c
4 changed files with 14 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -56,9 +56,12 @@ AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
AC_SUBST(HAVE_LIBZ)
if test "$WIN32" = "yes"; then
AC_CHECK_LIB(bz2, main)
AC_CHECK_LIB(bz2, main, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
else
AC_CHECK_LIB(bz2, BZ2_bzdopen)
AC_CHECK_LIB(bz2, BZ2_bzdopen, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
fi
AC_SUBST(HAVE_LIBBZ2)
AC_MSG_CHECKING(for sys/times)
AC_TRY_LINK(

5
vpi/Makefile.in
View File

@ -66,7 +66,10 @@ sys_readmem.o sys_readmem_lex.o sys_scanf.o \
sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o priv.o stringheap.o
ifeq (@HAVE_LIBZ@,yes)
O += sys_lxt.o lxt_write.o sys_lxt2.o lxt2_write.o
ifeq (@HAVE_LIBBZ2@,yes)
O += sys_lxt.o lxt_write.o
endif
O += sys_lxt2.o lxt2_write.o
endif
LIBS = @LIBS@

3
vpi/configure.in
View File

@ -35,9 +35,12 @@ AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
AC_SUBST(HAVE_LIBZ)
if test "$WIN32" = "yes"; then
AC_CHECK_LIB(bz2, main)
AC_CHECK_LIB(bz2, main, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
else
AC_CHECK_LIB(bz2, BZ2_bzdopen)
AC_CHECK_LIB(bz2, BZ2_bzdopen, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
fi
AC_SUBST(HAVE_LIBBZ2)
# --
# Look for a dl library to use. First look for the standard dlopen

55
vpi/sys_table.c
View File

@ -41,7 +41,11 @@ extern void sys_vcd_register();
extern void sys_vcdoff_register();
#ifdef HAVE_LIBZ
#ifdef HAVE_LIBBZ2
extern void sys_lxt_register();
#else
static void sys_lxt_register() { fputs("LXT support disabled since libbzip2 not available\n",stderr); exit(1); }
#endif
extern void sys_lxt2_register();
#else
static void sys_lxt_register() { fputs("LXT support disabled since zlib not available\n",stderr); exit(1); }
@ -157,54 +161,3 @@ void (*vlog_startup_routines[])() = {
0
};
/*
* $Log: sys_table.c,v $
* Revision 1.26 2006/08/03 05:06:04 steve
* Add the scanf functions.
*
* Revision 1.25 2004/06/09 22:14:10 steve
* Move Mersenne Twister to $mti_random, and make
* the standard $random standard. Also, add $dist_poisson.
*
* Revision 1.24 2004/01/21 01:22:53 steve
* Give the vip directory its own configure and vpi_config.h
*
* Revision 1.23 2003/10/30 04:52:54 steve
* Call register for fileio functions.
*
* Revision 1.22 2003/09/13 01:28:47 steve
* Disable lxt when zlib is missing.
*
* Revision 1.21 2003/09/01 04:04:03 steve
* Add lxt2 support.
*
* Revision 1.20 2003/03/07 02:44:34 steve
* Implement $realtobits.
*
* Revision 1.19 2003/03/06 20:04:42 steve
* Add means to suppress wveform output
*
* Revision 1.18 2003/02/20 00:50:06 steve
* Update lxt_write implementation, and add compression control flags.
*
* Revision 1.17 2002/08/12 01:35:05 steve
* conditional ident string using autoconfig.
*
* Revision 1.16 2002/04/07 04:37:53 steve
* Add $plusargs system functions.
*
* Revision 1.15 2002/04/06 21:33:29 steve
* allow runtime selection of VCD vs LXT.
*
* Revision 1.14 2002/03/09 21:54:49 steve
* Add LXT dumper support. (Anthony Bybell)
*
* Revision 1.13 2001/09/30 16:45:10 steve
* Fix some Cygwin DLL handling. (Venkat Iyer)
*
* Revision 1.12 2001/07/25 03:10:50 steve
* Create a config.h.in file to hold all the config
* junk, and support gcc 3.0. (Stephan Boettcher)
*/