X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=136bb5c312d05ab5bc2267ea2a58acaaec6e5f5c;hb=817e7487ecbca8958844479ae421ac4b32403f0b;hp=b804d0debdf762147ddc2890f8c957d842f153b2;hpb=3c2773f662ad0ce5d6c4bf21b542d67876bd6e7d;p=inkscape.git

diff --git a/configure.ac b/configure.ac
index b804d0deb..136bb5c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.46+devel)
+AC_INIT(inkscape, 0.47+devel)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
@@ -31,7 +31,10 @@ AM_PROG_AS
 AC_PROG_RANLIB
 AC_PROG_INTLTOOL(0.22)
 AC_HEADER_STDC
-INK_SVN_SNAPSHOT_BUILD
+INK_BZR_SNAPSHOT_BUILD
+
+dnl If automake 1.11 shave the output to look nice
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl These next few lines are needed only while libcroco is in our source tree.
 AC_PROG_CC
@@ -155,7 +158,7 @@ fi
 dnl ******************************
 dnl Check for libpng 
 dnl ******************************
-AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm)
+AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=yes)], png_ok=no, -lz -lm)
 if test "x$png_ok" != "xyes"; then
 	AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
 fi
@@ -573,35 +576,35 @@ dnl ******************************
 dnl Inkboard dependency checking
 dnl ******************************
 
-with_inkboard="no"
-with_inkboard_ssl="no"
+dnl with_inkboard="no"
+dnl with_inkboard_ssl="no"
 
-INKBOARD_CFLAGS=""
+dnl INKBOARD_CFLAGS=""
 
-AC_ARG_ENABLE(inkboard,
-		AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]),
-       with_inkboard=$enableval,with_inkboard=no)
+dnl AC_ARG_ENABLE(inkboard,
+dnl 		AS_HELP_STRING([--enable-inkboard], [enable Inkboard online whiteboard facility (disabled by default)]),
+dnl        with_inkboard=$enableval,with_inkboard=no)
 
-if test "x$with_inkboard" = "xyes"; then
-		with_inkboard="yes"
-		AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support])
+dnl if test "x$with_inkboard" = "xyes"; then
+dnl 		with_inkboard="yes"
+dnl 		AC_DEFINE(WITH_INKBOARD,1,[Build in Inkboard support])
 		
 		dnl Test for OpenSSL
-		PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no)
-		if test "x$with_inkboard_ssl" = "xyes"; then
+dnl 		PKG_CHECK_MODULES(INKBOARD, openssl, with_inkboard_ssl=yes, with_inkboard_ssl=no)
+dnl 		if test "x$with_inkboard_ssl" = "xyes"; then
 			dnl OpenSSL found; enable SSL support in Pedro
-			INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
-			RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
-			RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
-			AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
-		fi
-else
-	with_inkboard="no"
-fi
-
-AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
-AC_SUBST(INKBOARD_LIBS)
-AC_SUBST(INKBOARD_CFLAGS)
+dnl 			INKBOARD_CFLAGS="$INKBOARD_CFLAGS -DHAVE_SSL"
+dnl 			RELAYTOOL([ssl], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+dnl 			RELAYTOOL([crypto], INKBOARD_LIBS, INKBOARD_CFLAGS, [inkboard_weak=yes])
+dnl 			AC_DEFINE(WITH_INKBOARD_SSL,1,[Build in SSL support for Inkboard])
+dnl 		fi
+dnl else
+dnl 	with_inkboard="no"
+dnl fi
+
+dnl AM_CONDITIONAL(WITH_INKBOARD, test "x$with_inkboard" = "xyes")
+dnl AC_SUBST(INKBOARD_LIBS)
+dnl AC_SUBST(INKBOARD_CFLAGS)
 
 dnl ******************************
 dnl Check for libwpg for extension
@@ -968,6 +971,13 @@ share/filters/Makefile
 share/fonts/Makefile
 share/gradients/Makefile
 share/icons/Makefile
+share/icons/application/Makefile
+share/icons/application/16x16/Makefile
+share/icons/application/22x22/Makefile
+share/icons/application/24x24/Makefile
+share/icons/application/32x32/Makefile
+share/icons/application/48x48/Makefile
+share/icons/application/256x256/Makefile
 share/keys/Makefile
 share/markers/Makefile
 share/palettes/Makefile
@@ -1008,8 +1018,6 @@ Configuration:
         Internal Python:          ${with_python}
         Internal Perl:            ${with_perl}
         Enable LittleCms:         ${enable_lcms}
-        Enable Inkboard:          ${with_inkboard}
-        Enable SSL in Inkboard:   ${with_inkboard_ssl}
         Enable Poppler-Cairo:     ${enable_poppler_cairo}
         ImageMagick Magick++:     ${magick_ok}
         Libwpg:                   ${with_libwpg}