From b6781133dee17f68b768cdc8c5e2fda2f5a7b96b Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 11 Dec 2006 16:28:59 +0000 Subject: [PATCH] Remove bindings from libgphoto2 package git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9574 67ed7778-7388-44ab-90cf-0a291f65f57c --- Makefile.am | 2 +- bindings/Makefile.am | 7 ------- configure.ac | 34 ---------------------------------- 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 bindings/Makefile.am diff --git a/Makefile.am b/Makefile.am index ae3e0fe31..dd488e9d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.mk # Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS() -SUBDIRS = @subdirs@ libgphoto2 camlibs tests po bindings packaging doc +SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc doc_DATA = AUTHORS COPYING README NEWS diff --git a/bindings/Makefile.am b/bindings/Makefile.am deleted file mode 100644 index 5bae528dc..000000000 --- a/bindings/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# We're not using @BINDING_SUBDIRS@ here because we want to ship -# the bindings in the "make dist" tarball regardless of whether -# the system building the tarball has mono, java, or python installed. -# -# However, we are only shipping those bindings which actually work. -# SUBDIRS = -# SUBDIRS = @BINDING_SUBDIRS@ diff --git a/configure.ac b/configure.ac index 077aa9272..e950a49e2 100644 --- a/configure.ac +++ b/configure.ac @@ -137,37 +137,6 @@ GP_CONFIG_MSG([GP2DDB support], [${gp_msg_gp2ddb} (EXPERIMENTAL)]) GP_PKG_CONFIG -dnl -------------------------------------------------------------------- -dnl Check requirements for bindings -dnl -------------------------------------------------------------------- - -dnl Check for Python -GP_PYTHON - -if test "x$PYTHON" != "xno"; then - bindings="${bindings}${bindings+ }python" -fi - -dnl Check for SWIG - -AC_PATH_PROG([SWIG], [swig]) -AC_SUBST([SWIG]) -AM_CONDITIONAL([HAVE_SWIG], [test -x "$SWIG"]) - -AC_PATH_PROG([JAVAC], [javac]) -AC_SUBST([JAVAC]) -AC_PATH_PROG([JAVA], [java]) -AC_SUBST([JAVA]) -AM_CONDITIONAL([HAVA_JDK], [test -x "$JAVAC" && test -x "$JAVA"]) - -if false && test -x "$SWIG" && test -x "$JAVAC" && test -x "$JAVA"; then - bindings="${bindings}${bindings+ }java" -fi - -GP_CONFIG_MSG([Bindings], [${bindings}]) - -AC_SUBST([BINDING_SUBDIRS], [${bindings}]) - dnl check for/set up libtool and libltdl dnl AC_DISABLE_STATIC dnl AC_DISABLE_SHARED @@ -632,9 +601,6 @@ po/Makefile.in doc/Makefile doc/Doxyfile doc/api/Makefile -bindings/Makefile -bindings/python/Makefile -bindings/python/setup.py ],[ dnl This relies on this code being called for each of the above files dnl with ac_file set to the filename.