more bindings trunk

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

1 files changed, 56 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index d8960d33b..6af6d365f 100644
--- a/configure.in
+++ b/configure.in
@@ -69,6 +69,27 @@ SED=${SED-sed}
 
 GP_PKG_CONFIG
 
+
+dnl --------------------------------------------------------------------
+dnl Check requirements for bindings
+dnl --------------------------------------------------------------------
+
+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
+
 dnl Check for Mono and Mono C# compiler from f-spot
 
 dnl --- Check for mono and mcs
@@ -90,6 +111,7 @@ else
   bindings="${bindings}${bindings+ }csharp"
   AC_MSG_RESULT([found])
 fi
+AC_SUBST([cslibdir],[${libdir}/${PACKAGE_TARNAME}])
 
 AM_CONDITIONAL([HAVE_MONO], [test "x${build_binding_csharp}" = "xyes"])
 GP_CONFIG_MSG([Bindings], [${bindings}])
@@ -444,6 +466,37 @@ fi
 
 
 # ---------------------------------------------------------------------------
+# create gphoto2/ directory with gphoto2*.h files
+# ---------------------------------------------------------------------------
+# This functionality is duplicated within the top Makefile.am to ensure that
+# new header files are added to gphoto2/ without requiring a ./configure run.
+# Note: Creating gphoto2/ here requires cleaning it in the Makefile.am distclean
+#       target.
+
+AC_MSG_CHECKING([gphoto2/ directory with gphoto2*.h files])
+if test -d gphoto2; then
+	rm -f gphoto2/gphoto2*.h
+	rmdir gphoto2
+	header_dir_msg="updated"
+else
+	header_dir_msg="created"
+fi
+mkdir -p gphoto2
+if test -d gphoto2; then
+	cp \
+		libgphoto2/gphoto2*.h \
+		libgphoto2_port/libgphoto2_port/gphoto2*.h \
+		${srcdir}/libgphoto2/gphoto2*.h \
+		${srcdir}/libgphoto2_port/libgphoto2_port/gphoto2*.h \
+                gphoto2/ > /dev/null 2>&1
+	AC_MSG_RESULT([${header_dir_msg}])
+else
+	AC_MSG_RESULT([failed])
+	AC_MSG_ERROR([could not create gphoto2/ directory])
+fi
+
+
+# ---------------------------------------------------------------------------
 # Create output files
 # ---------------------------------------------------------------------------
 AC_CONFIG_FILES([
@@ -523,7 +576,10 @@ doc/Doxyfile
 doc/api/Makefile
 bindings/Makefile
 bindings/csharp/Makefile
+bindings/csharp/AssemblyInfo.cs
+bindings/csharp/libgphoto2-sharp.pc
 ])
+#bindings/java/Makefile
 AC_OUTPUT
 
 GP_CAMLIBS_CHECK_SUBDIRS