Changeset 728 for trunk

Show
Ignore:
Timestamp:
08/02/08 16:39:26 (4 months ago)
Author:
andreas
Message:

- add new files
- optional check for gdal

Location:
trunk
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r700 r728  
    100100  AC_PATH_PROG(GDAL_CONFIG, $PROG, "", $PATH) 
    101101]) 
    102 GDAL_CFLAGS=`$GDAL_CONFIG --cflags` 
    103 GDAL_LIBS=`$GDAL_CONFIG --libs` 
    104 AC_SUBST(GDAL_CFLAGS) 
    105 AC_SUBST(GDAL_LIBS) 
     102 
     103if test "x$GDAL_CONFIG" != "x"; then 
     104  GDAL_CFLAGS=`$GDAL_CONFIG --cflags` 
     105  GDAL_LIBS=`$GDAL_CONFIG --libs` 
     106  AC_SUBST(GDAL_CFLAGS) 
     107  AC_SUBST(GDAL_LIBS) 
     108fi 
     109AM_CONDITIONAL(HAVE_GDAL, test "x$GDAL_CONFIG" != "x") 
    106110 
    107111 

  • trunk/include/mapnik/Makefile.am

    r691 r728  
    5050        filter_visitor.hpp \ 
    5151        font_engine_freetype.hpp \ 
     52        font_set.hpp \ 
    5253        gamma.hpp \ 
    5354        geometry.hpp \ 

  • trunk/plugins/input/gdal/Makefile.am

    r699 r728  
     1if HAVE_GDAL 
    12 
    23pkglib_LTLIBRARIES = \ 
    … …  
    1920        -shrext .input 
    2021 
     22endif 
     23 
    2124## File created by the gnome-build tools 

  • trunk/src/Makefile.am

    r700 r728  
    3131        filter_factory.cpp \ 
    3232        font_engine_freetype.cpp \ 
     33        font_set.cpp \ 
    3334        graphics.cpp \ 
    3435        image_reader.cpp \