also make GD use the GP_CHECK_LIBRARY macro

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14466 67ed7778-7388-44ab-90cf-0a291f65f57c

4 files changed, 10 insertions, 19 deletions

diff --git a/camlibs/ax203/Makefile-files b/camlibs/ax203/Makefile-files
index f77b1be7b..b454e421e 100644
--- a/camlibs/ax203/Makefile-files
+++ b/camlibs/ax203/Makefile-files
@@ -6,4 +6,5 @@ EXTRA_LTLIBRARIES += ax203.la
 ax203_la_SOURCES = ax203/library.c ax203/ax203.c ax203/ax203.h ax203/ax203_decode_yuv.c ax203/ax203_decode_yuv_delta.c ax203/ax203_compress_jpeg.c ax203/jpeg_memsrcdest.h ax203/jpeg_memsrcdest.c ax203/tinyjpeg.c ax203/tinyjpeg.h ax203/tinyjpeg-internal.h ax203/jidctflt.c
 ax203_la_LDFLAGS = $(camlib_ldflags)
 ax203_la_DEPENDENCIES = $(camlib_dependencies)
-ax203_la_LIBADD = $(camlib_libadd) @LIBGD@ @LIBJPEG@
+ax203_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ @LIBJPEG@
+ax203_la_CFLAGS = @LIBGD_CFLAGS@
diff --git a/camlibs/st2205/Makefile-files b/camlibs/st2205/Makefile-files
index 853462483..a0caf30d3 100644
--- a/camlibs/st2205/Makefile-files
+++ b/camlibs/st2205/Makefile-files
@@ -6,4 +6,5 @@ EXTRA_LTLIBRARIES += st2205.la
 st2205_la_SOURCES = st2205/library.c st2205/st2205.c st2205/st2205.h st2205/st2205_decode.c
 st2205_la_LDFLAGS = $(camlib_ldflags)
 st2205_la_DEPENDENCIES = $(camlib_dependencies)
-st2205_la_LIBADD = $(camlib_libadd) @LIBGD@ $(LTLIBICONV)
+st2205_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@ $(LTLIBICONV)
+st2205_la_CFLAGS = @LIBGD_CFLAGS@
diff --git a/camlibs/tp6801/Makefile-files b/camlibs/tp6801/Makefile-files
index e14bd1f66..e2c13e713 100644
--- a/camlibs/tp6801/Makefile-files
+++ b/camlibs/tp6801/Makefile-files
@@ -6,4 +6,5 @@ EXTRA_LTLIBRARIES += tp6801.la
 tp6801_la_SOURCES = tp6801/library.c tp6801/tp6801.c tp6801/tp6801.h
 tp6801_la_LDFLAGS = $(camlib_ldflags)
 tp6801_la_DEPENDENCIES = $(camlib_dependencies)
-tp6801_la_LIBADD = $(camlib_libadd) @LIBGD@
+tp6801_la_LIBADD = $(camlib_libadd) @LIBGD_LIBS@
+tp6801_la_CFLAGS = @LIBGD_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 53bfe4612..9fb62c9c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ dnl ---------------------------------------------------------------------------
 dnl i18n support (including some hacks)
 dnl ---------------------------------------------------------------------------
 
-ALL_LINGUAS="da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
+ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN"
 GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
 AM_GNU_GETTEXT_VERSION([0.14.1])
 AM_GNU_GETTEXT([external])
@@ -275,30 +275,18 @@ GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}])
 dnl ---------------------------------------------------------------------------
 dnl check for libxml2
 dnl ---------------------------------------------------------------------------
-GP_CONFIG_MSG([libxml2 support])
 GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0],
                 [libxml/parser.h],[xmlFirstElementChild],[],[],
                 [default-on],
                 [http://xmlsoft.org]
 )
+GP_CONFIG_MSG([XML support for Olympus E series],[${have_LIBXML2}])
 
 dnl ---------------------------------------------------------------------------
 dnl check for libgd
 dnl ---------------------------------------------------------------------------
-LIBGD=""
-libgd_msg="no"
-AC_SUBST(LIBGD)
-AC_ARG_WITH([gd], AS_HELP_STRING([--without-gd], [Build without GD library (default: no)]))
-AS_IF([test "x$with_gd" != "xno"], [
-	AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
-		AC_CHECK_HEADER(gd.h,[
-			AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
-			LIBGD="-lgd"
-			libgd_msg="yes"
-		])
-	])
-])
-GP_CONFIG_MSG([GD conversion support],[${libgd_msg}])
+GP_CHECK_LIBRARY([LIBGD],[libgd],[>= 2.0],[gd.h],[gdImageCreateTrueColor],[],[],[default-on],[http://www.libgd.org/])
+GP_CONFIG_MSG([libGD conversion support],[${have_LIBGD}])
 
 dnl ---------------------------------------------------------------------------
 dnl Checks for header files.