[0.11] gstreamer: configure: remove some socket cruft

Tim Müller tpm at kemper.freedesktop.org
Tue Jan 17 17:32:45 PST 2012


Module: gstreamer
Branch: 0.11
Commit: 4d27e79429d2cffa6b04cbb83fe65def0454426c
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=4d27e79429d2cffa6b04cbb83fe65def0454426c

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Tue Jan 17 23:52:07 2012 +0000

configure: remove some socket cruft

---

 configure.ac             |   18 ------------------
 libs/gst/net/Makefile.am |    2 +-
 2 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce97f0e..b35bb82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,30 +510,12 @@ AC_CHECK_LIB(dl, dladdr,
    LIBS="$LIBS -ldl")
 CFLAGS="$save_cflags"
 
-dnl *** checks for socket and nsl libraries ***
-AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
-
-dnl check for inet_aton()
-save_libs="$LIBS"
-AC_CHECK_FUNC(inet_aton, ,
-   AC_CHECK_LIB(nsl, inet_aton, ,
-      AC_CHECK_LIB(socket, inet_aton, ,
-         AC_CHECK_LIB(resolv, inet_aton, ,[AC_DEFINE(NO_INET_ATON, 1, [Define if you have no native inet_aton() function.])]))))
-INET_ATON_LIBS=$LIBS
-AC_SUBST(INET_ATON_LIBS)
-LIBS="$save_libs"
-
 dnl *** checks for dependency libraries ***
 
 dnl GLib
 GLIB_REQ=2.26
 
 AG_GST_GLIB_CHECK([$GLIB_REQ])
-
-dnl Check for glib2 without extra fat, useful for the unversioned tool frontends
-PKG_CHECK_MODULES(GLIB_ONLY, glib-2.0 >= $GLIB_REQ)
-
 PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQ)
 
 dnl Check for documentation xrefs
diff --git a/libs/gst/net/Makefile.am b/libs/gst/net/Makefile.am
index de63c40..1436f1d 100644
--- a/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@ -15,7 +15,7 @@ libgstnet_ at GST_MAJORMINOR@_la_SOURCES = \
     gstnettimeprovider.c
 
 libgstnet_ at GST_MAJORMINOR@_la_CFLAGS = $(GST_OBJ_CFLAGS) $(GIO_CFLAGS)
-libgstnet_ at GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS) $(INET_ATON_LIBS) $(WIN32_LIBS)
+libgstnet_ at GST_MAJORMINOR@_la_LIBADD = $(GST_OBJ_LIBS) $(GIO_LIBS)
 libgstnet_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
 CLEANFILES = *.gcno *.gcda *.gcov



More information about the gstreamer-commits mailing list