From fa2f3fb98e67215152139422f3869fd29d90dbcd Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Sat, 12 Jan 2008 23:08:28 +0000
Subject: [PATCH] Add test to see if hstrerror is available or if we need
 libresolv (Solaris) for it, then use it in libgstrtsp.

Original commit message from CVS:
* configure.ac:
* gst-libs/gst/rtsp/Makefile.am:
Add test to see if hstrerror is available or if we need libresolv
(Solaris) for it, then use it in libgstrtsp.
---
 ChangeLog                     |  7 +++++++
 common                        |  2 +-
 configure.ac                  | 10 ++++++++++
 gst-libs/gst/rtsp/Makefile.am |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d0c543ec5f..82b51b1744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-12  Jan Schmidt  <Jan.Schmidt@sun.com>
+
+	* configure.ac:
+	* gst-libs/gst/rtsp/Makefile.am:
+	Add test to see if hstrerror is available or if we need libresolv
+	(Solaris) for it, then use it in libgstrtsp.
+
 2008-01-12  Jan Schmidt  <Jan.Schmidt@sun.com>
 
 	* gst-libs/gst/tag/Makefile.am:
diff --git a/common b/common
index bd02d78838..36e8d05157 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bd02d788384b40ff511cac0e32aa77f51a68912d
+Subproject commit 36e8d05157d6c831e0d3919ae2ee9c342498eda8
diff --git a/configure.ac b/configure.ac
index 9cb2f8119b..eaf4e5ea9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,16 @@ if test "x$HAVE_WINSOCK2_H" = "xyes"; then
   AC_SUBST(WIN32_LIBS)
 fi
 
+dnl check for hstrerror, for gst-libs/gst/rtsp
+save_libs="$LIBS"
+AC_CHECK_FUNC(hstrerror, ,
+    AC_CHECK_LIB(resolv, hstrerror, ,
+        [AC_DEFINE(NO_HSTRERROR, 1,
+             [Define if you have no native hstrerror() function.])]))
+HSTRERROR_LIBS=$LIBS
+AC_SUBST(HSTRERROR_LIBS)
+LIBS="$save_libs"
+
 dnl used in gst-libs/gst/pbutils and associated unit test
 AC_CHECK_HEADERS([process.h sys/types.h sys/wait.h sys/stat.h])
 
diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
index 9da02268a6..d35e4cd0f7 100644
--- a/gst-libs/gst/rtsp/Makefile.am
+++ b/gst-libs/gst/rtsp/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = gstrtsp.h
 #rtspextreal.c    
 
 libgstrtsp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(WIN32_LIBS)
+libgstrtsp_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(WIN32_LIBS) $(HSTRERROR_LIBS)
 libgstrtsp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 BUILT_SOURCES = $(built_headers) $(built_sources)