[farsight2/master] Add configure/makefiles to gupnp lib

[Olivier Crête]

---
 .gitignore                            |    2 +
 configure.ac                          |   18 ++++++++++++++
 gst-libs/Makefile.am                  |    2 +-
 gst-libs/ext/Makefile.am              |    7 +++++
 gst-libs/ext/fssimpleupnp/Makefile.am |   42 +++++++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 1 deletions(-)
 create mode 100644 gst-libs/ext/Makefile.am
 create mode 100644 gst-libs/ext/fssimpleupnp/Makefile.am

diff --git a/.gitignore b/.gitignore
index 68b1db0..e2ad15f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ transmitters/rawudp/fs-rawudp-marshal.[ch]
 gst-libs/gst/farsight/fs-marshal.[ch]
 gst-libs/gst/farsight/fs-enum-types.[ch]
 
+gst-libs/ext/fssimpleupnp/fs-upnp-simple-igd-marshal.[ch]
+
 docs/libs/farsight2-libs-decl-list.txt
 docs/libs/farsight2-libs-decl-list.txt.bak
 docs/libs/farsight2-libs-decl.txt
diff --git a/configure.ac b/configure.ac
index 566fd9e..7b3da8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,22 @@ if test "x$WANT_PYTHON" = "xyes"; then
 fi
 AM_CONDITIONAL(WANT_PYTHON, test "x$WANT_PYTHON" = "xyes")
 
+AC_ARG_ENABLE([gupnp],
+	AC_HELP_STRING([--disable-gupnp], [Disable GUPnP support]),
+	[case "${enableval}" in
+	    yes) WANT_GUPNP=test ;;
+	    no)  WANT_GUPNP=no ;;
+	    *) AC_MSG_ERROR(bad value ${enableval} for --enable-gupnp) ;;
+        esac],
+	WANT_GUPNP=test)
+
+if test "x$WANT_GUPNP" = "xtest"; then
+   PKG_CHECK_MODULES(GUPNP, [ gupnp-1.0 ],
+    [ WANT_GUPNP=yes ],
+    [ WANT_GUPNP=no ])
+fi
+AM_CONDITIONAL(WANT_GUPNP, test "x$WANT_GUPNP" = "xyes")
+
 
 dnl *** output files ***
 
@@ -378,6 +394,8 @@ gst/videoanyrate/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/farsight/Makefile
+gst-libs/ext/Makefile
+gst-libs/ext/fssimpleupnp/Makefile
 transmitters/Makefile
 transmitters/rawudp/Makefile
 transmitters/multicast/Makefile
diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am
index 062cb55..c77dc62 100644
--- a/gst-libs/Makefile.am
+++ b/gst-libs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gst
+SUBDIRS = gst ext
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
new file mode 100644
index 0000000..430478d
--- /dev/null
+++ b/gst-libs/ext/Makefile.am
@@ -0,0 +1,7 @@
+if WANT_GUPNP
+SUBDIRS = fssimpleupnp
+else
+SUBDIRS =
+endif
+
+DIST_SUBDIRS = fssimpleupnp
diff --git a/gst-libs/ext/fssimpleupnp/Makefile.am b/gst-libs/ext/fssimpleupnp/Makefile.am
new file mode 100644
index 0000000..27a49ea
--- /dev/null
+++ b/gst-libs/ext/fssimpleupnp/Makefile.am
@@ -0,0 +1,42 @@
+lib_LTLIBRARIES = libfssimpleupnp.la
+
+fssimpleupnpdir = $(includedir)/gstreamer- at GST_MAJORMINOR@/gst/fssimpleupnp
+
+fssimpleupnp_HEADERS = \
+	fs-upnp-simple-igd.h \
+	fs-upnp-simple-igd-thread.h \
+	fs-upnp-simple-igd-marshal.h
+
+libfssimpleupnp_la_SOURCES = \
+	fs-upnp-simple-igd.c \
+	fs-upnp-simple-igd-thread.c \
+	fs-upnp-simple-igd-marshal.c
+
+
+noinst_HEADERS = fs-upnp-simple-igd-marshal.h
+
+
+BUILT_SOURCES = \
+	fs-upnp-simple-igd-marshal.c \
+	fs-upnp-simple-igd-marshal.h
+
+CLEANFILES = $(BUILT_SOURCES)
+
+fs-upnp-simple-igd-marshal.h: fs-upnp-simple-igd-marshal.list Makefile
+	glib-genmarshal --header --prefix=_fs_upnp_simple_igd_marshal $(srcdir)/$< > $@.tmp
+	mv $@.tmp $@
+
+fs-upnp-simple-igd-marshal.c: fs-upnp-simple-igd-marshal.list Makefile
+	echo "#include \"glib-object.h\"" >> $@.tmp
+	echo "#include \"fs-upnp-simple-igd-marshal.h\"" >> $@.tmp
+	glib-genmarshal --body --prefix=_fs_upnp_simple_igd_marshal $(srcdir)/$< >> $@.tmp
+	mv $@.tmp $@
+
+libfssimpleupnp_la_CFLAGS = \
+	$(GUPNP_CFLAGS)
+
+libfssimpleupnp_la_LIBADD = \
+	$(GUPNP_LIBS)
+
+libfssimpleupnp_la_LDFLAGS = \
+	$(GUPNP_LDFLAGS)
-- 
1.5.6.5