summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2006-10-25 20:36:46 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2006-10-25 20:36:46 +0000
commit1c02a56cfc3185d4db4a336f6a2be11bc55c1c8f (patch)
treedfc204ae9969e272f3deff8e0f87dd67ac7a13cd /m4
parent603b79151aa03f9150216fba4b8b4faa1e63a755 (diff)
downloadds-1c02a56cfc3185d4db4a336f6a2be11bc55c1c8f.tar.gz
ds-1c02a56cfc3185d4db4a336f6a2be11bc55c1c8f.tar.xz
ds-1c02a56cfc3185d4db4a336f6a2be11bc55c1c8f.zip
Resolves: #212098
Summary: Use autoconf to generate task perl script templates Changes: 1) added template files to AC_CONFIG_FILES list 2) added db_bindir and ldapsdk_bindir to pass their tools path to the template files. The paths are hardcoded for now.
Diffstat (limited to 'm4')
-rw-r--r--m4/db.m42
-rw-r--r--m4/mozldap.m43
2 files changed, 5 insertions, 0 deletions
diff --git a/m4/db.m4 b/m4/db.m4
index 8d520c54..e463ed7f 100644
--- a/m4/db.m4
+++ b/m4/db.m4
@@ -50,6 +50,8 @@ AC_ARG_WITH(db, [ --with-db=PATH Berkeley DB directory],
fi
],
AC_MSG_RESULT(no))
+dnl default path for the db tools (see [210947] for more details)
+db_bindir=/usr/bin
dnl - check in system locations
if test -z "$db_inc"; then
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index 8007ad27..6db01ea0 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -89,6 +89,9 @@ fi
if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
fi
+dnl default path for the ldap c sdk tools (see [210947] for more details)
+ldapsdk_bindir=/usr/lib/mozldap6
+
dnl make sure the ldap sdk version is 6 or greater - we do not support
dnl the old 5.x or prior versions - the ldap server code expects the new
dnl ber types and other code used with version 6