Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (revision 34994) +++ trunk/config.h.in (revision 34995) @@ -41,6 +41,22 @@ end; end; +print {/* Temporary: will be removed if export_png is moved to librnd */\n} +print {\n\n/* Define to 1 if you have the header file. */\n} +print_ternary ?libs/gui/gd/presents {#define PCB_HAVE_GD_H 1} {/* #undef PCB_HAVE_GD_H */} + +print {\n\n/* Define to 1 if you have the `gdImageGif' function. */\n} +print_ternary ?libs/gui/gd/gdImageGif/presents {#define PCB_HAVE_GDIMAGEGIF 1} {/* #undef PCB_HAVE_GDIMAGEGIF */} + +print {\n\n/* Define to 1 if you have the `gdImageJpeg' function. */\n} +print_ternary ?libs/gui/gd/gdImageJpeg/presents {#define PCB_HAVE_GDIMAGEJPEG 1} {/* #undef PCB_HAVE_GDIMAGEJPEG */} + +print {\n\n/* Define to 1 if you have the `gdImagePng' function. */\n} +print_ternary ?libs/gui/gd/gdImagePng/presents {#define PCB_HAVE_GDIMAGEPNG 1} {/* #undef PCB_HAVE_GDIMAGEPNG */} + +print {\n\n/* Define to 1 if you have the `gdImageSetResolution' function. */\n} +print_ternary ?libs/gui/gd/gdImageSetResolution/presents {#define PCB_HAVE_GD_RESOLUTION 1} {/* #undef PCB_HAVE_GD_RESOLUTION */} + print [@ /* Relative path from bindir to exec_prefix */ @@ -56,3 +72,4 @@ #endif @] + Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 34994) +++ trunk/scconfig/Rev.h (revision 34995) @@ -1 +1 @@ -static const int myrev = 34937; +static const int myrev = 34995; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 34994) +++ trunk/scconfig/Rev.tab (revision 34995) @@ -1,3 +1,4 @@ +34995 configure fix png export missing formats 34937 configure lib_netmap: 2net mapping code placeholder (for io_pads) 34912 configure renames for 3.0.0 34899 configure remove glib from puller Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 34994) +++ trunk/src_plugins/export_png/png.c (revision 34995) @@ -145,17 +145,17 @@ #undef HAVE_SOME_FORMAT static const char *filetypes[] = { -#ifdef RND_HAVE_GDIMAGEPNG +#ifdef PCB_HAVE_GDIMAGEPNG FMT_png, #define HAVE_SOME_FORMAT 1 #endif -#ifdef RND_HAVE_GDIMAGEGIF +#ifdef PCB_HAVE_GDIMAGEGIF FMT_gif, #define HAVE_SOME_FORMAT 1 #endif -#ifdef RND_HAVE_GDIMAGEJPEG +#ifdef PCB_HAVE_GDIMAGEJPEG FMT_jpg, #define HAVE_SOME_FORMAT 1 #endif @@ -500,19 +500,19 @@ if (fmt == NULL) format_error = rnd_true; else if (strcmp(fmt, FMT_gif) == 0) -#ifdef RND_HAVE_GDIMAGEGIF +#ifdef PCB_HAVE_GDIMAGEGIF gdImageGif(im, f); #else format_error = rnd_true; #endif else if (strcmp(fmt, FMT_jpg) == 0) -#ifdef RND_HAVE_GDIMAGEJPEG +#ifdef PCB_HAVE_GDIMAGEJPEG gdImageJpeg(im, f, -1); #else format_error = rnd_true; #endif else if (strcmp(fmt, FMT_png) == 0) -#ifdef RND_HAVE_GDIMAGEPNG +#ifdef PCB_HAVE_GDIMAGEPNG gdImagePng(im, f); #else format_error = rnd_true; @@ -709,7 +709,7 @@ return; } -#ifdef RND_HAVE_GD_RESOLUTION +#ifdef PCB_HAVE_GD_RESOLUTION gdImageSetResolution(im, dpi, dpi); #endif