Update version number for R14.0.8 final release.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cmake"]
+	path = cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

AUTHORS

@@ -1 +1,6 @@
+Current maintainers:
+The TDE Project
+https://trinitydesktop.org/contributors.php
+
+Original author:
 Raph Levien <raph@acm.org>

CMakeLists.txt

@@ -0,0 +1,240 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( libart-lgpl )
+set( VERSION R14.0.8 )
+set( LIBART_VERSION 2.3.21 )
+
+string( REPLACE "." ";" LIBART_VERSION_LIST ${LIBART_VERSION} )
+list( GET LIBART_VERSION_LIST 0 LIBART_MAJOR_VERSION )
+list( GET LIBART_VERSION_LIST 1 LIBART_MINOR_VERSION )
+list( GET LIBART_VERSION_LIST 2 LIBART_MICRO_VERSION )
+
+
+#### include essential cmake modules
+
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+enable_testing( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                     )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H -DLIBART_COMPILATION )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
+configure_file( art_config.h.in art_config.h @ONLY )
+configure_file( libart-features.h.in libart-features.h @ONLY )
+
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+
+##### art_lgpl_2
+
+set( _SRCS art_affine.c art_alphagamma.c
+           art_bpath.c art_gray_svp.c
+           art_misc.c art_pixbuf.c
+           art_rect.c art_rect_svp.c
+           art_rect_uta.c art_render.c
+           art_render_gradient.c art_render_mask.c
+           art_render_svp.c art_rgb.c
+           art_rgb_affine.c art_rgb_affine_private.c
+           art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c
+           art_rgb_rgba_affine.c art_rgb_a_affine.c
+           art_rgba.c art_rgb_svp.c
+           art_svp.c art_svp_intersect.c
+           art_svp_ops.c art_svp_point.c
+           art_svp_render_aa.c art_svp_vpath.c
+           art_svp_vpath_stroke.c art_svp_wind.c
+           art_uta.c art_uta_ops.c
+           art_uta_rect.c art_uta_vpath.c
+           art_uta_svp.c art_vpath.c
+           art_vpath_bpath.c art_vpath_dash.c
+           art_vpath_svp.c libart-features.c
+)
+
+## shared
+
+tde_add_library( art_lgpl_2 SHARED
+
+  SOURCES
+        ${_SRCS}
+  LINK
+      m
+
+  VERSION ${LIBART_VERSION}
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+## static
+
+tde_add_library( art_lgpl_2 STATIC_PIC
+
+  SOURCES
+        ${_SRCS}
+  LINK
+      m
+
+  VERSION ${LIBART_VERSION}
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+## tests
+
+tde_add_check_executable( testart
+    SOURCES
+        testart.c
+
+    LINK
+        art_lgpl_2-shared
+        m
+)
+add_test(
+    NAME testart-testpat
+    COMMAND testart testpat
+)
+#-- the testart-gradient often ends at sigsegv
+#add_test(
+#    NAME testart-gradient
+#    COMMAND testart gradient
+#)
+add_test(
+    NAME testart-dash
+    COMMAND testart dash
+)
+add_test(
+    NAME testart-dist
+    COMMAND testart dist
+)
+add_test(
+    NAME testart-intersect
+    COMMAND testart intersect
+)
+
+
+tde_add_check_executable( testuta
+    SOURCES
+        testuta.c
+
+    LINK
+        art_lgpl_2-shared
+        m
+
+    TEST
+)
+
+
+##### Headers
+
+set( _headers art_affine.h art_alphagamma.h
+              art_bpath.h
+              art_filterlevel.h art_gray_svp.h
+              art_misc.h art_pathcode.h art_pixbuf.h
+              art_point.h art_rect.h art_rect_svp.h
+              art_rect_uta.h art_render.h
+              art_render_gradient.h art_render_mask.h
+              art_render_svp.h art_rgb.h
+              art_rgb_affine.h art_rgb_bitmap_affine.h
+              art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h
+              art_rgb_a_affine.h art_rgb_svp.h
+              art_rgba.h art_svp.h
+              art_svp_intersect.h art_svp_ops.h
+              art_svp_point.h art_svp_render_aa.h
+              art_svp_vpath.h art_svp_vpath_stroke.h
+              art_svp_wind.h art_uta.h
+              art_uta_ops.h art_uta_rect.h
+              art_uta_vpath.h art_uta_svp.h
+              art_vpath.h art_vpath_bpath.h
+              art_vpath_dash.h art_vpath_svp.h
+              libart.h
+              ${CMAKE_CURRENT_BINARY_DIR}/art_config.h
+              ${CMAKE_CURRENT_BINARY_DIR}/libart-features.h
+)
+
+install(
+    FILES ${_headers}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/libart-2.0/libart_lgpl
+)
+
+
+#### pkg-config
+
+set( prefix ${CMAKE_INSTALL_PREFIX} )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" exec_prefix ${EXEC_INSTALL_PREFIX} )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" includedir ${INCLUDE_INSTALL_DIR}  )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir ${LIB_INSTALL_DIR}          )
+
+configure_file( libart-2.0.pc.in  libart-2.0.pc  @ONLY )
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/libart-2.0.pc
+    DESTINATION ${PKGCONFIG_INSTALL_DIR}
+)
+
+install(
+    PROGRAMS libart2-config
+    DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### man page
+
+tde_conditional_add_subdirectory( BUILD_DOC doc )

ConfigureChecks.cmake

@@ -0,0 +1,52 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
+
+
+##### check of type size
+
+check_type_size( char  ART_SIZEOF_CHAR  )
+check_type_size( short ART_SIZEOF_SHORT )
+check_type_size( int   ART_SIZEOF_INT   )
+check_type_size( long  ART_SIZEOF_LONG  )
+
+if( ${ART_SIZEOF_CHAR} EQUAL 1 )
+  set( ART_U8_TYPE "unsigned char" )
+else( )
+  tde_message_fatal( "sizeof(char) != 1" )
+endif( )
+
+if( ${ART_SIZEOF_SHORT} EQUAL 2 )
+  set( ART_U16_TYPE "unsigned short" )
+else( )
+  tde_message_fatal( "sizeof(short) != 2" )
+endif( )
+
+if( ${ART_SIZEOF_INT} EQUAL 4 )
+  set( ART_U32_TYPE "unsigned int" )
+else( )
+  if( ${ART_SIZEOF_LONG} EQUAL 4 )
+    set( ART_U32_TYPE "unsigned long" )
+  else( )
+    tde_message_fatal( "sizeof(int) != 4 and sizeof(long) != 4" )
+  endif( )
+endif( )

Makefile.am

@@ -3,16 +3,10 @@ noinst_PROGRAMS = testart testuta
 bin_SCRIPTS = \
 	libart2-config
 
-noinst_SCRIPTS = gen_art_config.sh
+BUILT_SOURCES = art_config.h libart-features.h
-
-BUILT_SOURCES = art_config.h
-
-art_config.h:
-	./gen_art_config.sh > art_config.h
 
 EXTRA_DIST = 			\
 	libart.def		\
-	libart-config.in	\
 	libart-2.0.pc.in	\
 	libart-2.0-uninstalled.pc.in
 
@@ -166,9 +160,6 @@ tests:	testart testuta
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libart-2.0.pc
 
-libart2-config: libart-config
-	cp -f libart-config libart2-config
-
 install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib

art_affine.h

@@ -21,8 +21,10 @@
 #define __ART_AFFINE_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_point.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_point.h>
 #endif
 
@@ -30,59 +32,59 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_affine_point (ArtPoint *dst, const ArtPoint *src,
 		  const double affine[6]);
 
-void
+LIBART_EXPORT void
 art_affine_invert (double dst_affine[6], const double src_affine[6]);
 
 /* flip the matrix, FALSE, FALSE is a simple copy operation, and
    TRUE, TRUE equals a rotation by 180 degrees */
-void
+LIBART_EXPORT void
 art_affine_flip (double dst_affine[6], const double src_affine[6],
                  int horz, int vert);
 
-void
+LIBART_EXPORT void
 art_affine_to_string (char str[128], const double src[6]);
 
-void
+LIBART_EXPORT void
 art_affine_multiply (double dst[6],
 		     const double src1[6], const double src2[6]);
 
 /* set up the identity matrix */
-void
+LIBART_EXPORT void
 art_affine_identity (double dst[6]);
 
 /* set up a scaling matrix */
-void
+LIBART_EXPORT void
 art_affine_scale (double dst[6], double sx, double sy);
 
 /* set up a rotation matrix; theta is given in degrees */
-void
+LIBART_EXPORT void
 art_affine_rotate (double dst[6], double theta);
 
 /* set up a shearing matrix; theta is given in degrees */
-void
+LIBART_EXPORT void
 art_affine_shear (double dst[6], double theta);
 
 /* set up a translation matrix */
-void
+LIBART_EXPORT void
 art_affine_translate (double dst[6], double tx, double ty);
 
 
 /* find the affine's "expansion factor", i.e. the scale amount */
-double
+LIBART_EXPORT double
 art_affine_expansion (const double src[6]);
 
 /* Determine whether the affine transformation is rectilinear,
    i.e. whether a rectangle aligned to the grid is transformed into
    another rectangle aligned to the grid. */
-int
+LIBART_EXPORT int
 art_affine_rectilinear (const double src[6]);
 
 /* Determine whether two affine transformations are equal within grid allignment */
-int
+LIBART_EXPORT int
 art_affine_equal (double matrix1[6], double matrix2[6]);
 
 

art_alphagamma.h

@@ -23,8 +23,10 @@
 /* Alphagamma tables */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #endif
 
@@ -42,10 +44,10 @@ struct _ArtAlphaGamma {
   art_u8 invtable[1];
 };
 
-ArtAlphaGamma *
+LIBART_EXPORT ArtAlphaGamma *
 art_alphagamma_new (double gamma);
 
-void
+LIBART_EXPORT void
 art_alphagamma_free (ArtAlphaGamma *alphagamma);
 
 #ifdef __cplusplus

art_bpath.h

@@ -21,10 +21,12 @@
 #define __ART_BPATH_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #include "art_point.h"
 #include "art_pathcode.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_point.h>
 #include <libart_lgpl/art_pathcode.h>
@@ -49,7 +51,7 @@ struct _ArtBpath {
   double y3;
 };
 
-ArtBpath *
+LIBART_EXPORT ArtBpath *
 art_bpath_affine_transform (const ArtBpath *src, const double matrix[6]);
 
 #ifdef __cplusplus

art_config.h

@@ -1,16 +0,0 @@
-/* Automatically generated by gen_art_config */
-
-#ifndef _ART_CONFIG_H_
-#define _ART_CONFIG_H_
-
-#define ART_SIZEOF_CHAR 1
-#define ART_SIZEOF_SHORT 2
-#define ART_SIZEOF_INT 4
-#define ART_SIZEOF_LONG 4
-
-typedef unsigned char art_u8;
-typedef unsigned short art_u16;
-typedef unsigned int art_u32;
-
-#endif /* _ART_CONFIG_H_ */
-

art_config.h.in

@@ -0,0 +1,25 @@
+
+#ifndef _ART_CONFIG_H_
+#define _ART_CONFIG_H_
+
+#define ART_SIZEOF_CHAR  @ART_SIZEOF_CHAR@
+#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@
+#define ART_SIZEOF_INT   @ART_SIZEOF_INT@
+#define ART_SIZEOF_LONG  @ART_SIZEOF_LONG@
+
+typedef @ART_U8_TYPE@ art_u8;
+typedef @ART_U16_TYPE@ art_u16;
+typedef @ART_U32_TYPE@ art_u32;
+
+#if defined(__KDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY)
+#define LIBART_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define LIBART_EXPORT __attribute__ ((visibility("default")))
+#elif defined(_WIN32)
+#define LIBART_NO_EXPORT
+#define LIBART_EXPORT __declspec(dllexport)
+#else
+#define LIBART_NO_EXPORT
+#define LIBART_EXPORT
+#endif
+
+#endif /* _ART_CONFIG_H_ */

art_gray_svp.h

@@ -23,9 +23,11 @@
 #define __ART_GRAY_SVP_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_svp.h>
 #endif
@@ -34,7 +36,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_gray_svp_aa (const ArtSVP *svp,
 		 int x0, int y0, int x1, int y1,
 		 art_u8 *buf, int rowstride);

art_misc.h

@@ -37,9 +37,9 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-void *art_alloc(size_t size);
+LIBART_EXPORT void *art_alloc(size_t size);
-void art_free(void *ptr);
+LIBART_EXPORT void art_free(void *ptr);
-void *art_realloc(void *ptr, size_t size);
+LIBART_EXPORT void *art_realloc(void *ptr, size_t size);
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
@@ -84,13 +84,13 @@ typedef int art_boolean;
 extern "C" {
 #endif
 
-void ART_GNUC_NORETURN
+LIBART_EXPORT void ART_GNUC_NORETURN
 art_die (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
 
-void
+LIBART_EXPORT void
 art_warn (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
 
-void
+LIBART_EXPORT void
 art_dprint (const char *fmt, ...) ART_GNUC_PRINTF (1, 2);
 
 #ifdef __cplusplus

art_pixbuf.h

@@ -25,8 +25,10 @@
    pixel buffer formats. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #endif
 
@@ -64,37 +66,37 @@ struct _ArtPixBuf {
 };
 
 /* allocate an ArtPixBuf from art_alloc()ed pixels (automated destruction) */
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_rgb (art_u8 *pixels, int width, int height, int rowstride);
 
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_rgba (art_u8 *pixels, int width, int height, int rowstride);
 
 /* allocate an ArtPixBuf from constant pixels (no destruction) */
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_const_rgb (const art_u8 *pixels, int width, int height, int rowstride);
 
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_const_rgba (const art_u8 *pixels, int width, int height, int rowstride);
 
 /* allocate an ArtPixBuf and notify creator upon destruction */
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_rgb_dnotify (art_u8 *pixels, int width, int height, int rowstride,
 			    void *dfunc_data, ArtDestroyNotify dfunc);
 
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_new_rgba_dnotify (art_u8 *pixels, int width, int height, int rowstride,
 			     void *dfunc_data, ArtDestroyNotify dfunc);
 
 /* free an ArtPixBuf with destroy notification */
-void
+LIBART_EXPORT void
 art_pixbuf_free (ArtPixBuf *pixbuf);
 
 /* deprecated function, use the _dnotify variants for allocation instead */
-void
+LIBART_EXPORT void
 art_pixbuf_free_shallow (ArtPixBuf *pixbuf);
 
-ArtPixBuf *
+LIBART_EXPORT ArtPixBuf *
 art_pixbuf_duplicate (const ArtPixBuf *pixbuf);
 
 #ifdef __cplusplus

art_rect.h

@@ -20,6 +20,12 @@
 #ifndef __ART_RECT_H__
 #define __ART_RECT_H__
 
+#ifdef LIBART_COMPILATION
+#include "art_config.h"
+#else
+#include <libart_lgpl/art_config.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -38,38 +44,38 @@ struct _ArtIRect {
 };
 
 /* Make a copy of the rectangle. */
-void art_irect_copy (ArtIRect *dest, const ArtIRect *src);
+LIBART_EXPORT void art_irect_copy (ArtIRect *dest, const ArtIRect *src);
 
 /* Find the smallest rectangle that includes both source rectangles. */
-void art_irect_union (ArtIRect *dest,
+LIBART_EXPORT void art_irect_union (ArtIRect *dest,
 		      const ArtIRect *src1, const ArtIRect *src2);
 
 /* Return the intersection of the two rectangles */
-void art_irect_intersect (ArtIRect *dest,
+LIBART_EXPORT void art_irect_intersect (ArtIRect *dest,
 			  const ArtIRect *src1, const ArtIRect *src2);
 
 /* Return true if the rectangle is empty. */
-int art_irect_empty (const ArtIRect *src);
+LIBART_EXPORT int art_irect_empty (const ArtIRect *src);
 
 /* Make a copy of the rectangle. */
-void art_drect_copy (ArtDRect *dest, const ArtDRect *src);
+LIBART_EXPORT void art_drect_copy (ArtDRect *dest, const ArtDRect *src);
 
 /* Find the smallest rectangle that includes both source rectangles. */
-void art_drect_union (ArtDRect *dest,
+LIBART_EXPORT void art_drect_union (ArtDRect *dest,
 		      const ArtDRect *src1, const ArtDRect *src2);
 
 /* Return the intersection of the two rectangles */
-void art_drect_intersect (ArtDRect *dest,
+LIBART_EXPORT void art_drect_intersect (ArtDRect *dest,
 			  const ArtDRect *src1, const ArtDRect *src2);
 
 /* Return true if the rectangle is empty. */
-int art_drect_empty (const ArtDRect *src);
+LIBART_EXPORT int art_drect_empty (const ArtDRect *src);
 
-void
+LIBART_EXPORT void
 art_drect_affine_transform (ArtDRect *dst, const ArtDRect *src,
 			   const double matrix[6]);
 
-void art_drect_to_irect (ArtIRect *dst, ArtDRect *src);
+LIBART_EXPORT void art_drect_to_irect (ArtIRect *dst, ArtDRect *src);
 
 #ifdef __cplusplus
 }

art_rect_svp.h

@@ -23,8 +23,10 @@
 /* Find the bounding box of a sorted vector path. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -32,12 +34,12 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_drect_svp (ArtDRect *bbox, const ArtSVP *svp);
 
 /* Compute the bounding box of the svp and union it in to the
    existing bounding box. */
-void
+LIBART_EXPORT void
 art_drect_svp_union (ArtDRect *bbox, const ArtSVP *svp);
 
 #ifdef __cplusplus

art_rect_uta.h

@@ -21,9 +21,11 @@
 #define __ART_RECT_UTA_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_rect.h"
 #include "art_uta.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_rect.h>
 #include <libart_lgpl/art_uta.h>
 #endif
@@ -32,7 +34,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtIRect *
+LIBART_EXPORT ArtIRect *
 art_rect_list_from_uta (ArtUta *uta, int max_width, int max_height,
 			int *p_nrects);
 

art_render.h

@@ -24,8 +24,10 @@
 #define __ART_RENDER_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_alphagamma.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_alphagamma.h>
 #endif
 
@@ -143,36 +145,36 @@ struct _ArtRender {
   art_boolean need_span;
 };
 
-ArtRender *
+LIBART_EXPORT ArtRender *
 art_render_new (int x0, int y0, int x1, int y1,
 		art_u8 *pixels, int rowstride,
 		int n_chan, int depth, ArtAlphaType alpha_type,
 		ArtAlphaGamma *alphagamma);
 
-void
+LIBART_EXPORT void
 art_render_invoke (ArtRender *render);
 
-void
+LIBART_EXPORT void
 art_render_clear (ArtRender *render, const ArtPixMaxDepth *clear_color);
 
-void
+LIBART_EXPORT void
 art_render_clear_rgb (ArtRender *render, art_u32 clear_rgb);
 
-void
+LIBART_EXPORT void
 art_render_mask_solid (ArtRender *render, int opacity);
 
-void
+LIBART_EXPORT void
 art_render_image_solid (ArtRender *render, ArtPixMaxDepth *color);
 
 /* The next two functions are for custom mask sources only. */
-void
+LIBART_EXPORT void
 art_render_add_mask_source (ArtRender *render, ArtMaskSource *mask_source);
 
-void
+LIBART_EXPORT void
 art_render_invoke_callbacks (ArtRender *render, art_u8 *dest, int y);
 
 /* The following function is for custom image sources only. */
-void
+LIBART_EXPORT void
 art_render_add_image_source (ArtRender *render, ArtImageSource *image_source);
 
 #ifdef __cplusplus
@@ -180,4 +182,3 @@ art_render_add_image_source (ArtRender *render, ArtImageSource *image_source);
 #endif /* __cplusplus */
 
 #endif /* __ART_RENDER_H__ */
-

art_render_gradient.h

@@ -27,9 +27,11 @@
 #define __ART_RENDER_GRADIENT_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_render.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_render.h>
 #endif
@@ -70,12 +72,12 @@ struct _ArtGradientStop {
   ArtPixMaxDepth color[ART_MAX_CHAN + 1];
 };
 
-void
+LIBART_EXPORT void
 art_render_gradient_linear (ArtRender *render,
 			    const ArtGradientLinear *gradient,
 			    ArtFilterLevel level);
 
-void
+LIBART_EXPORT void
 art_render_gradient_radial (ArtRender *render,
 			    const ArtGradientRadial *gradient,
 			    ArtFilterLevel level);

art_render_mask.h

@@ -26,8 +26,10 @@
 #define __ART_RENDER_MASK_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_render.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_render.h>
 #endif
 
@@ -35,7 +37,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_render_mask (ArtRender *render,
 		 int x0, int y0, int x1, int y1,
 		 const art_u8 *mask_buf, int rowstride);

art_render_svp.c

@@ -21,7 +21,7 @@
  *
  * Authors: Raph Levien <raph@acm.org>
  */
-
+#include "config.h"
 #include "art_render_svp.h"
 #include "art_svp_render_aa.h"
 

art_render_svp.h

@@ -26,9 +26,11 @@
 #define __ART_RENDER_SVP_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_render.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_render.h>
 #include <libart_lgpl/art_svp.h>
 #endif
@@ -37,7 +39,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_render_svp (ArtRender *render, const ArtSVP *svp);
 
 #ifdef __cplusplus

art_rgb.h

@@ -21,8 +21,10 @@
 #define __ART_RGB_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #endif
 
@@ -30,10 +32,10 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_fill_run (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int n);
 
-void
+LIBART_EXPORT void
 art_rgb_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha,
 		   int n);
 

art_rgb_a_affine.h

@@ -24,9 +24,11 @@
    over rgb pixel buffers. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_alphagamma.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_alphagamma.h>
 #endif
@@ -35,7 +37,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_a_affine (art_u8 *dst,
 		  int x0, int y0, int x1, int y1, int dst_rowstride,
 		  const art_u8 *src,

art_rgb_affine.h

@@ -24,9 +24,11 @@
    over rgb pixel buffers. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_alphagamma.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_alphagamma.h>
 #endif
@@ -35,7 +37,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_affine (art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride,
 		const art_u8 *src,
 		int src_width, int src_height, int src_rowstride,

art_rgb_affine_private.h

@@ -20,6 +20,12 @@
 #ifndef __ART_RGB_AFFINE_PRIVATE_H__
 #define __ART_RGB_AFFINE_PRIVATE_H__
 
+#ifdef LIBART_COMPILATION
+#include "art_config.h"
+#else
+#include <libart_lgpl/art_config.h>
+#endif
+
 /* This module handles compositing of affine-transformed rgb images
    over rgb pixel buffers. */
 
@@ -27,7 +33,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_affine_run (int *p_x0, int *p_x1, int y,
 		    int src_width, int src_height,
 		    const double affine[6]);

art_rgb_bitmap_affine.h

@@ -24,9 +24,11 @@
    over rgb pixel buffers. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_alphagamma.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_alphagamma.h>
 #endif
@@ -35,7 +37,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_bitmap_affine (art_u8 *dst,
 		       int x0, int y0, int x1, int y1, int dst_rowstride,
 		       const art_u8 *src,

art_rgb_pixbuf_affine.h

@@ -24,10 +24,12 @@
    pixbuf images over rgb pixel buffers. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_alphagamma.h"
 #include "art_pixbuf.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_alphagamma.h>
 #include <libart_lgpl/art_pixbuf.h>
@@ -37,7 +39,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_pixbuf_affine (art_u8 *dst,
 		       int x0, int y0, int x1, int y1, int dst_rowstride,
 		       const ArtPixBuf *pixbuf,

art_rgb_rgba_affine.h

@@ -24,9 +24,11 @@
    over rgb pixel buffers. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_filterlevel.h"
 #include "art_alphagamma.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_filterlevel.h>
 #include <libart_lgpl/art_alphagamma.h>
 #endif
@@ -35,7 +37,7 @@
 extern "C" {
 #endif
 
-void
+LIBART_EXPORT void
 art_rgb_rgba_affine (art_u8 *dst,
 		     int x0, int y0, int x1, int y1, int dst_rowstride,
 		     const art_u8 *src,

art_rgb_svp.h

@@ -23,9 +23,11 @@
 /* Render a sorted vector path into an RGB buffer. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_alphagamma.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_alphagamma.h>
 #include <libart_lgpl/art_svp.h>
 #endif
@@ -34,14 +36,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_rgb_svp_aa (const ArtSVP *svp,
 		int x0, int y0, int x1, int y1,
 		art_u32 fg_color, art_u32 bg_color,
 		art_u8 *buf, int rowstride,
 		ArtAlphaGamma *alphagamma);
 
-void
+LIBART_EXPORT void
 art_rgb_svp_alpha (const ArtSVP *svp,
 		   int x0, int y0, int x1, int y1,
 		   art_u32 rgba,

art_rgba.h

@@ -24,8 +24,10 @@
 #define __ART_RGBA_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #endif
 
@@ -33,13 +35,13 @@
 extern "C" {
 #endif /* __cplusplus */
 
-void
+LIBART_EXPORT void
 art_rgba_rgba_composite (art_u8 *dst, const art_u8 *src, int n);
 
-void
+LIBART_EXPORT void
 art_rgba_fill_run (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int n);
 
-void
+LIBART_EXPORT void
 art_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, int n);
 
 #ifdef __cplusplus

art_svp.h

@@ -23,9 +23,11 @@
 /* Basic data structures and constructors for sorted vector paths */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_rect.h"
 #include "art_point.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_rect.h>
 #include <libart_lgpl/art_point.h>
 #endif
@@ -49,16 +51,16 @@ struct _ArtSVP {
   ArtSVPSeg segs[1];
 };
 
-int
+LIBART_EXPORT int
 art_svp_add_segment (ArtSVP **p_vp, int *pn_segs_max,
 		     int **pn_points_max,
 		     int n_points, int dir, ArtPoint *points,
 		     ArtDRect *bbox);
 
-void
+LIBART_EXPORT void
 art_svp_free (ArtSVP *svp);
 
-int
+LIBART_EXPORT int
 art_svp_seg_compare (const void *s1, const void *s2);
 
 #ifdef __cplusplus

art_svp_intersect.h

@@ -23,8 +23,10 @@
 /* The funky new SVP intersector. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -51,16 +53,16 @@ struct _ArtSvpWriter {
   void (*close_segment) (ArtSvpWriter *self, int seg_id);
 };
 
-ArtSvpWriter *
+LIBART_EXPORT ArtSvpWriter *
 art_svp_writer_rewind_new (ArtWindRule rule);
 
-ArtSVP *
+LIBART_EXPORT ArtSVP *
 art_svp_writer_rewind_reap (ArtSvpWriter *self);
 
-int
+LIBART_EXPORT int
 art_svp_seg_compare (const void *s1, const void *s2);
 
-void
+LIBART_EXPORT void
 art_svp_intersector (const ArtSVP *in, ArtSvpWriter *out);
 
 #ifdef __cplusplus

art_svp_ops.h

@@ -21,8 +21,10 @@
 #define __ART_SVP_OPS_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -32,10 +34,10 @@ extern "C" {
 
 /* Vector path set operations, over sorted vpaths. */
 
-ArtSVP *art_svp_union (const ArtSVP *svp1, const ArtSVP *svp2);
+LIBART_EXPORT ArtSVP *art_svp_union (const ArtSVP *svp1, const ArtSVP *svp2);
-ArtSVP *art_svp_intersect (const ArtSVP *svp1, const ArtSVP *svp2);
+LIBART_EXPORT ArtSVP *art_svp_intersect (const ArtSVP *svp1, const ArtSVP *svp2);
-ArtSVP *art_svp_diff (const ArtSVP *svp1, const ArtSVP *svp2);
+LIBART_EXPORT ArtSVP *art_svp_diff (const ArtSVP *svp1, const ArtSVP *svp2);
-ArtSVP *art_svp_minus (const ArtSVP *svp1, const ArtSVP *svp2);
+LIBART_EXPORT ArtSVP *art_svp_minus (const ArtSVP *svp1, const ArtSVP *svp2);
 
 #ifdef __cplusplus
 }

art_svp_point.h

@@ -23,8 +23,10 @@
 /* Determine whether a point is inside, or near, an svp. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -32,10 +34,10 @@
 extern "C" {
 #endif /* __cplusplus */
 
-int
+LIBART_EXPORT int
 art_svp_point_wind (ArtSVP *svp, double x, double y);
 
-double
+LIBART_EXPORT double
 art_svp_point_dist (ArtSVP *svp, double x, double y);
 
 #ifdef __cplusplus
@@ -43,7 +45,3 @@ art_svp_point_dist (ArtSVP *svp, double x, double y);
 #endif /* __cplusplus */
 
 #endif /* __ART_SVP_H__ */
-
-
-
-

art_svp_render_aa.h

@@ -23,8 +23,10 @@
 /* The spiffy antialiased renderer for sorted vector paths. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -40,18 +42,18 @@ struct _ArtSVPRenderAAStep {
   int delta; /* stored with 16 fractional bits */
 };
 
-ArtSVPRenderAAIter *
+LIBART_EXPORT ArtSVPRenderAAIter *
 art_svp_render_aa_iter (const ArtSVP *svp,
 			int x0, int y0, int x1, int y1);
 
-void
+LIBART_EXPORT void
 art_svp_render_aa_iter_step (ArtSVPRenderAAIter *iter, int *p_start,
 			     ArtSVPRenderAAStep **p_steps, int *p_n_steps);
 
-void
+LIBART_EXPORT void
 art_svp_render_aa_iter_done (ArtSVPRenderAAIter *iter);
 
-void
+LIBART_EXPORT void
 art_svp_render_aa (const ArtSVP *svp,
 		   int x0, int y0, int x1, int y1,
 		   void (*callback) (void *callback_data,

art_svp_vpath.h

@@ -21,9 +21,11 @@
 #define __ART_SVP_VPATH_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
@@ -34,7 +36,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtSVP *
+LIBART_EXPORT ArtSVP *
 art_svp_from_vpath (ArtVpath *vpath);
 
 #ifdef __cplusplus

art_svp_vpath_stroke.h

@@ -23,9 +23,11 @@
 /* Sort vector paths into sorted vector paths. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
@@ -46,7 +48,7 @@ typedef enum {
   ART_PATH_STROKE_CAP_SQUARE
 } ArtPathStrokeCapType;
 
-ArtSVP *
+LIBART_EXPORT ArtSVP *
 art_svp_vpath_stroke (ArtVpath *vpath,
 		      ArtPathStrokeJoinType join,
 		      ArtPathStrokeCapType cap,
@@ -55,7 +57,7 @@ art_svp_vpath_stroke (ArtVpath *vpath,
 		      double flatness);
 
 /* This version may have winding numbers exceeding 1. */
-ArtVpath *
+LIBART_EXPORT ArtVpath *
 art_svp_vpath_stroke_raw (ArtVpath *vpath,
 			  ArtPathStrokeJoinType join,
 			  ArtPathStrokeCapType cap,

art_svp_wind.h

@@ -24,8 +24,10 @@
    vector paths. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #endif
 
@@ -43,10 +45,10 @@ typedef enum {
 } ArtWindRule;
 #endif
 
-ArtSVP *
+LIBART_EXPORT ArtSVP *
 art_svp_uncross (ArtSVP *vp);
 
-ArtSVP *
+LIBART_EXPORT ArtSVP *
 art_svp_rewind_uncrossed (ArtSVP *vp, ArtWindRule rule);
 
 

art_uta.h

@@ -23,8 +23,10 @@
 /* Basic data structures and constructors for microtile arrays */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_misc.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_misc.h>
 #endif
 
@@ -56,13 +58,13 @@ struct _ArtUta {
   ArtUtaBbox *utiles;
 };
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_new (int x0, int y0, int x1, int y1);
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_new_coords (int x0, int y0, int x1, int y1);
 
-void
+LIBART_EXPORT void
 art_uta_free (ArtUta *uta);
 
 #ifdef __cplusplus

art_uta_ops.h

@@ -23,8 +23,10 @@
 /* Basic operations on microtile arrays */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_uta.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_uta.h>
 #endif
 
@@ -32,7 +34,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_union (ArtUta *uta1, ArtUta *uta2);
 
 #ifdef __cplusplus

art_uta_rect.h

@@ -21,9 +21,11 @@
 #define __ART_UTA_RECT_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_rect.h"
 #include "art_uta.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_rect.h>
 #include <libart_lgpl/art_uta.h>
 #endif
@@ -32,7 +34,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_from_irect (ArtIRect *bbox);
 
 #ifdef __cplusplus

art_uta_svp.h

@@ -23,9 +23,11 @@
 /* Basic data structures and constructors for microtile arrays */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #include "art_uta.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #include <libart_lgpl/art_uta.h>
 #endif
@@ -34,7 +36,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_from_svp (const ArtSVP *svp);
 
 #ifdef __cplusplus

art_uta_vpath.h

@@ -23,9 +23,11 @@
 /* Basic data structures and constructors for microtile arrays */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_uta.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_uta.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
@@ -34,11 +36,11 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtUta *
+LIBART_EXPORT ArtUta *
 art_uta_from_vpath (const ArtVpath *vec);
 
 /* This is a private function: */
-void
+LIBART_EXPORT void
 art_uta_add_line (ArtUta *uta, double x0, double y0, double x1, double y1,
 		  int *rbuf, int rbuf_rowstride);
 
@@ -47,4 +49,3 @@ art_uta_add_line (ArtUta *uta, double x0, double y0, double x1, double y1,
 #endif /* __cplusplus */
 
 #endif /* __ART_UTA_VPATH_H__ */
-

art_vpath.h

@@ -21,9 +21,11 @@
 #define __ART_VPATH_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_rect.h"
 #include "art_pathcode.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_rect.h>
 #include <libart_lgpl/art_pathcode.h>
 #endif
@@ -45,23 +47,23 @@ struct _ArtVpath {
 
 /* Some of the functions need to go into their own modules */
 
-void
+LIBART_EXPORT void
 art_vpath_add_point (ArtVpath **p_vpath, int *pn_points, int *pn_points_max,
 		     ArtPathcode code, double x, double y);
 
-ArtVpath *
+LIBART_EXPORT ArtVpath *
 art_vpath_new_circle (double x, double y, double r);
 
-ArtVpath *
+LIBART_EXPORT ArtVpath *
 art_vpath_affine_transform (const ArtVpath *src, const double matrix[6]);
 
-void
+LIBART_EXPORT void
 art_vpath_bbox_drect (const ArtVpath *vec, ArtDRect *drect);
 
-void
+LIBART_EXPORT void
 art_vpath_bbox_irect (const ArtVpath *vec, ArtIRect *irect);
 
-ArtVpath *
+LIBART_EXPORT ArtVpath *
 art_vpath_perturb (ArtVpath *src);
 
 #ifdef __cplusplus

art_vpath_bpath.h

@@ -21,9 +21,11 @@
 #define __ART_VPATH_BPATH_H__
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_bpath.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_bpath.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
@@ -32,14 +34,14 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtPoint *art_bezier_to_vec (double x0, double y0,
+LIBART_EXPORT ArtPoint *art_bezier_to_vec (double x0, double y0,
 			     double x1, double y1,
 			     double x2, double y2,
 			     double x3, double y3,
 			     ArtPoint *p,
 			     int level);
 
-ArtVpath *art_bez_path_to_vec (const ArtBpath *bez, double flatness);
+LIBART_EXPORT ArtVpath *art_bez_path_to_vec (const ArtBpath *bez, double flatness);
 
 #ifdef __cplusplus
 }

art_vpath_dash.h

@@ -23,8 +23,10 @@
 /* Apply a dash style to a vector path. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
 
@@ -40,7 +42,7 @@ struct _ArtVpathDash {
   double *dash;
 };
 
-ArtVpath *
+LIBART_EXPORT ArtVpath *
 art_vpath_dash (const ArtVpath *vpath, const ArtVpathDash *dash);
 
 #ifdef __cplusplus

art_vpath_svp.h

@@ -23,9 +23,11 @@
 /* "Unsort" a sorted vector path into an ordinary vector path. */
 
 #ifdef LIBART_COMPILATION
+#include "art_config.h"
 #include "art_svp.h"
 #include "art_vpath.h"
 #else
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_svp.h>
 #include <libart_lgpl/art_vpath.h>
 #endif
@@ -34,7 +36,7 @@
 extern "C" {
 #endif /* __cplusplus */
 
-ArtVpath *art_vpath_from_svp (const ArtSVP *svp);
+LIBART_EXPORT ArtVpath *art_vpath_from_svp (const ArtSVP *svp);
 
 #ifdef __cplusplus
 }

cmake

@@ -0,0 +1 @@
+Subproject commit ca47fa83300e843f1e469e3f455e58aa299e1e9d

config.h.cmake

@@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

configure.in

@@ -101,14 +101,37 @@ AC_SUBST(ART_SIZEOF_INT, $ac_cv_sizeof_int)
 AC_CHECK_SIZEOF(long)
 AC_SUBST(ART_SIZEOF_LONG, $ac_cv_sizeof_long)
 
+if test $ART_SIZEOF_CHAR -eq 1; then
+  AC_SUBST( ART_U8_TYPE, "unsigned char" )
+else
+  echo 1>&2 "sizeof(char) != 1"
+  exit 1
+fi
+
+if test $ART_SIZEOF_SHORT -eq 2; then
+  AC_SUBST( ART_U16_TYPE, "unsigned short" )
+else
+  echo 1>&2 "sizeof(short) != 2"
+  exit 2
+fi
+
+if test $ART_SIZEOF_INT -eq 4; then
+  AC_SUBST( ART_U32_TYPE, "unsigned int" )
+else
+  if test $ART_SIZEOF_LONG -eq 4; then
+    AC_SUBST( ART_U32_TYPE, "unsigned long" )
+  else
+    echo 1>&2 "sizeof(int) != 4 and sizeof(long) != 4"
+    exit 3
+  fi
+fi
+
 AC_CONFIG_FILES([
+art_config.h
 libart-features.h
 Makefile
 libart-2.0.pc
 libart-2.0-uninstalled.pc
 libart-zip])
 
-AC_CONFIG_FILES([libart-config],[chmod +x libart-config])
-AC_CONFIG_FILES([gen_art_config.sh],[chmod +x gen_art_config.sh])
-
 AC_OUTPUT

depcomp

@@ -1,630 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

doc/CMakeLists.txt

@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )

doc/man/CMakeLists.txt

@@ -0,0 +1,5 @@
+INSTALL(
+    FILES libart2-config.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)

doc/man/libart2-config.1

@@ -0,0 +1,52 @@
+.\" This manpage has been automatically generated by docbook2man 
+.\" from a DocBook document.  This tool can be found at:
+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+.\" Please send any bug reports, improvements, comments, patches, 
+.\" etc. to Steve Cheng <steve@ggi-project.org>.
+.TH "LIBART2-CONFIG" "1" "08 August 2003" "" ""
+.SH NAME
+libart2-config \- script to get information about the installed version of libart 2.x
+.SH SYNOPSIS
+
+\fBlibart2-config\fR [ \fB --prefix\fI[=DIR]\fB \fR ] [ \fB --exec-prefix\fI[=DIR]\fB \fR ] [ \fB --libs \fR ] [ \fB --cflags \fR ] [ \fB --version \fR ]
+
+.SH "DESCRIPTION"
+.PP
+\fBlibart2-config\fR is a tool that is used to determine
+the compiler and linker flags that should be used to compile and
+link programs that use \fIlibart\fR library.
+.SH "OPTIONS"
+.TP
+\fB--prefix=PREFIX\fR
+If specified, use \fIPREFIX\fR instead
+of the installation prefix that
+\fIlibart\fR was built with when computing
+the output for the \fB--cflags\fR and
+\fB--libs\fR options. This option is also used for
+the exec prefix if \fB--exec-prefix\fR was
+not specified. This option must be specified before any
+\fB--libs\fR or \fB--cflags\fR options.
+.TP
+\fB--exec-prefix=PREFIX\fR
+If specified, use \fIPREFIX\fR instead
+of the installation exec prefix that
+\fIlibart\fR was built with when computing
+the output for the \fB--cflags\fR and
+\fB--libs\fR options. This option must be specified
+before any \fB--libs\fR or \fB--cflags\fR options.
+.TP
+\fB--libs\fR
+Print the linker flags that are necessary to link a
+\fIlibart\fR program.
+.TP
+\fB--cflags\fR
+Print the compiler flags that are necessary to compile a
+\fIlibart\fR program.
+.TP
+\fB--version\fR
+Print the currently installed version of
+\fIlibart\fR on the standard output.
+.SH "AUTHOR"
+.PP
+This manual page was written by Christian Marillat <marillat@debian.org> for
+the Debian GNU/Linux system (but may be used by others).

install-sh

@@ -1,520 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2009-04-28.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

libart-2.0-uninstalled.pc.in

@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: libart
 Description: LGPL version of the libart library
-Version: @VERSION@
+Version: @LIBART_VERSION@
 Libs: ${pc_top_builddir}/${pcfiledir}/libart_lgpl_2.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}

libart-2.0.pc.in

@@ -5,6 +5,6 @@ includedir=@includedir@
 
 Name: libart
 Description: LGPL version of the libart library
-Version: @VERSION@
+Version: @LIBART_VERSION@
 Libs: -L${libdir} -lart_lgpl_2
 Cflags: -I${includedir}/libart-2.0

libart-features.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include "libart-features.h"
 
 /* General initialization hooks */

libart-features.h

@@ -1,24 +0,0 @@
-#ifndef LIBART_FEATURES_H
-#define LIBART_FEATURES_H 1
-
-#define LIBART_MAJOR_VERSION (2)
-#define LIBART_MINOR_VERSION (3)
-#define LIBART_MICRO_VERSION (21)
-#define LIBART_VERSION "2.3.21"
-
-#ifdef _WIN32
-#  ifdef LIBART_COMPILATION
-#    define LIBART_VAR __declspec(dllexport)
-#  else
-#    define LIBART_VAR extern __declspec(dllimport)
-#  endif
-#else
-#  define LIBART_VAR extern
-#endif
-
-LIBART_VAR const unsigned int libart_major_version, libart_minor_version, libart_micro_version;
-LIBART_VAR const char *libart_version;
-
-void libart_preinit(void *app, void *modinfo);
-void libart_postinit(void *app, void *modinfo);
-#endif

libart-features.h.in

@@ -1,6 +1,14 @@
 #ifndef LIBART_FEATURES_H
 #define LIBART_FEATURES_H 1
 
+#if !defined( _ART_CONFIG_H_ )
+#ifdef LIBART_COMPILATION
+#include "art_config.h"
+#else
+#include <libart_lgpl/art_config.h>
+#endif
+#endif
+
 #define LIBART_MAJOR_VERSION (@LIBART_MAJOR_VERSION@)
 #define LIBART_MINOR_VERSION (@LIBART_MINOR_VERSION@)
 #define LIBART_MICRO_VERSION (@LIBART_MICRO_VERSION@)
@@ -13,12 +21,16 @@
 #    define LIBART_VAR extern __declspec(dllimport)
 #  endif
 #else
-#  define LIBART_VAR extern
+#  ifdef LIBART_COMPILATION
+#    define LIBART_VAR LIBART_EXPORT
+#  else
+#    define LIBART_VAR extern
+#  endif
 #endif
 
 LIBART_VAR const unsigned int libart_major_version, libart_minor_version, libart_micro_version;
 LIBART_VAR const char *libart_version;
 
-void libart_preinit(void *app, void *modinfo);
+LIBART_EXPORT void libart_preinit(void *app, void *modinfo);
-void libart_postinit(void *app, void *modinfo);
+LIBART_EXPORT void libart_postinit(void *app, void *modinfo);
 #endif

libart.h

@@ -1,6 +1,7 @@
 #ifndef LIBART_H
 #define LIBART_H 1
 
+#include <libart_lgpl/art_config.h>
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_alphagamma.h>
 #include <libart_lgpl/art_bpath.h>

libart2-config

@@ -1,19 +1,24 @@
 #!/bin/sh
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-libs=""
-output_libs=no
-
 usage="\
-Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+Usage: libart2-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
 
 if test $# -eq 0; then
       echo "${usage}" 1>&2
       exit 1
 fi
 
+if ! which pkg-config >/dev/null; then
+    echo "pkg-config not found on your system" 1>&2
+    exit 1
+fi
+
+prefix=`pkg-config --variable=prefix libart-2.0`
+exec_prefix=`pkg-config --variable=exec_prefix libart-2.0`
+exec_prefix_set=no
+libs=""
+output_libs=no
+
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -38,14 +43,13 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
-      echo @LIBART_VERSION@
+      echo `pkg-config --modversion libart-2.0`
       ;;
     --cflags)
-      includes=-I@includedir@/libart-2.0
+      echo `pkg-config --cflags-only-I libart-2.0`
-      echo $includes
       ;;
     --libs)
-      libs="$libs -L@libdir@ -lart_lgpl_2"
+      libs=`pkg-config --libs libart-2.0`
       output_libs=yes
       ;;
     --static)
@@ -62,4 +66,3 @@ done
 if test $output_libs = yes ; then
     echo $libs
 fi
-

missing

@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

testart.c

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include "art_config.h"
 #include "art_misc.h"
 #include "art_vpath.h"
 #include "art_svp.h"

testuta.c

@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+#include "art_config.h"
 #include "art_misc.h"
 #include "art_uta.h"
 #include "art_vpath.h"