diff options
| -rw-r--r-- | BUILD.txt | 4 | ||||
| -rw-r--r-- | contrib/sssd.spec.in | 10 | ||||
| -rw-r--r-- | src/conf_macros.m4 | 4 |
3 files changed, 6 insertions, 12 deletions
@@ -25,9 +25,9 @@ yum install openldap-devel gettext libtool pcre-devel c-ares-devel \ dbus-devel libxslt docbook-style-xsl krb5-devel nspr-devel \ libxml2 pam-devel nss-devel libtevent python-devel \ libtevent-devel libtdb libtdb-devel libtalloc libtalloc-devel \ - libldb libldb-devel cvs popt-devel c-ares-devel check-devel \ + libldb libldb-devel popt-devel c-ares-devel check-devel \ doxygen libselinux-devel libsemanage-devel bind-utils libnl-devel \ - nscd gettext-devel + gettext-devel glib2-devel ding-libs are available in Fedora 14 and later version: yum install libcollection-devel libdhash-devel libini_config-devel \ diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 777de90f9..859af0cee 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -7,7 +7,6 @@ %global rhel5_minor %(%{__grep} -o "5.[0-9]*" /etc/redhat-release |%{__sed} -s 's/5.//') %if 0%{?is_rhel5} > 0 -%global with_unicode_lib --with-unicode-lib=glib2 # we don't want to provide private python extension libs %{?filter_setup: %filter_provides_in %{python_sitearch}/.*\.so$ @@ -111,6 +110,8 @@ BuildRequires: libnl-devel BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: findutils +BuildRequires: glib2-devel + %if (0%{?enable_experimental} == 1) # RHEL 5 is too old to support samba4 and the PAC responder %if !0%{?is_rhel5} @@ -118,12 +119,6 @@ BuildRequires: samba4-devel %endif %endif -%if 0%{?is_rhel5} > 0 -BuildRequires: glib2-devel -%else -BuildRequires: libunistring-devel -%endif - %description Provides a set of daemons to manage access to remote directories and authentication mechanisms. It provides an NSS and PAM interface toward @@ -242,7 +237,6 @@ autoreconf -ivf --enable-pammoddir=/%{_lib}/security \ --disable-static \ --disable-rpath \ - %{with_unicode_lib} \ %{with_ccache} \ %{experimental} diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index a1da75302..4dbbd7694 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -430,11 +430,11 @@ AC_ARG_ENABLE([all-experimental-features], AC_DEFUN([WITH_UNICODE_LIB], [ AC_ARG_WITH([unicode-lib], [AC_HELP_STRING([--with-unicode-lib=<library>], - [Which library to use for unicode processing (libunistring, glib2) [libunistring]] + [Which library to use for unicode processing (libunistring, glib2) [glib2]] ) ] ) - unicode_lib="libunistring" + unicode_lib="glib2" if test x"$with_unicode_lib" != x; then unicode_lib=$with_unicode_lib fi |