add an --enable-utils option to configure to build command-line utilities

4 files changed, 53 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 06a9533..e979417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,6 @@ stamp-*
 /tests/test_pamcmds.log
 /tests/test_set
 /tests/test_tio
+
+# /utils/
+/utils/constants.py
diff --git a/Makefile.am b/Makefile.am
index 2a52417..fe668a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2006 Luke Howard
 # Copyright (C) 2006 West Consulting
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arthur de Jong
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arthur de Jong
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,12 +32,15 @@ endif
 if ENABLE_PYNSLCD
   SUBDIRS += pynslcd
 endif
+if ENABLE_UTILS
+  SUBDIRS += utils
+endif
 SUBDIRS += man tests
 
 EXTRA_DIST = nslcd.conf nslcd.h $(wildcard ChangeLog-20??) \
              $(wildcard m4/*.m4) HACKING ldapns.schema ldapns.ldif
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-warnings --enable-pynslcd \
+DISTCHECK_CONFIGURE_FLAGS = --enable-warnings --enable-pynslcd --enable-utils \
                             --with-pam-seclib-dir="\$${libdir}/security" \
                             --with-ldap-conf-file="\$${prefix}/nslcd.conf" \
                             CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS)
diff --git a/configure.ac b/configure.ac
index a25e9a4..483c0ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,15 @@ AC_ARG_ENABLE(pam,
 AC_MSG_RESULT($enable_pam)
 AM_CONDITIONAL([ENABLE_PAM], [test "x$enable_pam" = "xyes"])
 
+# check whether command-line utilities should be built
+AC_MSG_CHECKING([whether to build the command-line utilities])
+AC_ARG_ENABLE(utils,
+              AS_HELP_STRING([--enable-utils],
+                             [build the the command-line utilities [[default=disabled]]]),,
+              [enable_util="no"])
+AC_MSG_RESULT($enable_utils)
+AM_CONDITIONAL([ENABLE_UTILS], [test "x$enable_utils" = "xyes"])
+
 # check whether the nslcd daemon should be built
 AC_MSG_CHECKING([whether to build the nslcd daemon])
 AC_ARG_ENABLE(nslcd,
@@ -762,8 +771,8 @@ then
   AC_SUBST(nslcd_LIBS)
 fi
 
-# pynslcd daemon-specific tests
-if test "x$enable_pynslcd" = "xyes"
+# Python-specific tests
+if test "x$enable_pynslcd" = "xyes" || test "x$enable_utils" = "xyes"
 then
   # check Python interpreter
   AM_PATH_PYTHON(2.5)
@@ -775,7 +784,7 @@ AM_CONDITIONAL([NSS_FLAVOUR_FREEBSD], [test "x${with_nss_flavour}" = xfreebsd])
 
 # generate files
 AC_CONFIG_FILES([Makefile compat/Makefile common/Makefile nss/Makefile
-                 pam/Makefile nslcd/Makefile pynslcd/Makefile
+                 pam/Makefile utils/Makefile nslcd/Makefile pynslcd/Makefile
                  man/Makefile tests/Makefile])
 AC_CONFIG_FILES([pynslcd/constants.py], [[
 (
diff --git a/utils/Makefile.am b/utils/Makefile.am
new file mode 100644
index 0000000..e39d7da
--- /dev/null
+++ b/utils/Makefile.am
@@ -0,0 +1,33 @@
+# Makefile.am - use automake to generate Makefile.in
+#
+# Copyright (C) 2013 Arthur de Jong
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+utilsdir = $(datadir)/nslcdutils
+
+nodist_utils_PYTHON = constants.py
+CLEANFILES = $(nodist_utils_PYTHON)
+
+all-local: $(nodist_utils_PYTHON)
+
+# clean up locally created compiled Python files
+clean-local:
+	rm -f *.pyc *.pyo
+
+# copy constants module
+constants.py: ../pynslcd/constants.py
+	cp ../pynslcd/constants.py .