Commit 98941bba authored by bguillaum's avatar bguillaum

version 2.14.0: update code to lib "cairo2"

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/semagramme/dep2pict/trunk@8026 7838e531-6607-4d57-9587-6c381814729c
parent ee0e70bc
VERSION = 2.13.0
VERSION = 2.14.0
INSTALL_DIR = @prefix@@bindir@
DATA_DIR = @prefix@@datarootdir@/dep2pict/
......@@ -23,8 +23,8 @@ XML_LIGHT_BYTE = $(XML_LIGHT_DIR) xml-light.cma
XML_LIGHT_OPT = $(XML_LIGHT_DIR) xml-light.cmxa
CAIRO_DIR = @CAIRO_INCLUDE@
CAIRO_BYTE = $(CAIRO_DIR) cairo.cma
CAIRO_OPT = $(CAIRO_DIR) cairo.cmxa
CAIRO_BYTE = $(CAIRO_DIR) cairo2.cma
CAIRO_OPT = $(CAIRO_DIR) cairo2.cmxa
LABLGTK_DIR = @LABLGTK_INCLUDE@
LABLGTK_BYTE = $(LABLGTK_DIR) lablgtk.cma lablglade.cma lablrsvg.cma
......
......@@ -88,7 +88,7 @@ if test "$config" = yes ; then
m4_include(ac_lib_checking.m4)
AC_LIB_CHECKING(Cairo,cairo,cairo,cairo,Cairo,"",true,true)
AC_LIB_CHECKING(Cairo,cairo2,cairo2,cairo2,Cairo,"",true,true)
AC_SUBST(CAIRO_INCLUDE,$LIB_INCLUDE)
AC_LIB_CHECKING(Dep2pict,dep2pict,dep2pict,dep2pict,Dep2pict,"",true,true)
......
......@@ -2025,9 +2025,9 @@ $as_echo "$as_me: WARNING: Cannot find ocamlfind" >&2;}
NAME=Cairo
STD_FOLDER=cairo
OFIND_NAME=cairo
LIB_FILE=cairo
STD_FOLDER=cairo2
OFIND_NAME=cairo2
LIB_FILE=cairo2
MOD=Cairo
OPTIONS=""
NO_OPTIONAL=true
......@@ -2063,7 +2063,7 @@ $as_echo_n "checking for optional library : $NAME... " >&6; }
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Cannot remove c_check_cairo.ml. Please change its right with chmod 666 c_check_cairo.ml
as_fn_error $? "Cannot remove c_check_cairo2.ml. Please change its right with chmod 666 c_check_cairo2.ml
See \`config.log' for more details" "$LINENO" 5; }
fi
fi
......
......@@ -17,8 +17,8 @@ ui.ml : dep2pict.glade
ui.cmx : ui.ml
$(OCAMLOPT) -c $(LABLGTK_OPT) $(CAIRO_OPT) ui.ml
DEP_OPT= unix.cmxa str.cmxa $(LABLGTK_OPT) $(CAIRO_OPT) $(XML_LIGHT_OPT) $(ANSITERMINAL_OPT) $(LOG_OPT) $(DEP2PICT_OPT)
DEP_OPT_NOGUI= unix.cmxa str.cmxa $(CAIRO_OPT) $(XML_LIGHT_OPT) $(ANSITERMINAL_OPT) $(LOG_OPT) $(DEP2PICT_OPT)
DEP_OPT= unix.cmxa str.cmxa bigarray.cmxa $(LABLGTK_OPT) $(CAIRO_OPT) $(XML_LIGHT_OPT) $(ANSITERMINAL_OPT) $(LOG_OPT) $(DEP2PICT_OPT)
DEP_OPT_NOGUI= unix.cmxa str.cmxa bigarray.cmxa $(CAIRO_OPT) $(XML_LIGHT_OPT) $(ANSITERMINAL_OPT) $(LOG_OPT) $(DEP2PICT_OPT)
gui.cmx : gui.ml ui.cmx
$(OCAMLOPT) -c -pp 'camlp4o pa_macro.cmo -DBUILD_GUI -DDATA_DIR=\"$(DATA_DIR)\" $(LOG) -DVERSION=\"$(VERSION)\"' $(DEP_OPT) ui.cmx gui.ml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment