multimedia/gphoto2/patches/001-automake-compat.patch

   1 --- a/Makefile.am
   2 +++ b/Makefile.am
   3 @@ -1,4 +1,4 @@
   4 -SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging po tests
   5 +SUBDIRS = gphoto-m4 contrib doc gphoto2 packaging tests
   6
   7  ACLOCAL_AMFLAGS = -I auto-m4 -I gphoto-m4
   8  EXTRA_DIST = README.md
   9 --- a/configure.ac
  10 +++ b/configure.ac
  11 @@ -46,11 +46,8 @@ dnl i18n support
  12  dnl ---------------------------------------------------------------------------
  13  GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
  14  ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW"
  15 -AM_PO_SUBDIRS()
  16  AM_GNU_GETTEXT_VERSION([0.14.1])
  17 -AM_GNU_GETTEXT([external])
  18  AM_ICONV()
  19 -GP_GETTEXT_FLAGS()
  20
  21  dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as
  22  dnl we require make to do insert the proper $(datadir) value
  23 @@ -80,7 +77,7 @@ AC_CHECK_LIB(m,floor)
  24
  25
  26  dnl ---------------------------------------------------------------------------
  27 -dnl pthread: The gphoto2 shell (--shell) keeps up a connection to the
  28 +dnl pthread: The gphoto2 shell (--shell) keeps up a connection to the
  29  dnl          camera. Some cameras need to be sent keep-alive-messages
  30  dnl          in order to prevent a shut-down. This is what we need
  31  dnl          pthread for.
  32 @@ -97,7 +94,7 @@ if $try_pthread; then
  33                      AC_DEFINE(HAVE_PTHREAD,1,[Define if we use pthread.h.])
  34                      pthread_msg="yes (-lpthread)"
  35                      PTHREAD_LIBS="-lpthread"],[
  36 -                    AC_CHECK_LIB(c_r, pthread_create, [
  37 +                    AC_CHECK_LIB(c_r, pthread_create, [
  38                          AC_DEFINE(HAVE_PTHREAD,1,[Define if we use pthread.h.])
  39                          pthread_msg="yes (-pthread)"
  40                          PTHREAD_LIBS="-pthread"
  41 @@ -267,7 +264,7 @@ GP_CONFIG_MSG([JPEG support],[$jpeg_msg]
  42  dnl ---------------------------------------------------------------------------
  43  dnl libexif: The CameraFilesystem can use libexif for extracting thumbnails
  44  dnl          out of EXIF data. Similarly, it can extract the mtime of
  45 -dnl          a file.
  46 +dnl          a file.
  47  dnl          libexif is available from
  48  dnl          http://www.sourceforge.net/projects/libexif
  49  dnl ---------------------------------------------------------------------------
  50 @@ -327,7 +324,7 @@ AC_MSG_ERROR([pkg-config could not find
  51
  52  dnl ---------------------------------------------------------------------------
  53  dnl readline: Readline is pretty cool - it allows you to use <tab> to complete
  54 -dnl           commands in the gphoto2 shell or to use <up> or <down> to
  55 +dnl           commands in the gphoto2 shell or to use <up> or <down> to
  56  dnl           navigate through the history.
  57  dnl ---------------------------------------------------------------------------
  58  rl_msg="no (http://cnswww.cns.cwru.edu/~chet/readline/rltop.html)"
  59 @@ -396,7 +393,6 @@ AC_SUBST([AM_LDFLAGS])
  60  # Create output files
  61  # ---------------------------------------------------------------------------
  62  AC_CONFIG_FILES([
  63 -po/Makefile.in
  64  Makefile
  65  gphoto2/Makefile
  66  gphoto-m4/Makefile