bindings patch backported from trunk

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@8951 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2006-06-24 07:50:23 +00:00
parent 4c431f9272
commit 41a6a067f6
4 changed files with 35 additions and 3 deletions

View File

@@ -8,7 +8,7 @@ bin_SCRIPTS = gphoto2-config
EXTRA_DIST = HACKING MAINTAINERS makefile.os2 os2mak.inc TESTERS CHANGES
# Note: @subdirs@ lists all the directories from AC_CONFIG_SUBDIRS()
SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc
SUBDIRS = @subdirs@ libgphoto2 camlibs tests po bindings packaging doc
doc_DATA = AUTHORS COPYING README CHANGES NEWS

1
bindings/Makefile.am Normal file
View File

@@ -0,0 +1 @@
SUBDIRS = @BINDING_SUBDIRS@

View File

@@ -1,4 +1,4 @@
CSC = mcs --unsafe -g
MCSFLAGS = --unsafe -g
LIBGPHOTO2_SHARP_CSFILES = \
$(srcdir)/AssemblyInfo.cs \
@@ -22,7 +22,7 @@ libgphoto2sharplib_DATA = \
libgphoto2-sharp.dll: $(LIBGPHOTO2_SHARP_CSFILES)
$(CSC) -o $@ /target:library $(LIBGPHOTO2_SHARP_CSFILES)
$(MCS) $(MCSFLAGS) -o $@ /target:library $(LIBGPHOTO2_SHARP_CSFILES)
all: libgphoto2-sharp.dll

View File

@@ -67,6 +67,35 @@ dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the
dnl sequence seems to get mixed up.
SED=${SED-sed}
GP_PKG_CONFIG
dnl Check for Mono and Mono C# compiler from f-spot
dnl --- Check for mono and mcs
dnl --- FIXME: What about when mono and mcs are not found?
AC_PATH_PROG([MONO], [mono])
AC_PATH_PROG([MCS], [mcs])
AC_SUBST([MONO])
AC_SUBST([MCS])
dnl -- Check for mono pc file
AC_MSG_CHECKING([for mono.pc])
if test -z `$PKG_CONFIG --variable=prefix mono`; then
build_binding_csharp="no"
AC_MSG_RESULT([missing the mono.pc file, usually found in the mono-devel package])
else
build_binding_csharp="yes"
bindings="${bindings}${bindings+ }csharp"
AC_MSG_RESULT([found])
fi
AM_CONDITIONAL([HAVE_MONO], [test "x${build_binding_csharp}" = "xyes"])
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
@@ -492,6 +521,8 @@ packaging/rpm/package.spec
doc/Makefile
doc/Doxyfile
doc/api/Makefile
bindings/Makefile
bindings/csharp/Makefile
])
AC_OUTPUT