=== modified file 'configure.ac' --- configure.ac 2013-03-14 01:33:10 +0000 +++ configure.ac 2013-03-16 15:28:16 +0000 @@ -619,6 +619,20 @@ min_sigc_version=2.0.11 fi + +dnl **************************************** +dnl Check for an external 2geom installation +dnl **************************************** +PKG_CHECK_MODULES(LIB2GEOM, 2geom >= 0.2 gsl, ext_2geom=yes, ext_2geom=no) +if test "x$ext_2geom" = "xyes"; then + AC_MSG_RESULT([Using external 2Geom installation]) + AC_DEFINE(WITH_EXT_2GEOM,1,[Build with external 2Geom]) +fi +AC_SUBST(LIB2GEOM_LIBS) +AC_SUBST(LIB2GEOM_CFLAGS) +AM_CONDITIONAL(WITH_EXT_2GEOM, test "x$ext_2geom" = "xyes") + + dnl ********************************* dnl Allow experimental GTK+3 build dnl ********************************* === modified file 'src/2geom/Makefile_insert' --- src/2geom/Makefile_insert 2012-10-15 22:04:36 +0000 +++ src/2geom/Makefile_insert 2013-03-16 14:06:11 +0000 @@ -1,11 +1,6 @@ ## Makefile.am fragment sourced by src/Makefile.am. -2geom/all: 2geom/lib2geom.a - -2geom/clean: - rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS) - -2geom_lib2geom_a_SOURCES = \ +2geom_lib2geom_src_files = \ 2geom/2geom.h \ 2geom/affine.cpp \ 2geom/affine.h \ @@ -132,3 +127,18 @@ 2geom/numeric/symmetric-matrix-fs-trace.h \ 2geom/numeric/vector.h +if WITH_EXT_2GEOM + +EXTRA_DIST += $(2geom_lib2geom_src_files) + +else + +2geom/all: 2geom/lib2geom.a + +2geom/clean: + rm -f 2geom/lib2geom.a $(2geom_lib2geom_a_OBJECTS) + +2geom_lib2geom_a_SOURCES = $(2geom_lib2geom_src_files) + +endif + === modified file 'src/Makefile.am' --- src/Makefile.am 2013-03-04 17:21:11 +0000 +++ src/Makefile.am 2013-03-16 14:28:44 +0000 @@ -21,6 +21,10 @@ internal_GDL = libgdl/libgdl.a endif +if !WITH_EXT_2GEOM +internal_2geom = 2geom/lib2geom.a +endif + noinst_LIBRARIES = \ libinkscape.a \ @@ -31,7 +35,7 @@ libcola/libcola.a \ libvpsc/libvpsc.a \ livarot/libvarot.a \ - 2geom/lib2geom.a \ + $(internal_2geom) \ libinkversion.a all_libs = \ @@ -44,6 +48,7 @@ $(kdeldadd) \ $(win32ldflags) \ $(CARBON_LDFLAGS) \ + $(LIB2GEOM_LIBS) \ $(LIBWPG_LIBS) \ $(LIBVISIO_LIBS) \ $(LIBCDR_LIBS) \ @@ -68,6 +73,7 @@ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ $(IMAGEMAGICK_CFLAGS) \ + $(LIB2GEOM_CFLAGS) \ $(LIBWPG_CFLAGS) \ $(LIBVISIO_CFLAGS) \ $(LIBCDR_CFLAGS) \ === modified file 'src/conn-avoid-ref.cpp' --- src/conn-avoid-ref.cpp 2012-11-30 19:22:44 +0000 +++ src/conn-avoid-ref.cpp 2013-03-16 14:45:24 +0000 @@ -17,9 +17,9 @@ #include "sp-item.h" #include "display/curve.h" -#include "2geom/line.h" -#include "2geom/crossing.h" -#include "2geom/convex-cover.h" +#include <2geom/line.h> +#include <2geom/crossing.h> +#include <2geom/convex-cover.h> #include "helper/geom-curves.h" #include "svg/stringstream.h" #include "conn-avoid-ref.h" === modified file 'src/display/canvas-axonomgrid.cpp' --- src/display/canvas-axonomgrid.cpp 2013-03-08 01:22:57 +0000 +++ src/display/canvas-axonomgrid.cpp 2013-03-16 14:48:13 +0000 @@ -43,8 +43,8 @@ #include "sp-namedview.h" #include "sp-object.h" #include "svg/svg-color.h" -#include "2geom/line.h" -#include "2geom/angle.h" +#include <2geom/line.h> +#include <2geom/angle.h> #include "util/mathfns.h" #include "round.h" #include "helper/units.h" === modified file 'src/event-context.h' --- src/event-context.h 2013-03-14 23:24:17 +0000 +++ src/event-context.h 2013-03-16 14:47:36 +0000 @@ -16,7 +16,7 @@ #include #include "knot.h" -#include "2geom/forward.h" +#include <2geom/forward.h> #include "preferences.h" class GrDrag; === modified file 'src/extension/dbus/document-interface.cpp' --- src/extension/dbus/document-interface.cpp 2012-09-20 20:40:55 +0000 +++ src/extension/dbus/document-interface.cpp 2013-03-16 14:47:23 +0000 @@ -55,8 +55,6 @@ #include "verbs.h" #include "xml/repr.h" //sp_repr_document_new -//#include "2geom/svg-path-parser.h" //get_node_coordinates - #include #include === modified file 'src/extension/internal/bitmap/crop.cpp' --- src/extension/internal/bitmap/crop.cpp 2012-02-28 15:16:58 +0000 +++ src/extension/internal/bitmap/crop.cpp 2013-03-16 14:47:00 +0000 @@ -5,7 +5,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include "2geom/transforms.h" +#include <2geom/transforms.h> #include "extension/effect.h" #include "extension/system.h" === modified file 'src/line-geometry.h' --- src/line-geometry.h 2013-03-14 01:33:10 +0000 +++ src/line-geometry.h 2013-03-16 14:49:58 +0000 @@ -15,7 +15,7 @@ #include #include "glib.h" #include "axis-manip.h" // FIXME: This is only for Box3D::epsilon; move that to a better location -#include "2geom/point.h" +#include <2geom/point.h> #include "document.h" #include "ui/view/view.h" === modified file 'src/live_effects/lpe-knot.h' --- src/live_effects/lpe-knot.h 2013-01-17 20:02:50 +0000 +++ src/live_effects/lpe-knot.h 2013-03-16 14:46:38 +0000 @@ -18,9 +18,8 @@ #include "live_effects/lpegroupbbox.h" #include "live_effects/parameter/parameter.h" #include "live_effects/parameter/array.h" -//#include "live_effects/parameter/path.h" #include "live_effects/parameter/bool.h" -#include "2geom/crossing.h" +#include <2geom/crossing.h> namespace Inkscape { namespace LivePathEffect { === modified file 'src/live_effects/lpe-path_length.cpp' --- src/live_effects/lpe-path_length.cpp 2012-10-21 18:04:54 +0000 +++ src/live_effects/lpe-path_length.cpp 2013-03-16 14:46:11 +0000 @@ -16,7 +16,7 @@ #include "live_effects/lpe-path_length.h" #include "sp-metrics.h" -#include "2geom/sbasis-geometric.h" +#include <2geom/sbasis-geometric.h> namespace Inkscape { namespace LivePathEffect { === modified file 'src/live_effects/lpe-perspective_path.h' --- src/live_effects/lpe-perspective_path.h 2013-01-17 20:02:50 +0000 +++ src/live_effects/lpe-perspective_path.h 2013-03-16 14:45:50 +0000 @@ -19,7 +19,7 @@ #include "live_effects/lpegroupbbox.h" #include -#include "2geom/point.h" +#include <2geom/point.h> namespace Inkscape { namespace LivePathEffect { === modified file 'src/measure-context.cpp' --- src/measure-context.cpp 2013-01-26 16:18:08 +0000 +++ src/measure-context.cpp 2013-03-16 14:49:28 +0000 @@ -34,7 +34,7 @@ #include "draw-context.h" #include "display/canvas-text.h" #include "path-chemistry.h" -#include "2geom/line.h" +#include <2geom/line.h> #include <2geom/path-intersection.h> #include <2geom/pathvector.h> #include <2geom/crossing.h> === modified file 'src/selection-chemistry.h' --- src/selection-chemistry.h 2013-03-14 01:33:10 +0000 +++ src/selection-chemistry.h 2013-03-16 14:49:11 +0000 @@ -18,7 +18,7 @@ */ #include "sp-item.h" -#include "2geom/forward.h" +#include <2geom/forward.h> namespace Inkscape { class Selection; } === modified file 'src/sp-conn-end.cpp' --- src/sp-conn-end.cpp 2012-11-30 19:22:44 +0000 +++ src/sp-conn-end.cpp 2013-03-16 14:50:20 +0000 @@ -10,9 +10,9 @@ #include "uri.h" #include "document.h" #include "sp-item-group.h" -#include "2geom/path.h" -#include "2geom/pathvector.h" -#include "2geom/path-intersection.h" +#include <2geom/path.h> +#include <2geom/pathvector.h> +#include <2geom/path-intersection.h> static void change_endpts(SPCurve *const curve, double const endPos[2]); === modified file 'src/sp-mesh-array.cpp' --- src/sp-mesh-array.cpp 2013-01-11 07:30:09 +0000 +++ src/sp-mesh-array.cpp 2013-03-16 14:49:46 +0000 @@ -64,7 +64,7 @@ // Includes bezier-curve.h, ray.h, crossing.h -#include "2geom/line.h" +#include <2geom/line.h> #include "xml/repr.h" #include === modified file 'src/svg/svg-path-geom-test.h' --- src/svg/svg-path-geom-test.h 2012-09-13 19:51:57 +0000 +++ src/svg/svg-path-geom-test.h 2013-03-16 14:48:51 +0000 @@ -1,7 +1,7 @@ #include -#include "2geom/coord.h" -#include "2geom/curves.h" -#include "2geom/pathvector.h" +#include <2geom/coord.h> +#include <2geom/curves.h> +#include <2geom/pathvector.h> #include "svg/svg.h" #include "preferences.h" #include "streq.h" === modified file 'src/ui/dialog/align-and-distribute.h' --- src/ui/dialog/align-and-distribute.h 2012-11-15 11:42:04 +0000 +++ src/ui/dialog/align-and-distribute.h 2013-03-16 14:48:31 +0000 @@ -21,7 +21,7 @@ #include #include #include -#include "2geom/rect.h" +#include <2geom/rect.h> #include "ui/dialog/desktop-tracker.h" #if WITH_GTKMM_3_0