Skip to content
Snippets Groups Projects
Commit d4a8bf7e authored by edgrif's avatar edgrif
Browse files

update from latest gnome foocanvas

parent 94483e4c
No related branches found
No related tags found
--- ./tmp_merged_foocanvas/configure.in 2010-03-30 08:31:39.284000000 +0000
+++ ./tmp_zmap_foocanvas/configure.in 2010-03-30 08:49:27.078000000 +0000
@@ -64,7 +64,7 @@
--- ./tmp_merged_foocanvas/configure.in 2010-03-30 09:32:59.350000000 +0000
+++ ./tmp_zmap_foocanvas/configure.in 2010-03-30 09:31:13.216000000 +0000
@@ -1,9 +1,10 @@
AC_PREREQ(2.50)
-AC_INIT([libfoocanvas], [0.1])
+AC_INIT([libzmapfoocanvas], [0.1])
AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([dist-bzip2])
+dnl [dist-bz2] removed from the AM_INIT_AUTOMAKE()
+AM_INIT_AUTOMAKE([])
AM_MAINTAINER_MODE
@@ -12,6 +13,10 @@
AC_ISC_POSIX
AC_PROG_CC
AC_HEADER_STDC
+
+
+dnl Disable shared libs so foocanvas is bound in to zmap.
+AC_DISABLE_SHARED
AM_PROG_LIBTOOL
GNOME_COMPILE_WARNINGS
@@ -53,7 +58,8 @@
AC_SUBST(HTML_DIR, $with_html_dir)
fi
-GTK_DOC_CHECK([1.0])
+dnl MAC OS X doesn't like this... (requires gtk-doc, which requires a million other packages)
+dnl GTK_DOC_CHECK([1.0])
AC_CONFIG_FILES([
Makefile
libfoocanvas/Makefile
-libfoocanvas/libfoocanvas.pc
+libfoocanvas/libzmapfoocanvas.pc
demos/Makefile
])
AC_OUTPUT
--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:32:59.372000000 +0000
+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:31:13.230000000 +0000
--- ./tmp_merged_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:43:41.366000000 +0000
+++ ./tmp_zmap_foocanvas/libfoocanvas/Makefile.am 2010-03-30 09:43:38.764000000 +0000
@@ -12,34 +12,40 @@
-DG_LOG_DOMAIN=\"Foocanvas\" \
-DVERSION=\"$(VERSION)\"
......@@ -45,8 +45,12 @@
foo-canvas-util.c \
foo-canvas-widget.c \
foo-canvas.c \
@@ -67,4 +73,4 @@
EXTRA_DIST = libzmapfoocanvas.pc.in
@@ -64,7 +70,7 @@
CLEANFILES = foo-canvas-marshal.h foo-canvas-marshal.c
-EXTRA_DIST = libfoocanvas.pc.in
+EXTRA_DIST = libzmapfoocanvas.pc.in
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libfoocanvas.pc
......
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