mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-08-29 01:24:51 +02:00
MAKE_xxxxx: to skip building OBJs part of configure
This commit is contained in:
committed by
R. Timothy Edwards
parent
bd541d3e6f
commit
d13fa6872e
+13
-2
@@ -298,7 +298,6 @@ dnl --with-tcl=no or --with-interpreter=no, and OpenGL may be
|
||||
dnl disabled with --with-opengl=no
|
||||
|
||||
usingOGL=1
|
||||
use_libglu="-lGLU"
|
||||
usingTcl=1
|
||||
usingOA=0
|
||||
usingCairo=1
|
||||
@@ -1073,6 +1072,7 @@ if test "x$enable_readline" = "xyes" ; then
|
||||
else
|
||||
rl_libs="\${MAGICDIR}/readline/readline/libreadline.a"
|
||||
CPPFLAGS="$CPPFLAGS -I\${MAGICDIR}/readline"
|
||||
use_bundled_readline=1
|
||||
fi
|
||||
AC_CHECK_LIB(termcap, tgetent, [
|
||||
rl_libs="$rl_libs -ltermcap"
|
||||
@@ -1188,7 +1188,10 @@ if test $usingOGL ; then
|
||||
echo "GL library files not found, disabling OpenGL"
|
||||
usingOGL=
|
||||
],)
|
||||
AC_CHECK_LIB(GLU, gluNewTess, , [
|
||||
AC_CHECK_LIB(GLU, gluNewTess, [
|
||||
usingGLU=1
|
||||
use_libglu="-lGLU"
|
||||
], [
|
||||
echo "GLU library files not found; disabling font rendering"
|
||||
use_libglu=""
|
||||
],)
|
||||
@@ -1198,6 +1201,7 @@ fi
|
||||
|
||||
if test "x$use_libglu" != "x" ; then
|
||||
AC_DEFINE(VECTOR_FONTS)
|
||||
usingGLU=1
|
||||
fi
|
||||
|
||||
if test $usingOGL ; then
|
||||
@@ -1846,6 +1850,13 @@ AC_SUBST(OA_LIBS)
|
||||
AC_SUBST(ALL_TARGET)
|
||||
AC_SUBST(INSTALL_TARGET)
|
||||
|
||||
AC_SUBST(MAKE_TCL, [$usingTcl])
|
||||
AC_SUBST(MAKE_X11, [$usingX11])
|
||||
AC_SUBST(MAKE_GL, [$usingOGL])
|
||||
AC_SUBST(MAKE_GLU, [$usingGLU])
|
||||
AC_SUBST(MAKE_CAIRO, [$usingCairo])
|
||||
AC_SUBST(MAKE_READLINE, [$use_bundled_readline])
|
||||
|
||||
AC_CONFIG_FILES([defs.mak])
|
||||
AC_CONFIG_FILES([makedbh], [chmod +x makedbh])
|
||||
AC_OUTPUT
|
||||
|
||||
@@ -114,3 +114,11 @@ CXX_OBJS = ${CXXSRCS:.cpp=.o}
|
||||
OBJS = ${CXX_OBJS} ${C_OBJS}
|
||||
LIB_OBJS = ${LIB_SRCS:.c=.o}
|
||||
CLEANS = Depend ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}
|
||||
|
||||
# allows Makefile to be selective
|
||||
MAKE_TCL = @MAKE_TCL@
|
||||
MAKE_X11 = @MAKE_X11@
|
||||
MAKE_GL = @MAKE_GL@
|
||||
MAKE_GLU = @MAKE_GLU@
|
||||
MAKE_CAIRO = @MAKE_CAIRO@
|
||||
MAKE_READLINE = @MAKE_READLINE@
|
||||
|
||||
Reference in New Issue
Block a user