From 488680ffde67c778fcc404ea387d04f7536cd68d Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 17 Oct 2002 12:43:10 +0000 Subject: [PATCH] * libgphoto2/gphoto2-abilities-list.c: removed the fscking "can't load *.la" message * libgphoto2_port/m4/documentation.m4: removed unnecessary stuff (xmlto, fig2dev, etc.) git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5380 67ed7778-7388-44ab-90cf-0a291f65f57c --- ChangeLog | 5 + libgphoto2/gphoto2-abilities-list.c | 23 ++++- libgphoto2_port/m4/documentation.m4 | 145 +--------------------------- 3 files changed, 26 insertions(+), 147 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dafaa0ca..8463631f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-17 Hans Ulrich Niedermann + + * libgphoto2/gphoto2-abilities-list.c: removed the fscking "can't load *.la" message + * libgphoto2_port/m4/documentation.m4: removed unnecessary stuff (xmlto, fig2dev, etc.) + 2002-10-13 Hans Ulrich Niedermann * *.am, libgphoto2_port/m4/packaging.m4, libgphoto2_port/m4/packaging.m4: moved definition of docdir from Makefile.am to m4 macros diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c index d34e03e65..0a4dc5139 100644 --- a/libgphoto2/gphoto2-abilities-list.c +++ b/libgphoto2/gphoto2-abilities-list.c @@ -302,9 +302,19 @@ gp_abilities_list_load_dir (CameraAbilitiesList *list, const char *dir, "Trying to load '%s'...", buf); lh = GP_SYSTEM_DLOPEN (buf); if (!lh) { - gp_log (GP_LOG_DEBUG, "gphoto2-abilities-list", - "Failed to load '%s': %s.", buf, - GP_SYSTEM_DLERROR ()); + size_t len; + len = strlen(buf); + if ((len >= 3) && + (buf[len-1] == 'a') && + ((buf[len-2] == '.') || + ((buf[len-2] == 'l') && (buf[len-3] == '.')) + )) { + /* *.la or *.a - we cannot load these, so no error msg */ + } else { + gp_log (GP_LOG_DEBUG, "gphoto2-abilities-list", + "Failed to load '%s': %s.", buf, + GP_SYSTEM_DLERROR ()); + } continue; } @@ -684,3 +694,10 @@ gp_abilities_list_get_abilities (CameraAbilitiesList *list, int index, return (GP_OK); } + +/* + * Local Variables: + * c-file-style:"linux" + * indent-tabs-mode:t + * End: + */ diff --git a/libgphoto2_port/m4/documentation.m4 b/libgphoto2_port/m4/documentation.m4 index 3a503fcad..0a6353614 100644 --- a/libgphoto2_port/m4/documentation.m4 +++ b/libgphoto2_port/m4/documentation.m4 @@ -34,7 +34,7 @@ else # otherwise invent a docdir hopefully compatible with system policy AC_MSG_CHECKING(package docdir) # check whether to include package version into documentation path # FIXME: doesn't work properly. - if ls -d /usr/{share/,}doc/*-[[]0-9[]]* > /dev/null 2>&1 + if ls -d /usr/{share/,}doc/make-[0-9]* > /dev/null 2>&1 then docdir="${maindocdir}/${PACKAGE}-${VERSION}" AC_MSG_RESULT([${docdir} (redhat style)]) @@ -60,41 +60,6 @@ AC_DEFUN(GP_BUILD_DOCS, # docdir has to be determined in advance AC_REQUIRE([GP_CHECK_DOC_DIR]) -dnl --------------------------------------------------------------------------- -dnl fig2dev: This program is needed for processing images. If not found, -dnl documentation can still be built, but without figures. -dnl --------------------------------------------------------------------------- -try_fig2dev=true -have_fig2dev=false -AC_ARG_WITH(fig2dev, [ --without-fig2dev Don't use fig2dev],[ - if test "x$withval" = "xno"; then - try_fig2dev=false - fi]) -if $try_fig2dev; then - AC_PATH_PROG(FIG2DEV,fig2dev) - if test -n "${FIG2DEV}"; then - have_fig2dev=true - fi -fi -if $have_fig2dev; then - ${FIG2DEV} -L ps > /dev/null < create doc with format in ; ] - [ 'all' build all doc formats; ] - [ possible formats are: ] - [ man, html, ps, pdf ], - doc_formats="$withval", doc_formats="man html") - -if test "$doc_formats" = "all"; then - doc_formats=$doc_formats_list -else - doc_formats=`echo $doc_formats | sed 's/,/ /g'` -fi - -# set have_xmlto* to true if requested and possible -if $have_xmlto; then - for i in $doc_formats; do - if test -n "`echo $doc_formats_list | $GREP -E \"(^| )$i( |\$)\"`"; then - eval "have_xmlto$i=true" - else - AC_ERROR(Unknown doc format $i!) - fi - done - AC_MSG_RESULT($doc_formats) -else - AC_MSG_RESULT([deactivated (requires xmlto)]) -fi - -AM_CONDITIONAL(XMLTOHTML,$have_xmltohtml) -AM_CONDITIONAL(XMLTOMAN,$have_xmltoman) -AM_CONDITIONAL(XMLTOPDF,$have_xmltopdf) -AM_CONDITIONAL(XMLTOPS,$have_xmltops) - -# create list of supported formats -AC_MSG_CHECKING([for manual formats to re­create]) -xxx="" -manual_html="" -manual_pdf="" -manual_ps="" -if $have_xmltohtml; then - manual_html=manual - xxx="${xxx} html($manual_html)" -fi -if $have_xmltoman; then - xxx="${xxx} man" -fi -if $have_xmltopdf; then - manual_pdf=gphoto2.pdf - xxx="${xxx} pdf($manual_pdf)" -fi -if $have_xmltops; then - manual_ps=gphoto2.ps - xxx="${xxx} ps($manual_ps)" -fi -AC_SUBST(manual_html) -AC_SUBST(manual_pdf) -AC_SUBST(manual_ps) -AC_MSG_RESULT($xxx) - -if test "x$xxx" != "x" -then - if $have_fig2dev; then - fig_out="" - else - fig_out="out" - fi - manual_msg="in (${xxx} ) format with${fig_out} figures" -fi - ])dnl