collabvm/r3
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

workable --enable-graphviz

Browse source
This commit is contained in:
c9s 2014-05-18 10:13:51 +08:00
parent 6c651cb1ef
commit 2e7a3c2736
7 changed files with 156 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
config.status
View file

@ -427,7 +427,7 @@ $config_commands
Report bugs to the package provider."
ac_cs_config=""
ac_cs_config="'--enable-graphviz'"
ac_cs_version="\
r3 config.status 1.0
configured by ./configure, generated by GNU Autoconf 2.69,
@ -519,7 +519,7 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion
set X /bin/sh './configure' '--enable-graphviz' $ac_configure_extra_args --no-create --no-recursion
shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh'
@ -818,10 +818,12 @@ S["am__EXEEXT_TRUE"]="#"
S["LTLIBOBJS"]=""
S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck "
S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include "
S["GRAPHVIZ_FALSE"]=""
S["GRAPHVIZ_TRUE"]="#"
S["GVC_DEPS_LIBS"]=""
S["GVC_DEPS_CFLAGS"]=""
S["DEBUG_FALSE"]=""
S["DEBUG_TRUE"]="#"
S["ENABLE_GRAPHVIZ_FALSE"]="#"
S["ENABLE_GRAPHVIZ_TRUE"]=""
S["GVC_DEPS_LIBS"]="-L/opt/local/lib -lgvc -lcgraph -lcdt "
S["GVC_DEPS_CFLAGS"]="-I/opt/local/include/graphviz "
S["PKG_CONFIG_LIBDIR"]=""
S["PKG_CONFIG_PATH"]=""
S["PKG_CONFIG"]="/opt/local/bin/pkg-config"

81
configure vendored
View file

@ -633,8 +633,10 @@ am__EXEEXT_TRUE
LTLIBOBJS
DEPS_LIBS
DEPS_CFLAGS
GRAPHVIZ_FALSE
GRAPHVIZ_TRUE
DEBUG_FALSE
DEBUG_TRUE
ENABLE_GRAPHVIZ_FALSE
ENABLE_GRAPHVIZ_TRUE
GVC_DEPS_LIBS
GVC_DEPS_CFLAGS
PKG_CONFIG_LIBDIR
@ -771,6 +773,7 @@ with_sysroot
enable_libtool_lock
with_check
enable_graphviz
enable_debug
'
ac_precious_vars='build_alias
host_alias
@ -1417,7 +1420,8 @@ Optional Features:
--disable-dependency-tracking
speeds up one-time build
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-graphviz Enable graphviz feature
--enable-graphviz enable graphviz support
--enable-debug Turn on debugging
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -13136,15 +13140,25 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
# AC_ARG_ENABLE([graphviz],
# AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature]))
# Check whether --enable-graphviz was given.
if test "${enable_graphviz+set}" = set; then :
enableval=$enable_graphviz;
else
enable_graphviz=unset
fi
if test "x$enable_graphviz" = "xyes"; then :
if test "x$enable_graphviz" != "xunset" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC_DEPS" >&5
$as_echo_n "checking for GVC_DEPS... " >&6; }
@ -13237,18 +13251,57 @@ $as_echo "yes" >&6; }
fi
fi
fi
if test x$enable_graphviz = xyes; then
GRAPHVIZ_TRUE=
GRAPHVIZ_FALSE='#'
if test "x$enable_graphviz" = "xyes"; then
ENABLE_GRAPHVIZ_TRUE=
ENABLE_GRAPHVIZ_FALSE='#'
else
GRAPHVIZ_TRUE='#'
GRAPHVIZ_FALSE=
ENABLE_GRAPHVIZ_TRUE='#'
ENABLE_GRAPHVIZ_FALSE=
fi
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then :
enableval=$enable_debug; case "${enableval}" in
yes) enable_debug=true ;;
no) enable_debug=false ;;
*) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
esac
else
enable_debug=false
fi
if test x$enable_debug = xtrue; then
DEBUG_TRUE=
DEBUG_FALSE='#'
else
DEBUG_TRUE='#'
DEBUG_FALSE=
fi
# fi],[
# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.])
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0)
# AC_ARG_ENABLE(graphviz,
# [ --enable-graphvizviz Build with graphviz support],
# [if test x$enableval != xyes; then
# AC_DEFINE(ENABLE_GRAPHVIZ, 1, [Graphviz support enabled.])
# PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
# AC_SUBST(GVC_DEPS_CFLAGS)
# AC_SUBST(GVC_DEPS_LIBS)
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 1)
# fi],[
# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.])
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0)
# ])
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
$as_echo_n "checking for DEPS... " >&6; }
@ -13484,8 +13537,12 @@ if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
as_fn_error $? "conditional \"HAVE_CHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GRAPHVIZ_TRUE}" && test -z "${GRAPHVIZ_FALSE}"; then
as_fn_error $? "conditional \"GRAPHVIZ\" was never defined.
if test -z "${ENABLE_GRAPHVIZ_TRUE}" && test -z "${ENABLE_GRAPHVIZ_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_GRAPHVIZ\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
as_fn_error $? "conditional \"DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi

57
configure.ac
View file

@ -28,16 +28,55 @@ AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr])
PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE([graphviz],
AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature]))
AS_IF([test "x$enable_graphviz" = "xyes"], [
dnl Do the stuff needed for enabling the feature
PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
AC_SUBST(GVC_DEPS_CFLAGS)
AC_SUBST(GVC_DEPS_LIBS)
])
AM_CONDITIONAL(GRAPHVIZ, test x$enable_graphviz = xyes)
# AC_ARG_ENABLE([graphviz],
# AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature]))
AC_ARG_ENABLE(graphviz,
AS_HELP_STRING([--enable-graphviz],
[enable graphviz support]),
, enable_graphviz=unset)
if test "x$enable_graphviz" != "xunset" ; then
PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
AC_SUBST(GVC_DEPS_CFLAGS)
AC_SUBST(GVC_DEPS_LIBS)
fi
AM_CONDITIONAL(ENABLE_GRAPHVIZ, test "x$enable_graphviz" = "xyes")
AC_ARG_ENABLE([debug],
[ --enable-debug Turn on debugging],
[case "${enableval}" in
yes) enable_debug=true ;;
no) enable_debug=false ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
esac],[enable_debug=false])
AM_CONDITIONAL([DEBUG], [test x$enable_debug = xtrue])
# fi],[
# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.])
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0)
# AC_ARG_ENABLE(graphviz,
# [ --enable-graphvizviz Build with graphviz support],
# [if test x$enableval != xyes; then
# AC_DEFINE(ENABLE_GRAPHVIZ, 1, [Graphviz support enabled.])
# PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
# AC_SUBST(GVC_DEPS_CFLAGS)
# AC_SUBST(GVC_DEPS_LIBS)
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 1)
# fi],[
# AC_DEFINE(ENABLE_GRAPHVIZ, 0, [Graphviz support disabled.])
# AM_CONDITIONAL(ENABLE_GRAPHVIZ, 0)
# ])
PKG_CHECK_MODULES(DEPS, [libpcre check])
AC_SUBST(DEPS_CFLAGS)

10
src/Makefile.am
View file

@ -1,14 +1,14 @@
lib_LTLIBRARIES = libr3.la
lib_LIBRARIES = libr3.a
# lib_LIBRARIES = libr3.a
libr3_la_SOURCES = node.c edge.c list.c str.c token.c
libr3_la_LIBADD=$(DEPS_LIBS)
AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall
if GRAPHVIZ
libr3_la_SOURCES += gvc.c
libr3_la_LIBADD += $(GVC_DEPS_LIBS)
AM_CFLAGS += =$(GVC_DEPS_CFLAGS)
if ENABLE_GRAPHVIZ
libr3_la_SOURCES += gvc.c
libr3_la_LIBADD += $(GVC_DEPS_LIBS)
AM_CFLAGS += $(GVC_DEPS_CFLAGS)
endif
# AM_CFLAGS=$(DEPS_CFLAGS)

26
src/Makefile.in
View file

@ -78,6 +78,9 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@ENABLE_GRAPHVIZ_TRUE@am__append_1 = gvc.c
@ENABLE_GRAPHVIZ_TRUE@am__append_2 = $(GVC_DEPS_LIBS)
@ENABLE_GRAPHVIZ_TRUE@am__append_3 = $(GVC_DEPS_CFLAGS)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
@ -122,8 +125,12 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo
@ENABLE_GRAPHVIZ_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am__libr3_la_SOURCES_DIST = node.c edge.c list.c str.c token.c gvc.c
@ENABLE_GRAPHVIZ_TRUE@am__objects_1 = gvc.lo
am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo \
$(am__objects_1)
libr3_la_OBJECTS = $(am_libr3_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -164,7 +171,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libr3_la_SOURCES)
DIST_SOURCES = $(libr3_la_SOURCES)
DIST_SOURCES = $(am__libr3_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@ -314,9 +321,11 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libr3.la
libr3_la_SOURCES = node.c edge.c list.c str.c token.c
libr3_la_LIBADD = $(DEPS_LIBS)
AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall
# lib_LIBRARIES = libr3.a
libr3_la_SOURCES = node.c edge.c list.c str.c token.c $(am__append_1)
libr3_la_LIBADD = $(DEPS_LIBS) $(am__append_2)
AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include \
-Wall $(am__append_3)
all: all-am
.SUFFIXES:
@ -397,6 +406,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@
@ -636,10 +646,6 @@ uninstall-am: uninstall-libLTLIBRARIES
tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
@GRAPHVIZ_TRUE@ libr3_la_SOURCES += gvc.c
@GRAPHVIZ_TRUE@ libr3_la_LIBADD += $(GVC_DEPS_LIBS)
@GRAPHVIZ_TRUE@ AM_CFLAGS += =$(GVC_DEPS_CFLAGS)
# AM_CFLAGS=$(DEPS_CFLAGS)
# Tell versions [3.59,3.63) of GNU make to not export all variables.

2
tests/Makefile.am
View file

@ -6,7 +6,7 @@
# endif
TESTS = check_tree
if GRAPHVIZ
if ENABLE_GRAPHVIZ
TESTS += check_gvc
check_gvc_SOURCES = check_gvc.c bench.c
check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@

17
tests/Makefile.in
View file

@ -78,7 +78,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
TESTS = check_tree$(EXEEXT) $(am__EXEEXT_1)
@GRAPHVIZ_TRUE@am__append_1 = check_gvc
@ENABLE_GRAPHVIZ_TRUE@am__append_1 = check_gvc
check_PROGRAMS = $(am__EXEEXT_2)
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@ -94,14 +94,15 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT)
@ENABLE_GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT)
am__EXEEXT_2 = check_tree$(EXEEXT) $(am__EXEEXT_1)
am__check_gvc_SOURCES_DIST = check_gvc.c bench.c
@GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \
@GRAPHVIZ_TRUE@ check_gvc-bench.$(OBJEXT)
@ENABLE_GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = \
@ENABLE_GRAPHVIZ_TRUE@ check_gvc-check_gvc.$(OBJEXT) \
@ENABLE_GRAPHVIZ_TRUE@ check_gvc-bench.$(OBJEXT)
check_gvc_OBJECTS = $(am_check_gvc_OBJECTS)
am__DEPENDENCIES_1 =
@GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1)
@ENABLE_GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@ -504,9 +505,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c
@GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
@GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
@ENABLE_GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c
@ENABLE_GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
@ENABLE_GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
# noinst_PROGRAMS = $(TESTS)
check_tree_SOURCES = check_tree.c bench.c