Disable lxt when zlib is missing.
This commit is contained in:
parent
178847fc53
commit
1c51e1787c
|
|
@ -52,6 +52,8 @@ AC_LANG_CPLUSPLUS
|
||||||
AC_CHECK_HEADERS(getopt.h malloc.h libiberty.h iosfwd sys/wait.h)
|
AC_CHECK_HEADERS(getopt.h malloc.h libiberty.h iosfwd sys/wait.h)
|
||||||
|
|
||||||
AC_CHECK_LIB(z, gzwrite)
|
AC_CHECK_LIB(z, gzwrite)
|
||||||
|
AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
|
||||||
|
AC_SUBST(HAVE_LIBZ)
|
||||||
if test "$WIN32" = "yes"; then
|
if test "$WIN32" = "yes"; then
|
||||||
AC_CHECK_LIB(bz2, main)
|
AC_CHECK_LIB(bz2, main)
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
# 59 Temple Place - Suite 330
|
# 59 Temple Place - Suite 330
|
||||||
# Boston, MA 02111-1307, USA
|
# Boston, MA 02111-1307, USA
|
||||||
#
|
#
|
||||||
#ident "$Id: Makefile.in,v 1.42 2003/09/01 04:04:03 steve Exp $"
|
#ident "$Id: Makefile.in,v 1.43 2003/09/13 01:28:47 steve Exp $"
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
|
|
@ -59,8 +59,11 @@ dep:
|
||||||
|
|
||||||
O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_finish.o \
|
O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_finish.o \
|
||||||
sys_plusargs.o sys_random.o sys_readmem.o sys_readmem_lex.o sys_time.o \
|
sys_plusargs.o sys_random.o sys_readmem.o sys_readmem_lex.o sys_time.o \
|
||||||
sys_vcd.o sys_vcdoff.o sys_lxt.o lxt_write.o sys_lxt2.o lxt2_write.o \
|
sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o stringheap.o
|
||||||
vcd_priv.o mt19937int.o stringheap.o
|
|
||||||
|
ifeq (@HAVE_LIBZ@,yes)
|
||||||
|
O += sys_lxt.o lxt_write.o sys_lxt2.o lxt2_write.o
|
||||||
|
endif
|
||||||
|
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
SYSTEM_VPI_LDFLAGS = $(LIBS)
|
SYSTEM_VPI_LDFLAGS = $(LIBS)
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CVS_IDENT
|
#ifdef HAVE_CVS_IDENT
|
||||||
#ident "$Id: sys_table.c,v 1.21 2003/09/01 04:04:03 steve Exp $"
|
#ident "$Id: sys_table.c,v 1.22 2003/09/13 01:28:47 steve Exp $"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
|
@ -35,9 +35,15 @@ extern void sys_random_register();
|
||||||
extern void sys_readmem_register();
|
extern void sys_readmem_register();
|
||||||
extern void sys_time_register();
|
extern void sys_time_register();
|
||||||
extern void sys_vcd_register();
|
extern void sys_vcd_register();
|
||||||
|
extern void sys_vcdoff_register();
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBZ
|
||||||
extern void sys_lxt_register();
|
extern void sys_lxt_register();
|
||||||
extern void sys_lxt2_register();
|
extern void sys_lxt2_register();
|
||||||
extern void sys_vcdoff_register();
|
#else
|
||||||
|
static void sys_lxt_register() { fputs("LXT support disabled since zlib not available\n",stderr); exit(1); }
|
||||||
|
static void sys_lxt2_register() { fputs("LXT2 support disabled since zlib not available\n",stderr); exit(1); }
|
||||||
|
#endif
|
||||||
|
|
||||||
static void sys_lxt_or_vcd_register()
|
static void sys_lxt_or_vcd_register()
|
||||||
{
|
{
|
||||||
|
|
@ -148,6 +154,9 @@ void (*vlog_startup_routines[])() = {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Log: sys_table.c,v $
|
* $Log: sys_table.c,v $
|
||||||
|
* 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
|
* Revision 1.21 2003/09/01 04:04:03 steve
|
||||||
* Add lxt2 support.
|
* Add lxt2 support.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue