libgphoto: fix autoreconf, disable tests, docs, examples and translations

SVN-Revision: 24585

diff --git a/libs/libgphoto2/patches/001-automake-compat.patch b/libs/libgphoto2/patches/001-automake-compat.patch
new file mode 100644 (file)
index 0000000..d324bfe
--- /dev/null
+++ b/libs/libgphoto2/patches/001-automake-compat.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,7 +227,6 @@ ALL_LINGUAS="da de es eu fr hu it ja nl 
+ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}])
+ AM_GNU_GETTEXT_VERSION([0.14.1])
+ AM_GNU_GETTEXT([external])
+-AM_PO_SUBDIRS()
+ AM_ICONV()
+ GP_GETTEXT_FLAGS()
+ 
+--- a/libgphoto2_port/configure.ac
++++ b/libgphoto2_port/configure.ac
+@@ -116,7 +116,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2
+ ALL_LINGUAS="cs da de fr es eu it ja nl pl pt_BR ru sk sv uk vi zh_CN zh_TW"
+ AM_GNU_GETTEXT_VERSION([0.14.1])
+ AM_GNU_GETTEXT([external])
+-AM_PO_SUBDIRS()
+ AM_ICONV()
+ GP_GETTEXT_FLAGS()
+ 

diff --git a/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch b/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch
new file mode 100644 (file)
index 0000000..36a64aa
--- /dev/null
+++ b/libs/libgphoto2/patches/002-no-tests-docs-examples-translations.patch
@@ -0,0 +1,86 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -628,20 +628,11 @@ camlibs/konica/localization/Makefile
+ libgphoto2/Makefile
+ libgphoto2.pc
+ libgphoto2-uninstalled.pc
+-examples/Makefile
+-tests/Makefile
+-tests/check-camera-list.sh
+-tests/ddb/Makefile
+-tests/ddb/check-ddb.sh
+ packaging/Makefile
+ packaging/linux-hotplug/Makefile
+ packaging/generic/Makefile
+ packaging/rpm/Makefile
+ packaging/rpm/package.spec
+-po/Makefile.in
+-doc/Makefile
+-doc/Doxyfile
+-doc/api/Makefile
+ ],[
+ dnl This relies on this code being called for each of the above files
+ dnl with ac_file set to the filename.
+--- a/libgphoto2_port/configure.ac
++++ b/libgphoto2_port/configure.ac
+@@ -483,7 +483,6 @@ AC_SUBST([AM_LDFLAGS])
+ # ---------------------------------------------------------------------------
+ AC_CONFIG_FILES([
+ Makefile
+-po/Makefile.in
+ libgphoto2_port/Makefile
+ libgphoto2_port.pc
+ libgphoto2_port-uninstalled.pc
+@@ -494,8 +493,6 @@ usbscsi/Makefile
+ disk/Makefile
+ ptpip/Makefile
+ gphoto2-port-config
+-test/Makefile
+-doc/Makefile
+ m4/Makefile
+ ])
+ AC_OUTPUT
+--- a/libgphoto2_port/Makefile.am
++++ b/libgphoto2_port/Makefile.am
+@@ -10,7 +10,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L
+ bin_SCRIPTS = gphoto2-port-config
+ 
+ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
+-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4
++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4
+ 
+ EXTRA_DIST =                  \
+       AUTHORS \
+--- a/libgphoto2_port/Makefile.in
++++ b/libgphoto2_port/Makefile.in
+@@ -271,7 +271,7 @@ VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@L
+ bin_SCRIPTS = gphoto2-port-config
+ 
+ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
+-SUBDIRS = po libgphoto2_port test @IOLIB_SUBDIRS@ doc m4
++SUBDIRS = libgphoto2_port @IOLIB_SUBDIRS@ m4
+ EXTRA_DIST = AUTHORS ChangeLog COPYING.LIB NEWS README iolib.sym \
+       gphoto2-port-config.in libgphoto2_port.pc.in \
+       libgphoto2_port-uninstalled.pc.in \
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
+ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk README.packaging
+ 
+ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
+-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc
++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging
+ 
+ EXTRA_DIST    += libgphoto2.pc.in
+ pkgconfig_DATA = libgphoto2.pc
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -302,7 +302,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS
+       ChangeLog INSTALL README.in README README.packaging
+ 
+ # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
+-SUBDIRS = @subdirs@ libgphoto2 camlibs tests examples po packaging doc
++SUBDIRS = @subdirs@ libgphoto2 camlibs packaging
+ pkgconfig_DATA = libgphoto2.pc
+ noinst_DATA = libgphoto2-uninstalled.pc
+ doc_DATA = AUTHORS COPYING NEWS ABOUT-NLS ChangeLog README \