1b121475e0
* Tue Feb 12 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.21-5 - find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
diff -ur xine-lib-1.1.21/configure.ac xine-lib-1.1.21-samba4/configure.ac
|
|
--- xine-lib-1.1.21/configure.ac 2012-07-16 21:42:38.000000000 +0200
|
|
+++ xine-lib-1.1.21-samba4/configure.ac 2013-02-12 15:44:33.000000000 +0100
|
|
@@ -1698,12 +1698,10 @@
|
|
[with_samba=$enableval], [with_samba=yes])
|
|
|
|
if test "x$with_samba" = "xyes"; then
|
|
- AC_CHECK_LIB(smbclient, smbc_init,
|
|
- [ AC_CHECK_HEADER(libsmbclient.h,
|
|
- [ have_libsmbclient=yes
|
|
- LIBSMBCLIENT_LIBS="-lsmbclient" ],
|
|
- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
|
|
- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))
|
|
+ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient],
|
|
+ [have_libsmbclient=yes],
|
|
+ AC_MSG_RESULT(*** All libsmbclient dependent parts will be disabled ***))
|
|
+ AC_SUBST(LIBSMBCLIENT_CFLAGS)
|
|
AC_SUBST(LIBSMBCLIENT_LIBS)
|
|
fi
|
|
AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes")
|
|
diff -ur xine-lib-1.1.21/src/input/Makefile.am xine-lib-1.1.21-samba4/src/input/Makefile.am
|
|
--- xine-lib-1.1.21/src/input/Makefile.am 2012-07-16 21:42:38.000000000 +0200
|
|
+++ xine-lib-1.1.21-samba4/src/input/Makefile.am 2013-02-12 15:46:45.000000000 +0100
|
|
@@ -150,7 +150,7 @@
|
|
|
|
xineplug_inp_smb_la_SOURCES = input_smb.c
|
|
xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL)
|
|
-xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
|
|
+xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS)
|
|
xineplug_inp_smb_la_LDFLAGS = $(xineplug_ldflags)
|
|
|
|
xineplug_inp_pvr_la_SOURCES = input_pvr.c
|