Related: 210736

Phase one of implementing new GNU Automake/Autoconf build system.

8 files changed, 683 insertions, 0 deletions

diff --git a/m4/db.m4 b/m4/db.m4
new file mode 100644
index 00000000..376aed75
--- /dev/null
+++ b/m4/db.m4
@@ -0,0 +1,64 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for db)
+
+dnl  - check for --with-db
+AC_MSG_CHECKING(for --with-db)
+AC_ARG_WITH(db, [  --with-db=PATH   Berkeley DB directory],
+[
+  if test "$withval" = "yes"; then
+    AC_MSG_RESULT(yes)
+    dnl - check in system locations
+    if test -f "/usr/include/db.h"; then
+      db_incdir="/usr/include"
+      db_inc="-I/usr/include"
+    else
+      AC_MSG_ERROR([db.h not found])
+    fi
+  elif test -d "$withval"/include -a -d "$withval"/lib; then
+    AC_MSG_RESULT([using $withval])
+    dnl - check the user provided location
+    DBDIR=$withval
+    db_lib="-L$DBDIR/lib"
+    db_incdir="$DBDIR/include"
+    if ! test -e "$db_incdir/db.h" ; then
+      AC_MSG_ERROR([$withval include dir not found])
+    fi
+    db_inc="-I$db_incdir"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+dnl - check in system locations
+if test -z "$db_inc"; then
+  AC_MSG_CHECKING(for db.h)
+  if test -f "/usr/include/db.h"; then
+    AC_MSG_RESULT([using /usr/include/db.h])
+    db_incdir="/usr/include"
+    db_inc="-I/usr/include"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([db not found, specify with --with-db.])
+  fi
+fi
diff --git a/m4/icu.m4 b/m4/icu.m4
new file mode 100644
index 00000000..73785006
--- /dev/null
+++ b/m4/icu.m4
@@ -0,0 +1,99 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for LIBICU)
+
+# check for --with-icu
+AC_MSG_CHECKING(for --with-icu)
+AC_ARG_WITH(icu, [  --with-icu=PATH   ICU directory],
+[
+  if test -d "$withval"/lib
+  then
+    AC_MSG_RESULT([using $withval])
+    ICUDIR=$withval
+    icu_lib="-L$ICUDIR/lib"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+  icu_inc="-I$withval/include"
+  icu_bin="$withval/bin"
+],
+AC_MSG_RESULT(no))
+
+# check for --with-icu-inc
+AC_MSG_CHECKING(for --with-icu-inc)
+AC_ARG_WITH(icu-inc, [  --with-icu-inc=PATH     ICU include directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    icu_inc="-I$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-icu-lib
+AC_MSG_CHECKING(for --with-icu-lib)
+AC_ARG_WITH(icu-lib, [  --with-icu-lib=PATH     ICU library directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    icu_lib="-L$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-icu-bin
+AC_MSG_CHECKING(for --with-icu-bin)
+AC_ARG_WITH(icu-bin, [  --with-icu-bin=PATH     ICU binary directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    icu_bin="$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+# if not found yet, try pkg-config
+
+# last resort
+if test -z "$icu_lib"; then
+  AC_MSG_CHECKING(for icu with icu-config)
+  AC_PATH_PROG(ICU_CONFIG, icu-config)
+  if test -n "$ICU_CONFIG"; then
+    icu_lib=`$ICU_CONFIG --ldflags-searchpath`
+    icu_inc=`$ICU_CONFIG --cppflags-searchpath`
+    icu_bin=`$ICU_CONFIG --bindir`
+    AC_MSG_RESULT([using system ICU])
+  else
+    AC_MSG_ERROR([ICU not found, specify with --with-icu.])
+  fi
+fi
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
new file mode 100644
index 00000000..22bfb9d6
--- /dev/null
+++ b/m4/mozldap.m4
@@ -0,0 +1,87 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for LDAPSDK)
+
+# check for --with-ldapsdk
+AC_MSG_CHECKING(for --with-ldapsdk)
+AC_ARG_WITH(ldapsdk, [  --with-ldapsdk=PATH     Mozilla LDAP SDK directory],
+[
+  if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
+  then
+    AC_MSG_RESULT([using $withval])
+    LDAPSDKDIR=$withval
+    ldapsdk_inc="-I$LDAPSDKDIR/include"
+    ldapsdk_lib="-L$LDAPSDKDIR/lib"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-ldapsdk-inc
+AC_MSG_CHECKING(for --with-ldapsdk-inc)
+AC_ARG_WITH(ldapsdk-inc, [  --with-ldapsdk-inc=PATH     Mozilla LDAP SDK include directory],
+[
+  if test -e "$withval"/ldap.h
+  then
+    AC_MSG_RESULT([using $withval])
+    ldapsdk_inc="-I$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-ldapsdk-lib
+AC_MSG_CHECKING(for --with-ldapsdk-lib)
+AC_ARG_WITH(ldapsdk-lib, [  --with-ldapsdk-lib=PATH     Mozilla LDAP SDK library directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    ldapsdk_lib="-L$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# if LDAPSDK is not found yet, try pkg-config
+
+# last resort
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
+  AC_MSG_CHECKING(for mozldap with pkg-config)
+  AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  if test -n "$PKG_CONFIG"; then
+    if $PKG_CONFIG --exists mozldap; then
+      nspr_inc=`$PKG_CONFIG --cflags-only-I mozldap`
+      nspr_lib=`$PKG_CONFIG --libs-only-L mozldap`
+    else
+      AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
+    fi
+  fi
+fi
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
+  AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
+fi
diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4
new file mode 100644
index 00000000..787801d5
--- /dev/null
+++ b/m4/netsnmp.m4
@@ -0,0 +1,102 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for Net-SNMP)
+
+dnl - check for --with-netsnmp
+AC_MSG_CHECKING(for --with-netsnmp)
+AC_ARG_WITH(netsnmp, [  --with-netsnmp=PATH   Net-SNMP directory],
+[
+  if test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then
+    AC_MSG_RESULT([using $withval])
+    NETSNMPDIR=$withval
+
+    if test -f "$withval/include/net-snmp/net-snmp-includes.h"; then
+      netsnmp_inc="-I$withval/include"
+    else
+      AC_MSG_ERROR(net-snmp-config.h not found)
+    fi
+
+    netsnmp_lib="-L$withval/lib"
+  else
+    AC_MSG_RESULT(yes)
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+dnl - check for --with-netsnmp-inc
+AC_MSG_CHECKING(for --with-netsnmp-inc)
+AC_ARG_WITH(netsnmp-inc, [  --with-netsnmp-inc=PATH     Net-SNMP include directory],
+[
+  if test -f "$withval/net-snmp/net-snmp-includes.h"; then
+    AC_MSG_RESULT([using $withval])
+    netsnmp_inc="-I$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval/net-snmp/net-snmp-includes.h not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+dnl -  check for --with-netsnmp-lib
+AC_MSG_CHECKING(for --with-netsnmp-lib)
+AC_ARG_WITH(netsnmp-lib, [  --with-netsnmp-lib=PATH     Net-SNMP library directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    netsnmp_lib="-L$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+dnl - look in standard system locations
+if test -z "$netsnmp_inc" -o -z "$netsnmp_lib"; then
+  AC_MSG_CHECKING(for net-snmp-includes.h)
+  if test -f /usr/include/net-snmp/net-snmp-includes.h; then
+    AC_MSG_RESULT([using /usr/include/net-snmp/net-snmp-includes.h])
+    netsnmp_inc="-I/usr/include"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([net-snmp not found, specify with --with-netsnmp.])
+  fi
+fi
+
+dnl -  find dependent libs with net-snmp-config
+if test -n "$netsnmp_inc"; then
+  AC_MSG_CHECKING(for netsnmp libs with net-snmp-config)
+  if test -x "$NETSNMPDIR/bin/net-snmp-config"; then
+    NETSNMP_CONFIG=$NETSNMPDIR/bin/net-snmp-config
+  else
+    AC_PATH_PROG(NETSNMP_CONFIG, net-snmp-config)
+  fi
+
+  if test -n "$NETSNMP_CONFIG"; then
+    netsnmp_link=`$NETSNMP_CONFIG --agent-libs`
+  else
+    AC_MSG_ERROR([net-snmp-config not found, specify with --with-netsnmp.])
+  fi
+else
+  AC_MSG_ERROR([Net-SNMP not found, specify with --with-netsnmp.])
+fi
diff --git a/m4/nspr.m4 b/m4/nspr.m4
new file mode 100644
index 00000000..d9d4d83a
--- /dev/null
+++ b/m4/nspr.m4
@@ -0,0 +1,85 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for NSPR)
+
+# check for --with-nspr
+AC_MSG_CHECKING(for --with-nspr)
+AC_ARG_WITH(nspr, [  --with-nspr=PATH        Netscape Portable Runtime (NSPR) directory],
+[
+  if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
+  then
+    AC_MSG_RESULT([using $withval])
+    NSPRDIR=$withval
+    nspr_inc="-I$NSPRDIR/include"
+    nspr_lib="-L$NSPRDIR/lib"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nspr-inc
+AC_MSG_CHECKING(for --with-nspr-inc)
+AC_ARG_WITH(nspr-inc, [  --with-nspr-inc=PATH        Netscape Portable Runtime (NSPR) include file directory],
+[
+  if test -e "$withval"/nspr.h
+  then
+    AC_MSG_RESULT([using $withval])
+    nspr_inc="-I$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nspr-lib
+AC_MSG_CHECKING(for --with-nspr-lib)
+AC_ARG_WITH(nspr-lib, [  --with-nspr-lib=PATH        Netscape Portable Runtime (NSPR) library directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    nspr_lib="-L$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# if NSPR is not found yet, try pkg-config
+
+# last resort
+if test -z "$nspr_inc" -o -z "$nspr_lib"; then
+  AC_MSG_CHECKING(for nspr with pkg-config)
+  AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  if test -n "$PKG_CONFIG"; then
+    if $PKG_CONFIG --exists nspr; then
+      nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
+      nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
+      AC_MSG_RESULT([using system NSPR])
+    else
+      AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
+    fi
+  fi
+fi
diff --git a/m4/nss.m4 b/m4/nss.m4
new file mode 100644
index 00000000..82712772
--- /dev/null
+++ b/m4/nss.m4
@@ -0,0 +1,85 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
+
+AC_CHECKING(for NSS)
+
+# check for --with-nss
+AC_MSG_CHECKING(for --with-nss)
+AC_ARG_WITH(nss, [  --with-nss=PATH         Network Security Services (NSS) directory],
+[
+  if test -e "$withval"/include/nss.h -a -d "$withval"/lib
+  then
+    AC_MSG_RESULT([using $withval])
+    NSSDIR=$withval
+    nss_inc="-I$NSSDIR/include"
+    nss_lib="-L$NSSDIR/lib"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nss-inc
+AC_MSG_CHECKING(for --with-nss-inc)
+AC_ARG_WITH(nss-inc, [  --with-nss-inc=PATH         Network Security Services (NSS) include directory],
+[
+  if test -e "$withval"/nss.h
+  then
+    AC_MSG_RESULT([using $withval])
+    nss_inc="-I$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# check for --with-nss-lib
+AC_MSG_CHECKING(for --with-nss-lib)
+AC_ARG_WITH(nss-lib, [  --with-nss-lib=PATH         Network Security Services (NSS) library directory],
+[
+  if test -d "$withval"
+  then
+    AC_MSG_RESULT([using $withval])
+    nss_lib="-L$withval"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+# if NSS is not found yet, try pkg-config
+
+# last resort
+if test -z "$nss_inc" -o -z "$nss_lib"; then
+  AC_MSG_CHECKING(for nss with pkg-config)
+  AC_PATH_PROG(PKG_CONFIG, pkg-config)
+  if test -n "$PKG_CONFIG"; then
+    if $PKG_CONFIG --exists nss; then
+      nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+      nss_lib=`$PKG_CONFIG --libs-only-L nss`
+      AC_MSG_RESULT([using system NSS])
+    else
+      AC_MSG_ERROR([NSS not found, specify with --with-nss.])
+    fi
+  fi
+fi
diff --git a/m4/sasl.m4 b/m4/sasl.m4
new file mode 100644
index 00000000..73e86dcb
--- /dev/null
+++ b/m4/sasl.m4
@@ -0,0 +1,93 @@
+# -*- tab-width: 4; -*-
+# Configure paths for SASL
+# Public domain - Nathan Kinder <nkinder@redhat.com> 2006-06-26
+# Based upon svrcore.m4 (also PD) by Rich Megginson <richm@stanfordalumni.org>
+
+dnl ========================================================
+dnl = sasl is used to support various authentication mechanisms
+dnl = such as DIGEST-MD5 and GSSAPI.
+dnl ========================================================
+dnl ========================================================
+dnl = Use the sasl libraries on the system (assuming it exists)
+dnl ========================================================
+AC_CHECKING(for sasl)
+
+AC_MSG_CHECKING(for --with-sasl)
+AC_ARG_WITH(sasl,
+    [[  --with-sasl=PATH   Use sasl from supplied path]],
+    dnl = Look in the standard system locations
+    [
+      if test "$withval" = "yes"; then
+        AC_MSG_RESULT(yes)
+
+        dnl = Check for sasl.h in the normal locations
+        if test -f /usr/include/sasl/sasl.h; then
+          sasl_inc="-I/usr/include/sasl"
+        elif test -f /usr/include/sasl.h; then
+          sasl_inc="-I/usr/include"
+        else
+          AC_MSG_ERROR(sasl.h not found)
+        fi
+
+      dnl = Check the user provided location
+      elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
+        AC_MSG_RESULT([using $withval])
+
+        if test -f "$withval/include/sasl/sasl.h"; then
+          sasl_inc="-I$withval/include/sasl"
+        elif test -f "$withval/include/sasl.h"; then
+          sasl_inc="-I$withval/include"
+        else
+          AC_MSG_ERROR(sasl.h not found)
+        fi
+
+        sasl_lib="-L$withval/lib"
+      else
+          AC_MSG_RESULT(yes)
+          AC_MSG_ERROR([sasl not found in $withval])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for --with-sasl-inc)
+AC_ARG_WITH(sasl-inc,
+    [[  --with-sasl-inc=PATH   SASL include file directory]],
+    [
+      if test -f "$withval"/sasl.h; then
+        AC_MSG_RESULT([using $withval])
+        sasl_inc="-I$withval"
+      else
+        echo
+        AC_MSG_ERROR([$withval/sasl.h not found])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for --with-sasl-lib)
+AC_ARG_WITH(sasl-lib,
+    [[  --with-sasl-lib=PATH   SASL library directory]],
+    [
+      if test -d "$withval"; then
+        AC_MSG_RESULT([using $withval])
+        sasl_lib="-L$withval"
+      else
+        echo
+        AC_MSG_ERROR([$withval not found])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+if test -z "$sasl_inc"; then
+  AC_MSG_CHECKING(for sasl.h)
+  dnl - Check for sasl in standard system locations
+  if test -f /usr/include/sasl/sasl.h; then
+    AC_MSG_RESULT([using /usr/include/sasl/sasl.h])
+    sasl_inc="-I/usr/include/sasl"
+  elif test -f /usr/include/sasl.h; then
+    AC_MSG_RESULT([using /usr/include/sasl.h])
+    sasl_inc="-I/usr/include"
+  else
+    AC_MSG_RESULT(no)
+    AC_MSG_ERROR([sasl not found, specify with --with-sasl.])
+  fi
+fi
diff --git a/m4/svrcore.m4 b/m4/svrcore.m4
new file mode 100644
index 00000000..420c5838
--- /dev/null
+++ b/m4/svrcore.m4
@@ -0,0 +1,68 @@
+# -*- tab-width: 4; -*-
+# Configure paths for SVRCORE
+# Public domain - Nathan Kinder <nkinder@redhat.com> 2006-06-26
+
+AC_MSG_CHECKING(for --with-svrcore)
+AC_ARG_WITH(svrcore,
+    [[  --with-svrcore[=PATH]   Use system installed svrcore - optional path for svrcore]],
+    dnl = Look in the standard system locations
+    [
+      if test "$withval" = "yes"; then
+        AC_MSG_RESULT(yes)
+
+        dnl = Check for svrcore.h in the normal locations
+        if test -f /usr/include/svrcore.h; then
+          svrcore_inc="-I/usr/include"
+        else
+          AC_MSG_ERROR(svrcore.h not found)
+        fi
+
+      dnl = Check the user provided location
+      elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
+        AC_MSG_RESULT([using $withval])
+
+        if test -f "$withval/include/svrcore.h"; then
+          svrcore_inc="-I$withval/include"
+        else
+          AC_MSG_ERROR(svrcore.h not found)
+        fi
+
+        svrcore_lib="-L$withval/lib"
+      else
+        AC_MSG_RESULT(yes)
+        AC_MSG_ERROR([svrcore not found in $withval])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for --with-svrcore-inc)
+AC_ARG_WITH(svrcore-inc,
+    [[  --with-svrcore-inc=PATH   SVRCORE include file directory]],
+    [
+      if test -f "$withval"/svrcore.h; then
+        AC_MSG_RESULT([using $withval])
+        svrcore_inc="-I$withval"
+      else
+        echo
+        AC_MSG_ERROR([$withval/svrcore.h not found])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+AC_MSG_CHECKING(for --with-svrcore-lib)
+AC_ARG_WITH(svrcore-lib,
+    [[  --with-svrcore-lib=PATH   SVRCORE library directory]],
+    [
+      if test -d "$withval"; then
+        AC_MSG_RESULT([using $withval])
+        svrcore_lib="-L$withval"
+      else
+        echo
+        AC_MSG_ERROR([$withval not found])
+      fi
+    ],
+    AC_MSG_RESULT(no))
+
+if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
+  AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.])
+fi