summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-08-20 14:59:13 -0400
committerStephen Gallagher <sgallagh@redhat.com>2009-08-20 12:27:13 -0400
commite84e9b5fa2e4352bfc3bfabe55dc57190da7e7d5 (patch)
tree3ecc842582323476fab9f367efd2e329db55d586
parent806b80ff4dff79a587d5f2fda77a6d27ba664fdb (diff)
downloadsssd-e84e9b5fa2e4352bfc3bfabe55dc57190da7e7d5.tar.gz
sssd-e84e9b5fa2e4352bfc3bfabe55dc57190da7e7d5.tar.bz2
sssd-e84e9b5fa2e4352bfc3bfabe55dc57190da7e7d5.zip
Support gettext >= 0.14 instead of 0.17
This is needed for support of RHEL5 Adding the assignment of $(localedir) was necessary, as gettext 0.14 does not include automatically assign it.
-rw-r--r--server/Makefile.am3
-rw-r--r--server/configure.ac2
-rw-r--r--sss_client/Makefile.am3
-rw-r--r--sss_client/configure.ac2
4 files changed, 6 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index d42fa5c9..12ec4b1b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -11,6 +11,7 @@ krb5plugindir = @krb5pluginpath@
sssdconfdir = $(sysconfdir)/sssd
dbusintrospectdir = $(datarootdir)/sssd/introspect
dbuspolicydir = $(sysconfdir)/dbus-1/system.d
+localedir = @localedir@
dbpath = @dbpath@
pluginpath = @pluginpath@
@@ -135,7 +136,7 @@ AM_CPPFLAGS = -Wall \
-DSSS_PAM_SOCKET_NAME=\"$(pipepath)/pam\" \
-DSSS_PAM_PRIV_SOCKET_NAME=\"$(pipepath)/private/pam\" \
-DUSE_MMAP=1 \
- -DLOCALEDIR=\"\$(localedir)\"
+ -DLOCALEDIR=\"$(localedir)\"
EXTRA_DIST = build/config.rpath
diff --git a/server/configure.ac b/server/configure.ac
index c6d10c5a..d42f07ec 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -21,7 +21,7 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.14])
m4_pattern_allow([AM_SILENT_RULES])
AM_SILENT_RULES
diff --git a/sss_client/Makefile.am b/sss_client/Makefile.am
index 7333e4c3..a8228ee1 100644
--- a/sss_client/Makefile.am
+++ b/sss_client/Makefile.am
@@ -1,11 +1,12 @@
SUBDIRS = po
pipepath=@pipepath@
+localedir = @localedir@
topdir=.
AM_CPPFLAGS = \
-I$(topdir) \
- -DLOCALEDIR=\"\$(localedir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
-DSSS_NSS_SOCKET_NAME=\"$(pipepath)/nss\" \
-DSSS_PAM_SOCKET_NAME=\"$(pipepath)/pam\" \
-DSSS_PAM_PRIV_SOCKET_NAME=\"$(pipepath)/private/pam\"
diff --git a/sss_client/configure.ac b/sss_client/configure.ac
index 7d443ed2..df166414 100644
--- a/sss_client/configure.ac
+++ b/sss_client/configure.ac
@@ -9,7 +9,7 @@ AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_CONFIG_MACRO_DIR([m4])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.14])
AM_CONDITIONAL([HAVE_GCC], [test "$ac_cv_prog_gcc" = yes])