7 files changed, 13 insertions, 17 deletions
diff --git a/compat/Makefile.am b/compat/Makefile.am
index 54e9be1..d71d087 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -23,7 +23,8 @@ AM_CPPFLAGS=-I$(top_srcdir)
 AM_CFLAGS = -fPIC
 
 EXTRA_DIST = getopt_long.c getopt_long.h \
-             daemon.c daemon.h
+             daemon.c daemon.h \
+             pagectrl.c pagectrl.h
 
 libcompat_a_SOURCES = getpeercred.c getpeercred.h
 libcompat_a_LIBADD = @LIBOBJS@
diff --git a/nslcd/pagectrl.c b/compat/pagectrl.c
index b37c264..9dff696 100644
--- a/nslcd/pagectrl.c
+++ b/compat/pagectrl.c
@@ -23,9 +23,6 @@
    02110-1301 USA
 */
 
-/* TODO: move this to compat/ and add it only when needed */
-/* Note: this is only used in ldap-nss.c */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -41,10 +38,6 @@
 #define LDAP_CONTROL_PAGE_OID           "1.2.840.113556.1.4.319"
 #endif
 
-#ifndef HAVE_LDAP_CREATE_CONTROL
-#error LDAP client library does not support ldap_create_control()
-#endif
-
 #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL
 /*---
    ldap_create_page_control
diff --git a/nslcd/pagectrl.h b/compat/pagectrl.h
index cd64b77..cd64b77 100644
--- a/nslcd/pagectrl.h
+++ b/compat/pagectrl.h
diff --git a/configure.ac b/configure.ac
index fc0fb60..f324ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,11 +316,14 @@ AC_CHECK_FUNCS(ldap_parse_result ldap_memfree ldap_controls_free ldap_control_fr
 AC_CHECK_FUNCS(ldap_explode_dn ldap_explode_rdn ldap_set_option ldap_get_option)
 AC_CHECK_FUNCS(ldap_abandon ldap_simple_bind_s ldap_unbind ldap_set_rebind_proc)
 AC_CHECK_FUNCS(ldap_sasl_interactive_bind_s ldap_initialize ldap_search_ext)
-AC_CHECK_FUNCS(ldap_create_control ldap_create_page_control ldap_parse_page_control)
+AC_CHECK_FUNCS(ldap_create_control)
 AC_CHECK_FUNCS(ldap_domain2hostlist ldap_domain2dn)
 AC_CHECK_FUNCS(ldap_get_values ldap_value_free ldap_get_dn)
 AC_CHECK_FUNCS(ldap_err2string ldap_msgfree ldap_result)
 
+# replace ldap_create_page_control() and ldap_parse_page_control()
+AC_CHECK_FUNCS(ldap_create_page_control ldap_parse_page_control,,[AC_LIBOBJ(pagectrl)])
+
 # check the number of arguments that ldap_set_rebind_proc() uses
 AC_CACHE_CHECK(
     [number of arguments to ldap_set_rebind_proc],
diff --git a/debian/copyright b/debian/copyright
index 2893b82..df394c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,12 +35,12 @@ Davide Puricelli (evo), Sami Haahtinen and Stephen Frost.
 The following files are also contain other copyright holders and are also
 covered by the GNU Lesser General Public License:
 
-debian/po/ca.po:  Copyright (C) 2004 Free Software Foundation, Inc.
-debian/po/pt.po:  Copyright (C) 2007 Américo Monteiro
-debian/po/vi.po:  Copyright (C) 2005 Free Software Foundation, Inc.
-debian/po/fr.po:  Copyright (C) 2007 Cyril Brulebois
-debian/po/fr.po:  Copyright (C) 2007 Philippe Batailler
-nslcd/pagectrl.c: Copyright (C) 2002 Max Caines
+debian/po/ca.po:   Copyright (C) 2004 Free Software Foundation, Inc.
+debian/po/pt.po:   Copyright (C) 2007 Américo Monteiro
+debian/po/vi.po:   Copyright (C) 2005 Free Software Foundation, Inc.
+debian/po/fr.po:   Copyright (C) 2007 Cyril Brulebois
+debian/po/fr.po:   Copyright (C) 2007 Philippe Batailler
+compat/pagectrl.c: Copyright (C) 2002 Max Caines
 
 The distribution includes code from the Autoconf and Automake suites. This
 code is either licensed under the GNU General Public License with the extra
diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index bfb6789..217d369 100644
--- a/nslcd/Makefile.am
+++ b/nslcd/Makefile.am
@@ -28,7 +28,6 @@ nslcd_SOURCES = nslcd.c ../nslcd.h ../nslcd-common.h \
                 log.c log.h \
                 common.c common.h \
                 myldap.c myldap.h \
-                pagectrl.c pagectrl.h \
                 cfg.c cfg.h \
                 attmap.c attmap.h \
                 alias.c ether.c group.c host.c netgroup.c network.c \
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 2ac5692..dba60f9 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -64,7 +64,7 @@
 #include <ctype.h>
 
 #include "myldap.h"
-#include "pagectrl.h"
+#include "compat/pagectrl.h"
 #include "common.h"
 #include "log.h"
 #include "cfg.h"