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

Modified the configure script and Makefiles so that systems that do 

not include zlib by default will pick it up from the compile line.
This commit is contained in:
Tim Edwards 2022-05-28 17:51:20 -04:00
parent c001de3d9d
commit c997f4cccf
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magic/Makefile
View File

@ -34,7 +34,7 @@ DEST_XBM = $(BITMAPS:%=$(DESTDIR)${INSTALL_TCLDIR}/bitmaps/%)
DFLAGS += -DMAGIC_DATE="\"`date`\"" -DCAD_DIR="${LIBDIR}" DFLAGS += -DMAGIC_DATE="\"`date`\"" -DCAD_DIR="${LIBDIR}"
LIBS += ${GR_LIBS} ${READLINE_LIBS} -lm ${LD_EXTRA_LIBS} \ LIBS += ${GR_LIBS} ${READLINE_LIBS} -lm ${LD_EXTRA_LIBS} \
${OA_LIBS} ${TOP_EXTRA_LIBS} ${OA_LIBS} ${ZLIB_FLAG} ${TOP_EXTRA_LIBS}
CLEANS += tclmagic${SHDLIB_EXT} libtclmagic${SHDLIB_EXT}.a proto.magicrc CLEANS += tclmagic${SHDLIB_EXT} libtclmagic${SHDLIB_EXT}.a proto.magicrc
main: magic proto.magicrc main: magic proto.magicrc

6
scripts/configure vendored
View File

@ -660,6 +660,7 @@ LIB_SPECS_GRNULL
LIB_SPECS_NOSTUB LIB_SPECS_NOSTUB
LIB_SPECS LIB_SPECS
INC_SPECS INC_SPECS
ZLIB_FLAG
EXTRA_LIB_SPECS EXTRA_LIB_SPECS
SHLIB_LIB_SPECS SHLIB_LIB_SPECS
LDDL_FLAGS LDDL_FLAGS
@ -5043,6 +5044,7 @@ else
fi fi
ZLIB_FLAG=""
if test "x$enable_compression" = "xyes" ; then if test "x$enable_compression" = "xyes" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
$as_echo_n "checking for gzopen in -lz... " >&6; } $as_echo_n "checking for gzopen in -lz... " >&6; }
@ -5082,8 +5084,11 @@ fi
$as_echo "$ac_cv_lib_z_gzopen" >&6; } $as_echo "$ac_cv_lib_z_gzopen" >&6; }
if test "x$ac_cv_lib_z_gzopen" = xyes; then : if test "x$ac_cv_lib_z_gzopen" = xyes; then :
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
ZLIB_FLAG=" -lz"
fi fi
fi fi
@ -8246,6 +8251,7 @@ fi
fi fi
if test "$GCC" = "yes" ; then if test "$GCC" = "yes" ; then

7
scripts/configure.in
View File

@ -185,8 +185,12 @@ AC_ARG_ENABLE(compression,
[enable_compression=yes]) [enable_compression=yes])
dnl Check for zlib dnl Check for zlib
ZLIB_FLAG=""
if test "x$enable_compression" = "xyes" ; then if test "x$enable_compression" = "xyes" ; then
AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])]) AC_CHECK_LIB([z],[gzopen],[
AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])
ZLIB_FLAG=" -lz"
])
fi fi
dnl Check for some C99 functions dnl Check for some C99 functions
@ -1759,6 +1763,7 @@ if test $usingTcl ; then
AC_SUBST(EXTRA_LIB_SPECS) AC_SUBST(EXTRA_LIB_SPECS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(ZLIB_FLAG)
AC_SUBST(INC_SPECS) AC_SUBST(INC_SPECS)
AC_SUBST(LIB_SPECS) AC_SUBST(LIB_SPECS)
AC_SUBST(LIB_SPECS_NOSTUB) AC_SUBST(LIB_SPECS_NOSTUB)

2
scripts/defs.mak.in
View File

@ -62,7 +62,7 @@ MCPP = @MCPP@
MSED = @MSED@ MSED = @MSED@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHDLIB_EXT = @SHDLIB_EXT@ SHDLIB_EXT = @SHDLIB_EXT@
LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ ZLIB_FLAG = @ZLIB_FLAG@
LD_RUN_PATH = @LD_RUN_PATH@ LD_RUN_PATH = @LD_RUN_PATH@
LIB_SPECS = @LIB_SPECS@ LIB_SPECS = @LIB_SPECS@
LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@ LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@

7
tcltk/Makefile
View File

@ -51,12 +51,13 @@ install-tcl: magicexec magicdnull ${BIN_FILES} ${TCL_FILES}
magicexec: magicexec.c ${MAGICDIR}/defs.mak magicexec: magicexec.c ${MAGICDIR}/defs.mak
${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicexec.c \ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicexec.c \
-o magicexec ${LD_RUN_PATH} ${LIB_SPECS_NOSTUB} ${LIBS} \ -o magicexec ${LD_RUN_PATH} ${LIB_SPECS_NOSTUB} ${ZLIB_FLAG} \
${GR_LIBS} ${LIBS} ${GR_LIBS}
magicdnull: magicdnull.c ${MAGICDIR}/defs.mak magicdnull: magicdnull.c ${MAGICDIR}/defs.mak
${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicdnull.c \ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} ${LDFLAGS} magicdnull.c \
-o magicdnull ${LD_RUN_PATH} ${LIB_SPECS_GRNULL} ${LIBS} -o magicdnull ${LD_RUN_PATH} ${LIB_SPECS_GRNULL} ${ZLIB_FLAG} \
${LIBS}
magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak ${MAGICDIR}/VERSION
sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \ sed -e /MAGIC_VERSION/s%MAGIC_VERSION%${MAGIC_VERSION}%g \