Attachment #224383 for bug #104554

View | Details | Raw Unified | Return to bug 104554
Collapse All | Expand All

Lines 466-473 AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris") Link Here

(-)a/configure.ac (-2 lines)
466	# Check for library dependencies	466	# Check for library dependencies
467	m4_include(m4/nspr.m4)	467	m4_include(m4/nspr.m4)
468	m4_include(m4/nss.m4)	468	m4_include(m4/nss.m4)
469	# default to Mozilla LDAP C SDK - override with --with-openldap
470	with_ldapsdk=yes
471	m4_include(m4/openldap.m4)	469	m4_include(m4/openldap.m4)
472	m4_include(m4/mozldap.m4)	470	m4_include(m4/mozldap.m4)
473	m4_include(m4/db.m4)	471	m4_include(m4/db.m4)





dnl  - check for --with-db
AC_MSG_CHECKING(for --with-db)
AC_ARG_WITH(db, AS_HELP_STRING([--with-db@<:@=PATH@:>@],[Berkeley DB directory]),
[
  if test "$withval" = "yes"; then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([db is required.])
      db_inc="-I/usr/include"
      db_lib='-L$(libdir)'
      db_libdir='$(libdir)'
    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

    AC_MSG_ERROR([$withval not found])
  fi
],
AC_MSG_RESULT(yes))
dnl default path for the db tools (see [210947] for more details)

# check for --with-db-inc
AC_MSG_CHECKING(for --with-db-inc)
AC_ARG_WITH(db-inc, AS_HELP_STRING([--with-db-inc=PATH],[Berkeley DB include file directory]),
[
  if test -e "$withval"/db.h
  then


# check for --with-db-lib
AC_MSG_CHECKING(for --with-db-lib)
AC_ARG_WITH(db-lib, AS_HELP_STRING([--with-db-lib=PATH],[Berkeley DB library directory]),
[
  if test -d "$withval"
  then

    AC_MSG_ERROR([db not found, specify with --with-db.])
  fi
fi

dnl figure out which version of db we're using from the header file
db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'`
db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`

Lines 22-28 AC_CHECKING(for FHS) Link Here

(-)a/m4/fhs.m4 (-2 / +2 lines)
22		22
23	# check for --with-fhs	23	# check for --with-fhs
24	AC_MSG_CHECKING(for --with-fhs)	24	AC_MSG_CHECKING(for --with-fhs)
25	AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout],	25	AC_ARG_WITH(fhs, AS_HELP_STRING([--with-fhs],[Use FHS layout]),
26	[	26	[
27	with_fhs=yes	27	with_fhs=yes
28	AC_MSG_RESULT(yes)	28	AC_MSG_RESULT(yes)
Lines 35-41 fi Link Here
35		35
36	# check for --with-fhs-opt	36	# check for --with-fhs-opt
37	AC_MSG_CHECKING(for --with-fhs-opt)	37	AC_MSG_CHECKING(for --with-fhs-opt)
38	AC_ARG_WITH(fhs-opt, [ --with-fhs-opt Use FHS optional layout],	38	AC_ARG_WITH(fhs-opt, AS_HELP_STRING([--with-fhs-opt],[Use FHS optional layout]),
39	[	39	[
40	with_fhs_opt=yes	40	with_fhs_opt=yes
41	AC_MSG_RESULT(yes)	41	AC_MSG_RESULT(yes)





# check for --with-icu
AC_MSG_CHECKING(for --with-icu)
AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu@<:@=PATH@:>@],[ICU directory]),
[
  if test "$withval" = "yes"
  then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"
  then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([ICU is required.])
  elif test -d "$withval"/lib
  then
    AC_MSG_RESULT([using $withval])
    ICUDIR=$withval
    icu_lib="-L$ICUDIR/lib"
    icu_inc="-I$withval/include"
    icu_bin="$withval/bin"
  else
    echo
    AC_MSG_ERROR([$withval not found])
  fi
  icu_inc="-I$withval/include"
  icu_bin="$withval/bin"
],
AC_MSG_RESULT(yes))

# check for --with-icu-inc
AC_MSG_CHECKING(for --with-icu-inc)
AC_ARG_WITH(icu-inc, AS_HELP_STRING([--with-icu-inc=PATH],[ICU include directory]),
[
  if test -d "$withval"
  then


# check for --with-icu-lib
AC_MSG_CHECKING(for --with-icu-lib)
AC_ARG_WITH(icu-lib, AS_HELP_STRING([--with-icu-lib=PATH],[ICU library directory]),
[
  if test -d "$withval"
  then


# check for --with-icu-bin
AC_MSG_CHECKING(for --with-icu-bin)
AC_ARG_WITH(icu-bin, AS_HELP_STRING([--with-icu-bin=PATH],[ICU binary directory]),
[
  if test -d "$withval"
  then


# last resort
if test -z "$icu_lib"; then
  AC_MSG_CHECKING(for icu with icu-config)
  AC_PATH_PROG(ICU_CONFIG, icu-config)
  AC_MSG_CHECKING(for icu with icu-config)
  if test -n "$ICU_CONFIG"; then
    icu_lib=`$ICU_CONFIG --ldflags-searchpath`
    icu_inc=`$ICU_CONFIG --cppflags-searchpath`

Lines 26-32 dnl = authentication (replication, chaining, etc.) Link Here

(-)a/m4/kerberos.m4 (-2 / +2 lines)
26	dnl = This allows us to authenticate using a keytab without	26	dnl = This allows us to authenticate using a keytab without
27	dnl = having to call kinit outside the process	27	dnl = having to call kinit outside the process
28	dnl ========================================================	28	dnl ========================================================
29	AC_CHECKING(for kerberos)	29	AC_CHECKING(for Kerberos)
30		30
31	if test -z "$with_kerberos" ; then	31	if test -z "$with_kerberos" ; then
32	with_kerberos=yes # if not set on cmdline, set default	32	with_kerberos=yes # if not set on cmdline, set default
Lines 34-40 fi Link Here
34		34
35	AC_MSG_CHECKING(for --with-kerberos)	35	AC_MSG_CHECKING(for --with-kerberos)
36	AC_ARG_WITH(kerberos,	36	AC_ARG_WITH(kerberos,
37	AS_HELP_STRING([--with-kerberos[=PATH]], [Use the kerberos API in the server directly - allows the server to authenticate directly with a keytab - otherwise, SASL/GSSAPI auth depends on underlying SASL libraries and external kinit with a keytab - if PATH is not specified, look for kerberos in the system locations. This will attempt to use krb5-config from the PATH to find the libs and include dirs - you can specify KRB5_CONFIG_BIN to specify a different filename or absolute path. If krb5-config does not work, this will attempt to look in various system directories]),	37	AS_HELP_STRING([--with-kerberos@<:@=PATH@:>@], [Use the kerberos API in the server directly - allows the server to authenticate directly with a keytab - otherwise, SASL/GSSAPI auth depends on underlying SASL libraries and external kinit with a keytab - if PATH is not specified, look for kerberos in the system locations. This will attempt to use krb5-config from the PATH to find the libs and include dirs - you can specify KRB5_CONFIG_BIN to specify a different filename or absolute path. If krb5-config does not work, this will attempt to look in various system directories]),
38	[	38	[
39	if test "x$withval" = "xyes"; then	39	if test "x$withval" = "xyes"; then
40	AC_MSG_RESULT(yes)	40	AC_MSG_RESULT(yes)

Lines 22-32 AC_CHECKING(for Mozilla LDAPSDK) Link Here

(-)a/m4/mozldap.m4 (-6 / +26 lines)
22		22
23	# check for --with-ldapsdk	23	# check for --with-ldapsdk
24	AC_MSG_CHECKING(for --with-ldapsdk)	24	AC_MSG_CHECKING(for --with-ldapsdk)
25	AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory],	25	AC_ARG_WITH(ldapsdk, AS_HELP_STRING([--with-ldapsdk@<:@=PATH@:>@],[Mozilla LDAP SDK directory]),
26	[	26	[
27	if test "$withval" = yes	27	if test "$withval" = yes
28	then	28	then
29	AC_MSG_RESULT([using system MozLDAP])	29	AC_MSG_RESULT(yes)
		30	elif test "$withval" = no
		31	then
		32	AC_MSG_RESULT(no)
30	elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib	33	elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib
31	then	34	then
32	AC_MSG_RESULT([using $withval])	35	AC_MSG_RESULT([using $withval])
Lines 40-51 AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory], Link Here
40	echo	43	echo
41	AC_MSG_ERROR([$withval not found])	44	AC_MSG_ERROR([$withval not found])
42	fi	45	fi
		46
		47	if test "$with_ldapsdk" = yes -a "$with_openldap" = yes
		48	then
		49	AC_MSG_ERROR([Cannot use both LDAPSDK and OpenLDAP.])
		50	fi
		51	if test "$with_ldapsdk" != yes -a "$with_openldap" != yes
		52	then
		53	AC_MSG_ERROR([Either LDAPSDK or OpenLDAP must be used.])
		54	fi
43	],	55	],
44	AC_MSG_RESULT(no))	56	[
		57	if test "$with_openldap" = yes
		58	then
		59	AC_MSG_RESULT(no)
		60	else
		61	AC_MSG_RESULT(yes)
		62	with_ldapsdk=yes
		63	fi
		64	])
45		65
46	# check for --with-ldapsdk-inc	66	# check for --with-ldapsdk-inc
47	AC_MSG_CHECKING(for --with-ldapsdk-inc)	67	AC_MSG_CHECKING(for --with-ldapsdk-inc)
48	AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory],	68	AC_ARG_WITH(ldapsdk-inc, AS_HELP_STRING([--with-ldapsdk-inc=PATH],[Mozilla LDAP SDK include directory]),
49	[	69	[
50	if test -e "$withval"/ldap.h	70	if test -e "$withval"/ldap.h
51	then	71	then
Lines 61-67 AC_MSG_RESULT(no)) Link Here
61		81
62	# check for --with-ldapsdk-lib	82	# check for --with-ldapsdk-lib
63	AC_MSG_CHECKING(for --with-ldapsdk-lib)	83	AC_MSG_CHECKING(for --with-ldapsdk-lib)
64	AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory],	84	AC_ARG_WITH(ldapsdk-lib, AS_HELP_STRING([--with-ldapsdk-lib=PATH],[Mozilla LDAP SDK library directory]),
65	[	85	[
66	if test -d "$withval"	86	if test -d "$withval"
67	then	87	then
Lines 78-84 AC_MSG_RESULT(no)) Link Here
78		98
79	# check for --with-ldapsdk-bin	99	# check for --with-ldapsdk-bin
80	AC_MSG_CHECKING(for --with-ldapsdk-bin)	100	AC_MSG_CHECKING(for --with-ldapsdk-bin)
81	AC_ARG_WITH(ldapsdk-bin, [ --with-ldapsdk-bin=PATH Mozilla LDAP SDK binary directory],	101	AC_ARG_WITH(ldapsdk-bin, AS_HELP_STRING([--with-ldapsdk-bin=PATH],[Mozilla LDAP SDK binary directory]),
82	[	102	[
83	if test -d "$withval"	103	if test -d "$withval"
84	then	104	then





dnl - check for --with-netsnmp
AC_MSG_CHECKING(for --with-netsnmp)
AC_ARG_WITH(netsnmp, AS_HELP_STRING([--with-netsnmp@<:@=PATH@:>@],[Net-SNMP directory]),
[
  if test "$withval" = "yes"; then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([Net-SNMP is required.])
  elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then
    AC_MSG_RESULT([using $withval])
    NETSNMPDIR=$withval


    AC_MSG_ERROR([$withval not found])
  fi
],
AC_MSG_RESULT(yes))

dnl - check for --with-netsnmp-inc
AC_MSG_CHECKING(for --with-netsnmp-inc)
AC_ARG_WITH(netsnmp-inc, AS_HELP_STRING([--with-netsnmp-inc=PATH],[Net-SNMP include directory]),
[
  if test -f "$withval/net-snmp/net-snmp-includes.h"; then
    AC_MSG_RESULT([using $withval])


dnl -  check for --with-netsnmp-lib
AC_MSG_CHECKING(for --with-netsnmp-lib)
AC_ARG_WITH(netsnmp-lib, AS_HELP_STRING([--with-netsnmp-lib=PATH],[Net-SNMP library directory]),
[
  if test -d "$withval"
  then





# check for --with-nspr
AC_MSG_CHECKING(for --with-nspr)
AC_ARG_WITH(nspr, AS_HELP_STRING([--with-nspr@<:@=PATH@:>@],[Netscape Portable Runtime (NSPR) directory]),
[
  if test "$withval" = "yes"
  then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"
  then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([NSPR is required.])
  elif test -e "$withval"/include/nspr.h -a -d "$withval"/lib
  then
    AC_MSG_RESULT([using $withval])
    NSPRDIR=$withval

    AC_MSG_ERROR([$withval not found])
  fi
],
AC_MSG_RESULT(yes))

# check for --with-nspr-inc
AC_MSG_CHECKING(for --with-nspr-inc)
AC_ARG_WITH(nspr-inc, AS_HELP_STRING([--with-nspr-inc=PATH],[Netscape Portable Runtime (NSPR) include directory]),
[
  if test -e "$withval"/nspr.h
  then


# check for --with-nspr-lib
AC_MSG_CHECKING(for --with-nspr-lib)
AC_ARG_WITH(nspr-lib, AS_HELP_STRING([--with-nspr-lib=PATH],[Netscape Portable Runtime (NSPR) library directory]),
[
  if test -d "$withval"
  then





# check for --with-nss
AC_MSG_CHECKING(for --with-nss)
AC_ARG_WITH(nss, AS_HELP_STRING([--with-nss@<:@=PATH@:>@],[Network Security Services (NSS) directory]),
[
  if test "$withval" = "yes"
  then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"
  then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([NSS is required.])
  elif test -e "$withval"/include/nss.h -a -d "$withval"/lib
  then
    AC_MSG_RESULT([using $withval])
    NSSDIR=$withval

    AC_MSG_ERROR([$withval not found])
  fi
],
AC_MSG_RESULT(yes))

# check for --with-nss-inc
AC_MSG_CHECKING(for --with-nss-inc)
AC_ARG_WITH(nss-inc, AS_HELP_STRING([--with-nss-inc=PATH],[Network Security Services (NSS) include directory]),
[
  if test -e "$withval"/nss.h
  then


# check for --with-nss-lib
AC_MSG_CHECKING(for --with-nss-lib)
AC_ARG_WITH(nss-lib, AS_HELP_STRING([--with-nss-lib=PATH],[Network Security Services (NSS) library directory]),
[
  if test -d "$withval"
  then

Lines 22-32 AC_CHECKING(for OpenLDAP) Link Here

(-)a/m4/openldap.m4 (-7 / +9 lines)
22		22
23	# check for --with-openldap	23	# check for --with-openldap
24	AC_MSG_CHECKING(for --with-openldap)	24	AC_MSG_CHECKING(for --with-openldap)
25	AC_ARG_WITH(openldap, AS_HELP_STRING([--with-openldap[=PATH]],[Use OpenLDAP - optional PATH is path to OpenLDAP SDK]),	25	AC_ARG_WITH(openldap, AS_HELP_STRING([--with-openldap@<:@=PATH@:>@],[Use OpenLDAP - optional PATH is path to OpenLDAP SDK]),
26	[	26	[
27	if test "$withval" = yes	27	if test "$withval" = yes
28	then	28	then
29	AC_MSG_RESULT([using system OpenLDAP])	29	AC_MSG_RESULT([using system OpenLDAP])
		30	elif test "$withval" = no
		31	then
		32	AC_MSG_RESULT(no)
30	elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib	33	elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib
31	then	34	then
32	AC_MSG_RESULT([using $withval])	35	AC_MSG_RESULT([using $withval])
Lines 46-52 AC_MSG_RESULT(no)) Link Here
46		49
47	# check for --with-openldap-inc	50	# check for --with-openldap-inc
48	AC_MSG_CHECKING(for --with-openldap-inc)	51	AC_MSG_CHECKING(for --with-openldap-inc)
49	AC_ARG_WITH(openldap-inc, [ --with-openldap-inc=PATH OpenLDAP SDK include directory],	52	AC_ARG_WITH(openldap-inc, AS_HELP_STRING([--with-openldap-inc=PATH],[OpenLDAP SDK include directory]),
50	[	53	[
51	if test -e "$withval"/ldap.h	54	if test -e "$withval"/ldap.h
52	then	55	then
Lines 63-69 AC_MSG_RESULT(no)) Link Here
63		66
64	# check for --with-openldap-lib	67	# check for --with-openldap-lib
65	AC_MSG_CHECKING(for --with-openldap-lib)	68	AC_MSG_CHECKING(for --with-openldap-lib)
66	AC_ARG_WITH(openldap-lib, [ --with-openldap-lib=PATH OpenLDAP SDK library directory],	69	AC_ARG_WITH(openldap-lib, AS_HELP_STRING([--with-openldap-lib=PATH],[OpenLDAP SDK library directory]),
67	[	70	[
68	if test -d "$withval"	71	if test -d "$withval"
69	then	72	then
Lines 80-86 AC_MSG_RESULT(no)) Link Here
80		83
81	# check for --with-openldap-bin	84	# check for --with-openldap-bin
82	AC_MSG_CHECKING(for --with-openldap-bin)	85	AC_MSG_CHECKING(for --with-openldap-bin)
83	AC_ARG_WITH(openldap-bin, [ --with-openldap-bin=PATH OpenLDAP SDK binary directory],	86	AC_ARG_WITH(openldap-bin, AS_HELP_STRING([--with-openldap-bin=PATH],[OpenLDAP SDK binary directory]),
84	[	87	[
85	if test -d "$withval"	88	if test -d "$withval"
86	then	89	then
Lines 96-103 AC_MSG_RESULT(no)) Link Here
96		99
97	# if OPENLDAP is not found yet, try pkg-config	100	# if OPENLDAP is not found yet, try pkg-config
98		101
99	if test -z "$openldap_inc" -o -z "$openldap_lib" -o -z "$openldap_libdir" -o -z "$openldap_bindir"; then	102	if test "$with_openldap" = yes ; then # user wants to use openldap, but didn't specify paths
100	if test "$with_openldap" = yes ; then # user wants to use openldap, but didn't specify paths	103	if test -z "$openldap_inc" -o -z "$openldap_lib" -o -z "$openldap_libdir" -o -z "$openldap_bindir"; then
101	AC_PATH_PROG(PKG_CONFIG, pkg-config)	104	AC_PATH_PROG(PKG_CONFIG, pkg-config)
102	AC_MSG_CHECKING(for OpenLDAP with pkg-config)	105	AC_MSG_CHECKING(for OpenLDAP with pkg-config)
103	if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists openldap; then	106	if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists openldap; then
Lines 143-147 if test "$with_openldap" = yes ; then Link Here
143	CPPFLAGS="$save_cppflags"	146	CPPFLAGS="$save_cppflags"
144		147
145	AC_DEFINE([USE_OPENLDAP], [1], [If defined, using OpenLDAP for LDAP SDK])	148	AC_DEFINE([USE_OPENLDAP], [1], [If defined, using OpenLDAP for LDAP SDK])
146	with_ldapsdk=no # using openldap not mozldap
147	fi	149	fi




#
# END COPYRIGHT BLOCK

AC_CHECKING(for PCRE)

dnl  - check for --with-pcre
AC_MSG_CHECKING(for --with-pcre)
AC_ARG_WITH(pcre, AS_HELP_STRING([--with-pcre@<:@=PATH@:>@],[Perl Compatible Regular Expression directory]),
[
  if test "$withval" = "yes"; then
    AC_MSG_RESULT(yes)
  elif test "$withval" = "no"; then
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([PCRE is required.])
      pcre_inc="-I/usr/include/pcre"
      pcre_lib='-L$(libdir)'
      pcre_libdir='$(libdir)'
    elif test -f "/usr/include/pcre.h"; then
      pcre_incdir="/usr/include"
      pcre_inc="-I/usr/include"
      pcre_lib='-L$(libdir)'
      pcre_libdir='$(libdir)'
    else
      AC_MSG_ERROR([pcre.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

    AC_MSG_ERROR([$withval not found])
  fi
],
AC_MSG_RESULT(yes))

#
# if PCRE is not found yet, try pkg-config

dnl - check in system locations
if test -z "$pcre_inc"; then
  AC_MSG_CHECKING(for pcre.h)
  if test -f "/usr/include/pcre/pcre.h"; then
    AC_MSG_RESULT([using /usr/include/pcre/pcre.h])
    pcre_incdir="/usr/include/pcre"
    pcre_inc="-I/usr/include/pcre"
    pcre_lib='-L$(libdir)'
    pcre_libdir='$(libdir)'
  elif test -f "/usr/include/pcre.h"; then
    AC_MSG_RESULT([using /usr/include/pcre.h])
    pcre_incdir="/usr/include"
    pcre_inc="-I/usr/include"

    pcre_libdir='$(libdir)'
  else
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([PCRE not found, specify with --with-pcre.])
  fi
fi




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,
    AS_HELP_STRING([--with-sasl@<:@=PATH@:>@],[Use SASL from supplied path]),
    dnl = Look in the standard system locations
    [
      if test "$withval" = "yes"; then
        AC_MSG_RESULT(yes)

      elif test "$withval" = "no"; then
        AC_MSG_RESULT(no)
        AC_MSG_ERROR([SASL is required.])
        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

        sasl_libdir="$withval/lib"
      else
          AC_MSG_RESULT(yes)
          AC_MSG_ERROR([SASL not found in $withval])
      fi
    ],
    AC_MSG_RESULT(yes))

AC_MSG_CHECKING(for --with-sasl-inc)
AC_ARG_WITH(sasl-inc,
    AS_HELP_STRING([--with-sasl-inc=PATH],[SASL include file directory]),
    [
      if test -f "$withval"/sasl.h; then
        AC_MSG_RESULT([using $withval])


AC_MSG_CHECKING(for --with-sasl-lib)
AC_ARG_WITH(sasl-lib,
    AS_HELP_STRING([--with-sasl-lib=PATH],[SASL library directory]),
    [
      if test -d "$withval"; then
        AC_MSG_RESULT([using $withval])

    sasl_inc="-I/usr/include"
  else
    AC_MSG_RESULT(no)
    AC_MSG_ERROR([SASL not found, specify with --with-sasl.])
  fi
fi





# check for --with-selinux
AC_MSG_CHECKING(for --with-selinux)
AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux],[Build SELinux policy]),
[
  if test "$withval" = "no"; then
    AC_MSG_RESULT(no)
  else
    with_selinux=yes
    AC_MSG_RESULT(yes)
    AC_SUBST(with_selinux)
    if test ! -f "/usr/share/selinux/devel/Makefile"; then
      AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])
    fi
  fi
],
AC_MSG_RESULT(no))




#
# Configure paths for SVRCORE

AC_CHECKING(for SVRCORE)

AC_MSG_CHECKING(for --with-svrcore)
AC_ARG_WITH(svrcore,
    AS_HELP_STRING([--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)

      elif test "$withval" = "no"; then
        AC_MSG_RESULT(no)
        AC_MSG_ERROR([SVRCORE is required.])
        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

        svrcore_lib="-L$withval/lib"
      else
        AC_MSG_RESULT(yes)
        AC_MSG_ERROR([SVRCORE not found in $withval])
      fi
    ],
    AC_MSG_RESULT(yes))

AC_MSG_CHECKING(for --with-svrcore-inc)
AC_ARG_WITH(svrcore-inc,
    AS_HELP_STRING([--with-svrcore-inc=PATH],[SVRCORE include file directory]),
    [
      if test -f "$withval"/svrcore.h; then
        AC_MSG_RESULT([using $withval])


AC_MSG_CHECKING(for --with-svrcore-lib)
AC_ARG_WITH(svrcore-lib,
    AS_HELP_STRING([--with-svrcore-lib=PATH],[SVRCORE library directory]),
    [
      if test -d "$withval"; then
        AC_MSG_RESULT([using $withval])

dnl svrcore not given - look for pkg-config
if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
  AC_PATH_PROG(PKG_CONFIG, pkg-config)
  AC_MSG_CHECKING(for SVRCORE with pkg-config)
  if test -n "$PKG_CONFIG"; then
    if $PKG_CONFIG --exists svrcore; then
      svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`

fi

if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
dnl just see if SVRCORE is already a system library
  AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1],
	       [], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4])
  if test -n "$havesvrcore" ; then
dnl just see if SVRCORE is already a system header file
    save_cppflags="$CPPFLAGS"
    CPPFLAGS="$nss_inc $nspr_inc"
    AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=])
    CPPFLAGS="$save_cppflags"
  fi
dnl for SVRCORE to be present, both the library and the header must exist
  if test -z "$havesvrcore" ; then
    AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.])
  fi
fi

dnl = Check for svrcore.h in the normal locations
if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
  if test -f /usr/include/svrcore.h; then
    svrcore_inc="-I/usr/include"
    svrcore_lib="-L/usr/lib"
  else
    AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.])
  fi
fi
- 

Return to bug 104554

Lines 22-40 AC_CHECKING(for db) Link Here

(-)a/m4/db.m4 (-13 / +8 lines)
22		22
23	dnl - check for --with-db	23	dnl - check for --with-db
24	AC_MSG_CHECKING(for --with-db)	24	AC_MSG_CHECKING(for --with-db)
25	AC_ARG_WITH(db, [ --with-db=PATH Berkeley DB directory],	25	AC_ARG_WITH(db, AS_HELP_STRING([--with-db@<:@=PATH@:>@],[Berkeley DB directory]),
26	[	26	[
27	if test "$withval" = "yes"; then	27	if test "$withval" = "yes"; then
28	AC_MSG_RESULT(yes)	28	AC_MSG_RESULT(yes)
29	dnl - check in system locations	29	elif test "$withval" = "no"; then
30	if test -f "/usr/include/db.h"; then	30	AC_MSG_RESULT(no)
31	db_incdir="/usr/include"	31	AC_MSG_ERROR([db is required.])
32	db_inc="-I/usr/include"
33	db_lib='-L$(libdir)'
34	db_libdir='$(libdir)'
35	else
36	AC_MSG_ERROR([db.h not found])
37	fi
38	elif test -d "$withval"/include -a -d "$withval"/lib; then	32	elif test -d "$withval"/include -a -d "$withval"/lib; then
39	AC_MSG_RESULT([using $withval])	33	AC_MSG_RESULT([using $withval])
40	dnl - check the user provided location	34	dnl - check the user provided location
Lines 51-62 AC_ARG_WITH(db, [ --with-db=PATH Berkeley DB directory], Link Here
51	AC_MSG_ERROR([$withval not found])	45	AC_MSG_ERROR([$withval not found])
52	fi	46	fi
53	],	47	],
54	AC_MSG_RESULT(no))	48	AC_MSG_RESULT(yes))
55	dnl default path for the db tools (see [210947] for more details)	49	dnl default path for the db tools (see [210947] for more details)
56		50
57	# check for --with-db-inc	51	# check for --with-db-inc
58	AC_MSG_CHECKING(for --with-db-inc)	52	AC_MSG_CHECKING(for --with-db-inc)
59	AC_ARG_WITH(db-inc, [ --with-db-inc=PATH Berkeley DB include file directory],	53	AC_ARG_WITH(db-inc, AS_HELP_STRING([--with-db-inc=PATH],[Berkeley DB include file directory]),
60	[	54	[
61	if test -e "$withval"/db.h	55	if test -e "$withval"/db.h
62	then	56	then
Lines 72-78 AC_MSG_RESULT(no)) Link Here
72		66
73	# check for --with-db-lib	67	# check for --with-db-lib
74	AC_MSG_CHECKING(for --with-db-lib)	68	AC_MSG_CHECKING(for --with-db-lib)
75	AC_ARG_WITH(db-lib, [ --with-db-lib=PATH Berkeley DB library directory],	69	AC_ARG_WITH(db-lib, AS_HELP_STRING([--with-db-lib=PATH],[Berkeley DB library directory]),
76	[	70	[
77	if test -d "$withval"	71	if test -d "$withval"
78	then	72	then
Lines 106-111 if test -z "$db_inc"; then Link Here
106	AC_MSG_ERROR([db not found, specify with --with-db.])	100	AC_MSG_ERROR([db not found, specify with --with-db.])
107	fi	101	fi
108	fi	102	fi
		103
109	dnl figure out which version of db we're using from the header file	104	dnl figure out which version of db we're using from the header file
110	db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h \| awk '{print $3}'`	105	db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h \| awk '{print $3}'`
111	db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h \| awk '{print $3}'`	106	db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h \| awk '{print $3}'`

Lines 22-46 AC_CHECKING(for LIBICU) Link Here

(-)a/m4/icu.m4 (-9 / +16 lines)
22		22
23	# check for --with-icu	23	# check for --with-icu
24	AC_MSG_CHECKING(for --with-icu)	24	AC_MSG_CHECKING(for --with-icu)
25	AC_ARG_WITH(icu, [ --with-icu=PATH ICU directory],	25	AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu@<:@=PATH@:>@],[ICU directory]),
26	[	26	[
27	if test -d "$withval"/lib	27	if test "$withval" = "yes"
		28	then
		29	AC_MSG_RESULT(yes)
		30	elif test "$withval" = "no"
		31	then
		32	AC_MSG_RESULT(no)
		33	AC_MSG_ERROR([ICU is required.])
		34	elif test -d "$withval"/lib
28	then	35	then
29	AC_MSG_RESULT([using $withval])	36	AC_MSG_RESULT([using $withval])
30	ICUDIR=$withval	37	ICUDIR=$withval
31	icu_lib="-L$ICUDIR/lib"	38	icu_lib="-L$ICUDIR/lib"
		39	icu_inc="-I$withval/include"
		40	icu_bin="$withval/bin"
32	else	41	else
33	echo	42	echo
34	AC_MSG_ERROR([$withval not found])	43	AC_MSG_ERROR([$withval not found])
35	fi	44	fi
36	icu_inc="-I$withval/include"
37	icu_bin="$withval/bin"
38	],	45	],
39	AC_MSG_RESULT(no))	46	AC_MSG_RESULT(yes))
40		47
41	# check for --with-icu-inc	48	# check for --with-icu-inc
42	AC_MSG_CHECKING(for --with-icu-inc)	49	AC_MSG_CHECKING(for --with-icu-inc)
43	AC_ARG_WITH(icu-inc, [ --with-icu-inc=PATH ICU include directory],	50	AC_ARG_WITH(icu-inc, AS_HELP_STRING([--with-icu-inc=PATH],[ICU include directory]),
44	[	51	[
45	if test -d "$withval"	52	if test -d "$withval"
46	then	53	then
Lines 55-61 AC_MSG_RESULT(no)) Link Here
55		62
56	# check for --with-icu-lib	63	# check for --with-icu-lib
57	AC_MSG_CHECKING(for --with-icu-lib)	64	AC_MSG_CHECKING(for --with-icu-lib)
58	AC_ARG_WITH(icu-lib, [ --with-icu-lib=PATH ICU library directory],	65	AC_ARG_WITH(icu-lib, AS_HELP_STRING([--with-icu-lib=PATH],[ICU library directory]),
59	[	66	[
60	if test -d "$withval"	67	if test -d "$withval"
61	then	68	then
Lines 70-76 AC_MSG_RESULT(no)) Link Here
70		77
71	# check for --with-icu-bin	78	# check for --with-icu-bin
72	AC_MSG_CHECKING(for --with-icu-bin)	79	AC_MSG_CHECKING(for --with-icu-bin)
73	AC_ARG_WITH(icu-bin, [ --with-icu-bin=PATH ICU binary directory],	80	AC_ARG_WITH(icu-bin, AS_HELP_STRING([--with-icu-bin=PATH],[ICU binary directory]),
74	[	81	[
75	if test -d "$withval"	82	if test -d "$withval"
76	then	83	then
Lines 86-93 AC_MSG_RESULT(no)) Link Here
86		93
87	# last resort	94	# last resort
88	if test -z "$icu_lib"; then	95	if test -z "$icu_lib"; then
89	AC_MSG_CHECKING(for icu with icu-config)
90	AC_PATH_PROG(ICU_CONFIG, icu-config)	96	AC_PATH_PROG(ICU_CONFIG, icu-config)
		97	AC_MSG_CHECKING(for icu with icu-config)
91	if test -n "$ICU_CONFIG"; then	98	if test -n "$ICU_CONFIG"; then
92	icu_lib=`$ICU_CONFIG --ldflags-searchpath`	99	icu_lib=`$ICU_CONFIG --ldflags-searchpath`
93	icu_inc=`$ICU_CONFIG --cppflags-searchpath`	100	icu_inc=`$ICU_CONFIG --cppflags-searchpath`

Lines 22-30 AC_CHECKING(for Net-SNMP) Link Here

(-)a/m4/netsnmp.m4 (-5 / +10 lines)
22		22
23	dnl - check for --with-netsnmp	23	dnl - check for --with-netsnmp
24	AC_MSG_CHECKING(for --with-netsnmp)	24	AC_MSG_CHECKING(for --with-netsnmp)
25	AC_ARG_WITH(netsnmp, [ --with-netsnmp=PATH Net-SNMP directory],	25	AC_ARG_WITH(netsnmp, AS_HELP_STRING([--with-netsnmp@<:@=PATH@:>@],[Net-SNMP directory]),
26	[	26	[
27	if test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then	27	if test "$withval" = "yes"; then
		28	AC_MSG_RESULT(yes)
		29	elif test "$withval" = "no"; then
		30	AC_MSG_RESULT(no)
		31	AC_MSG_ERROR([Net-SNMP is required.])
		32	elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then
28	AC_MSG_RESULT([using $withval])	33	AC_MSG_RESULT([using $withval])
29	NETSNMPDIR=$withval	34	NETSNMPDIR=$withval
30		35
Lines 41-51 AC_ARG_WITH(netsnmp, [ --with-netsnmp=PATH Net-SNMP directory], Link Here
41	AC_MSG_ERROR([$withval not found])	46	AC_MSG_ERROR([$withval not found])
42	fi	47	fi
43	],	48	],
44	AC_MSG_RESULT(no))	49	AC_MSG_RESULT(yes))
45		50
46	dnl - check for --with-netsnmp-inc	51	dnl - check for --with-netsnmp-inc
47	AC_MSG_CHECKING(for --with-netsnmp-inc)	52	AC_MSG_CHECKING(for --with-netsnmp-inc)
48	AC_ARG_WITH(netsnmp-inc, [ --with-netsnmp-inc=PATH Net-SNMP include directory],	53	AC_ARG_WITH(netsnmp-inc, AS_HELP_STRING([--with-netsnmp-inc=PATH],[Net-SNMP include directory]),
49	[	54	[
50	if test -f "$withval/net-snmp/net-snmp-includes.h"; then	55	if test -f "$withval/net-snmp/net-snmp-includes.h"; then
51	AC_MSG_RESULT([using $withval])	56	AC_MSG_RESULT([using $withval])
Lines 59-65 AC_MSG_RESULT(no)) Link Here
59		64
60	dnl - check for --with-netsnmp-lib	65	dnl - check for --with-netsnmp-lib
61	AC_MSG_CHECKING(for --with-netsnmp-lib)	66	AC_MSG_CHECKING(for --with-netsnmp-lib)
62	AC_ARG_WITH(netsnmp-lib, [ --with-netsnmp-lib=PATH Net-SNMP library directory],	67	AC_ARG_WITH(netsnmp-lib, AS_HELP_STRING([--with-netsnmp-lib=PATH],[Net-SNMP library directory]),
63	[	68	[
64	if test -d "$withval"	69	if test -d "$withval"
65	then	70	then

Lines 22-30 AC_CHECKING(for NSPR) Link Here

(-)a/m4/nspr.m4 (-5 / +12 lines)
22		22
23	# check for --with-nspr	23	# check for --with-nspr
24	AC_MSG_CHECKING(for --with-nspr)	24	AC_MSG_CHECKING(for --with-nspr)
25	AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory],	25	AC_ARG_WITH(nspr, AS_HELP_STRING([--with-nspr@<:@=PATH@:>@],[Netscape Portable Runtime (NSPR) directory]),
26	[	26	[
27	if test -e "$withval"/include/nspr.h -a -d "$withval"/lib	27	if test "$withval" = "yes"
		28	then
		29	AC_MSG_RESULT(yes)
		30	elif test "$withval" = "no"
		31	then
		32	AC_MSG_RESULT(no)
		33	AC_MSG_ERROR([NSPR is required.])
		34	elif test -e "$withval"/include/nspr.h -a -d "$withval"/lib
28	then	35	then
29	AC_MSG_RESULT([using $withval])	36	AC_MSG_RESULT([using $withval])
30	NSPRDIR=$withval	37	NSPRDIR=$withval
Lines 36-46 AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) di Link Here
36	AC_MSG_ERROR([$withval not found])	43	AC_MSG_ERROR([$withval not found])
37	fi	44	fi
38	],	45	],
39	AC_MSG_RESULT(no))	46	AC_MSG_RESULT(yes))
40		47
41	# check for --with-nspr-inc	48	# check for --with-nspr-inc
42	AC_MSG_CHECKING(for --with-nspr-inc)	49	AC_MSG_CHECKING(for --with-nspr-inc)
43	AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory],	50	AC_ARG_WITH(nspr-inc, AS_HELP_STRING([--with-nspr-inc=PATH],[Netscape Portable Runtime (NSPR) include directory]),
44	[	51	[
45	if test -e "$withval"/nspr.h	52	if test -e "$withval"/nspr.h
46	then	53	then
Lines 55-61 AC_MSG_RESULT(no)) Link Here
55		62
56	# check for --with-nspr-lib	63	# check for --with-nspr-lib
57	AC_MSG_CHECKING(for --with-nspr-lib)	64	AC_MSG_CHECKING(for --with-nspr-lib)
58	AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory],	65	AC_ARG_WITH(nspr-lib, AS_HELP_STRING([--with-nspr-lib=PATH],[Netscape Portable Runtime (NSPR) library directory]),
59	[	66	[
60	if test -d "$withval"	67	if test -d "$withval"
61	then	68	then

Lines 22-30 AC_CHECKING(for NSS) Link Here

(-)a/m4/nss.m4 (-5 / +12 lines)
22		22
23	# check for --with-nss	23	# check for --with-nss
24	AC_MSG_CHECKING(for --with-nss)	24	AC_MSG_CHECKING(for --with-nss)
25	AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory],	25	AC_ARG_WITH(nss, AS_HELP_STRING([--with-nss@<:@=PATH@:>@],[Network Security Services (NSS) directory]),
26	[	26	[
27	if test -e "$withval"/include/nss.h -a -d "$withval"/lib	27	if test "$withval" = "yes"
		28	then
		29	AC_MSG_RESULT(yes)
		30	elif test "$withval" = "no"
		31	then
		32	AC_MSG_RESULT(no)
		33	AC_MSG_ERROR([NSS is required.])
		34	elif test -e "$withval"/include/nss.h -a -d "$withval"/lib
28	then	35	then
29	AC_MSG_RESULT([using $withval])	36	AC_MSG_RESULT([using $withval])
30	NSSDIR=$withval	37	NSSDIR=$withval
Lines 36-46 AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) dire Link Here
36	AC_MSG_ERROR([$withval not found])	43	AC_MSG_ERROR([$withval not found])
37	fi	44	fi
38	],	45	],
39	AC_MSG_RESULT(no))	46	AC_MSG_RESULT(yes))
40		47
41	# check for --with-nss-inc	48	# check for --with-nss-inc
42	AC_MSG_CHECKING(for --with-nss-inc)	49	AC_MSG_CHECKING(for --with-nss-inc)
43	AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory],	50	AC_ARG_WITH(nss-inc, AS_HELP_STRING([--with-nss-inc=PATH],[Network Security Services (NSS) include directory]),
44	[	51	[
45	if test -e "$withval"/nss.h	52	if test -e "$withval"/nss.h
46	then	53	then
Lines 55-61 AC_MSG_RESULT(no)) Link Here
55		62
56	# check for --with-nss-lib	63	# check for --with-nss-lib
57	AC_MSG_CHECKING(for --with-nss-lib)	64	AC_MSG_CHECKING(for --with-nss-lib)
58	AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory],	65	AC_ARG_WITH(nss-lib, AS_HELP_STRING([--with-nss-lib=PATH],[Network Security Services (NSS) library directory]),
59	[	66	[
60	if test -d "$withval"	67	if test -d "$withval"
61	then	68	then

Lines 18-45 Link Here

(-)a/m4/pcre.m4 (-19 / +14 lines)
18	#	18	#
19	# END COPYRIGHT BLOCK	19	# END COPYRIGHT BLOCK
20		20
21	AC_CHECKING(for pcre)	21	AC_CHECKING(for PCRE)
22		22
23	dnl - check for --with-pcre	23	dnl - check for --with-pcre
24	AC_MSG_CHECKING(for --with-pcre)	24	AC_MSG_CHECKING(for --with-pcre)
25	AC_ARG_WITH(pcre, [ --with-pcre=PATH Perl Compatible Regular Expression directory],	25	AC_ARG_WITH(pcre, AS_HELP_STRING([--with-pcre@<:@=PATH@:>@],[Perl Compatible Regular Expression directory]),
26	[	26	[
27	if test "$withval" = "yes"; then	27	if test "$withval" = "yes"; then
28	AC_MSG_RESULT(yes)	28	AC_MSG_RESULT(yes)
29	dnl - check in system locations	29	elif test "$withval" = "no"; then
30	if test -f "/usr/include/pcre/pcre.h"; then	30	AC_MSG_RESULT(no)
31	pcre_incdir="/usr/include/pcre"	31	AC_MSG_ERROR([PCRE is required.])
32	pcre_inc="-I/usr/include/pcre"
33	pcre_lib='-L$(libdir)'
34	pcre_libdir='$(libdir)'
35	elif test -f "/usr/include/pcre.h"; then
36	pcre_incdir="/usr/include"
37	pcre_inc="-I/usr/include"
38	pcre_lib='-L$(libdir)'
39	pcre_libdir='$(libdir)'
40	else
41	AC_MSG_ERROR([pcre.h not found])
42	fi
43	elif test -d "$withval"/include -a -d "$withval"/lib; then	32	elif test -d "$withval"/include -a -d "$withval"/lib; then
44	AC_MSG_RESULT([using $withval])	33	AC_MSG_RESULT([using $withval])
45	dnl - check the user provided location	34	dnl - check the user provided location
Lines 56-62 AC_ARG_WITH(pcre, [ --with-pcre=PATH Perl Compatible Regular Expression direc Link Here
56	AC_MSG_ERROR([$withval not found])	45	AC_MSG_ERROR([$withval not found])
57	fi	46	fi
58	],	47	],
59	AC_MSG_RESULT(no))	48	AC_MSG_RESULT(yes))
60		49
61	#	50	#
62	# if PCRE is not found yet, try pkg-config	51	# if PCRE is not found yet, try pkg-config
Lines 84-90 dnl last resort Link Here
84	dnl - check in system locations	73	dnl - check in system locations
85	if test -z "$pcre_inc"; then	74	if test -z "$pcre_inc"; then
86	AC_MSG_CHECKING(for pcre.h)	75	AC_MSG_CHECKING(for pcre.h)
87	if test -f "/usr/include/pcre.h"; then	76	if test -f "/usr/include/pcre/pcre.h"; then
		77	AC_MSG_RESULT([using /usr/include/pcre/pcre.h])
		78	pcre_incdir="/usr/include/pcre"
		79	pcre_inc="-I/usr/include/pcre"
		80	pcre_lib='-L$(libdir)'
		81	pcre_libdir='$(libdir)'
		82	elif test -f "/usr/include/pcre.h"; then
88	AC_MSG_RESULT([using /usr/include/pcre.h])	83	AC_MSG_RESULT([using /usr/include/pcre.h])
89	pcre_incdir="/usr/include"	84	pcre_incdir="/usr/include"
90	pcre_inc="-I/usr/include"	85	pcre_inc="-I/usr/include"
Lines 92-97 if test -z "$pcre_inc"; then Link Here
92	pcre_libdir='$(libdir)'	87	pcre_libdir='$(libdir)'
93	else	88	else
94	AC_MSG_RESULT(no)	89	AC_MSG_RESULT(no)
95	AC_MSG_ERROR([pcre not found, specify with --with-pcre.])	90	AC_MSG_ERROR([PCRE not found, specify with --with-pcre.])
96	fi	91	fi
97	fi	92	fi

Lines 27-50 dnl ======================================================== Link Here

(-)a/m4/sasl.m4 (-15 / +10 lines)
27	dnl ========================================================	27	dnl ========================================================
28	dnl = Use the sasl libraries on the system (assuming it exists)	28	dnl = Use the sasl libraries on the system (assuming it exists)
29	dnl ========================================================	29	dnl ========================================================
30	AC_CHECKING(for sasl)	30	AC_CHECKING(for SASL)
31		31
32	AC_MSG_CHECKING(for --with-sasl)	32	AC_MSG_CHECKING(for --with-sasl)
33	AC_ARG_WITH(sasl,	33	AC_ARG_WITH(sasl,
34	[[ --with-sasl=PATH Use sasl from supplied path]],	34	AS_HELP_STRING([--with-sasl@<:@=PATH@:>@],[Use SASL from supplied path]),
35	dnl = Look in the standard system locations	35	dnl = Look in the standard system locations
36	[	36	[
37	if test "$withval" = "yes"; then	37	if test "$withval" = "yes"; then
38	AC_MSG_RESULT(yes)	38	AC_MSG_RESULT(yes)
39		39
40	dnl = Check for sasl.h in the normal locations	40	elif test "$withval" = "no"; then
41	if test -f /usr/include/sasl/sasl.h; then	41	AC_MSG_RESULT(no)
42	sasl_inc="-I/usr/include/sasl"	42	AC_MSG_ERROR([SASL is required.])
43	elif test -f /usr/include/sasl.h; then
44	sasl_inc="-I/usr/include"
45	else
46	AC_MSG_ERROR(sasl.h not found)
47	fi
48		43
49	dnl = Check the user provided location	44	dnl = Check the user provided location
50	elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then	45	elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
Lines 62-75 AC_ARG_WITH(sasl, Link Here
62	sasl_libdir="$withval/lib"	57	sasl_libdir="$withval/lib"
63	else	58	else
64	AC_MSG_RESULT(yes)	59	AC_MSG_RESULT(yes)
65	AC_MSG_ERROR([sasl not found in $withval])	60	AC_MSG_ERROR([SASL not found in $withval])
66	fi	61	fi
67	],	62	],
68	AC_MSG_RESULT(no))	63	AC_MSG_RESULT(yes))
69		64
70	AC_MSG_CHECKING(for --with-sasl-inc)	65	AC_MSG_CHECKING(for --with-sasl-inc)
71	AC_ARG_WITH(sasl-inc,	66	AC_ARG_WITH(sasl-inc,
72	[[ --with-sasl-inc=PATH SASL include file directory]],	67	AS_HELP_STRING([--with-sasl-inc=PATH],[SASL include file directory]),
73	[	68	[
74	if test -f "$withval"/sasl.h; then	69	if test -f "$withval"/sasl.h; then
75	AC_MSG_RESULT([using $withval])	70	AC_MSG_RESULT([using $withval])
Lines 83-89 AC_ARG_WITH(sasl-inc, Link Here
83		78
84	AC_MSG_CHECKING(for --with-sasl-lib)	79	AC_MSG_CHECKING(for --with-sasl-lib)
85	AC_ARG_WITH(sasl-lib,	80	AC_ARG_WITH(sasl-lib,
86	[[ --with-sasl-lib=PATH SASL library directory]],	81	AS_HELP_STRING([--with-sasl-lib=PATH],[SASL library directory]),
87	[	82	[
88	if test -d "$withval"; then	83	if test -d "$withval"; then
89	AC_MSG_RESULT([using $withval])	84	AC_MSG_RESULT([using $withval])
Lines 107-112 if test -z "$sasl_inc"; then Link Here
107	sasl_inc="-I/usr/include"	102	sasl_inc="-I/usr/include"
108	else	103	else
109	AC_MSG_RESULT(no)	104	AC_MSG_RESULT(no)
110	AC_MSG_ERROR([sasl not found, specify with --with-sasl.])	105	AC_MSG_ERROR([SASL not found, specify with --with-sasl.])
111	fi	106	fi
112	fi	107	fi

Lines 22-34 AC_CHECKING(for SELinux) Link Here

(-)a/m4/selinux.m4 (-6 / +10 lines)
22		22
23	# check for --with-selinux	23	# check for --with-selinux
24	AC_MSG_CHECKING(for --with-selinux)	24	AC_MSG_CHECKING(for --with-selinux)
25	AC_ARG_WITH(selinux, [ --with-selinux Build SELinux policy],	25	AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux],[Build SELinux policy]),
26	[	26	[
27	with_selinux=yes	27	if test "$withval" = "no"; then
28	AC_MSG_RESULT(yes)	28	AC_MSG_RESULT(no)
29	AC_SUBST(with_selinux)	29	else
30	if test ! -f "/usr/share/selinux/devel/Makefile"; then	30	with_selinux=yes
31	AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])	31	AC_MSG_RESULT(yes)
		32	AC_SUBST(with_selinux)
		33	if test ! -f "/usr/share/selinux/devel/Makefile"; then
		34	AC_MSG_ERROR([SELinux development tools (selinux-policy) not found])
		35	fi
32	fi	36	fi
33	],	37	],
34	AC_MSG_RESULT(no))	38	AC_MSG_RESULT(no))

Lines 20-41 Link Here

(-)a/m4/svrcore.m4 (-18 / +24 lines)
20	#	20	#
21	# Configure paths for SVRCORE	21	# Configure paths for SVRCORE
22		22
23	AC_CHECKING(for svrcore)	23	AC_CHECKING(for SVRCORE)
24		24
25	AC_MSG_CHECKING(for --with-svrcore)	25	AC_MSG_CHECKING(for --with-svrcore)
26	AC_ARG_WITH(svrcore,	26	AC_ARG_WITH(svrcore,
27	[[ --with-svrcore[=PATH] Use system installed svrcore - optional path for svrcore]],	27	AS_HELP_STRING([--with-svrcore@<:@=PATH@:>@],[Use system installed SVRCORE - optional path for SVRCORE]),
28	dnl = Look in the standard system locations	28	dnl = Look in the standard system locations
29	[	29	[
30	if test "$withval" = "yes"; then	30	if test "$withval" = "yes"; then
31	AC_MSG_RESULT(yes)	31	AC_MSG_RESULT(yes)
32		32
33	dnl = Check for svrcore.h in the normal locations	33	elif test "$withval" = "no"; then
34	if test -f /usr/include/svrcore.h; then	34	AC_MSG_RESULT(no)
35	svrcore_inc="-I/usr/include"	35	AC_MSG_ERROR([SVRCORE is required.])
36	else
37	AC_MSG_ERROR(svrcore.h not found)
38	fi
39		36
40	dnl = Check the user provided location	37	dnl = Check the user provided location
41	elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then	38	elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
Lines 50-63 AC_ARG_WITH(svrcore, Link Here
50	svrcore_lib="-L$withval/lib"	47	svrcore_lib="-L$withval/lib"
51	else	48	else
52	AC_MSG_RESULT(yes)	49	AC_MSG_RESULT(yes)
53	AC_MSG_ERROR([svrcore not found in $withval])	50	AC_MSG_ERROR([SVRCORE not found in $withval])
54	fi	51	fi
55	],	52	],
56	AC_MSG_RESULT(no))	53	AC_MSG_RESULT(yes))
57		54
58	AC_MSG_CHECKING(for --with-svrcore-inc)	55	AC_MSG_CHECKING(for --with-svrcore-inc)
59	AC_ARG_WITH(svrcore-inc,	56	AC_ARG_WITH(svrcore-inc,
60	[[ --with-svrcore-inc=PATH SVRCORE include file directory]],	57	AS_HELP_STRING([--with-svrcore-inc=PATH],[SVRCORE include file directory]),
61	[	58	[
62	if test -f "$withval"/svrcore.h; then	59	if test -f "$withval"/svrcore.h; then
63	AC_MSG_RESULT([using $withval])	60	AC_MSG_RESULT([using $withval])
Lines 71-77 AC_ARG_WITH(svrcore-inc, Link Here
71		68
72	AC_MSG_CHECKING(for --with-svrcore-lib)	69	AC_MSG_CHECKING(for --with-svrcore-lib)
73	AC_ARG_WITH(svrcore-lib,	70	AC_ARG_WITH(svrcore-lib,
74	[[ --with-svrcore-lib=PATH SVRCORE library directory]],	71	AS_HELP_STRING([--with-svrcore-lib=PATH],[SVRCORE library directory]),
75	[	72	[
76	if test -d "$withval"; then	73	if test -d "$withval"; then
77	AC_MSG_RESULT([using $withval])	74	AC_MSG_RESULT([using $withval])
Lines 86-92 AC_ARG_WITH(svrcore-lib, Link Here
86	dnl svrcore not given - look for pkg-config	83	dnl svrcore not given - look for pkg-config
87	if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then	84	if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
88	AC_PATH_PROG(PKG_CONFIG, pkg-config)	85	AC_PATH_PROG(PKG_CONFIG, pkg-config)
89	AC_MSG_CHECKING(for svrcore with pkg-config)	86	AC_MSG_CHECKING(for SVRCORE with pkg-config)
90	if test -n "$PKG_CONFIG"; then	87	if test -n "$PKG_CONFIG"; then
91	if $PKG_CONFIG --exists svrcore; then	88	if $PKG_CONFIG --exists svrcore; then
92	svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`	89	svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore`
Lines 97-114 if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then Link Here
97	fi	94	fi
98		95
99	if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then	96	if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
100	dnl just see if svrcore is already a system library	97	dnl just see if SVRCORE is already a system library
101	AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1],	98	AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1],
102	[], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4])	99	[], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4])
103	if test -n "$havesvrcore" ; then	100	if test -n "$havesvrcore" ; then
104	dnl just see if svrcore is already a system header file	101	dnl just see if SVRCORE is already a system header file
105	save_cppflags="$CPPFLAGS"	102	save_cppflags="$CPPFLAGS"
106	CPPFLAGS="$nss_inc $nspr_inc"	103	CPPFLAGS="$nss_inc $nspr_inc"
107	AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=])	104	AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=])
108	CPPFLAGS="$save_cppflags"	105	CPPFLAGS="$save_cppflags"
109	fi	106	fi
110	dnl for svrcore to be present, both the library and the header must exist	107	dnl for SVRCORE to be present, both the library and the header must exist
111	if test -z "$havesvrcore" ; then	108	if test -z "$havesvrcore" ; then
112	AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.])	109	AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.])
		110	fi
		111	fi
		112
		113	dnl = Check for svrcore.h in the normal locations
		114	if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then
		115	if test -f /usr/include/svrcore.h; then
		116	svrcore_inc="-I/usr/include"
		117	svrcore_lib="-L/usr/lib"
		118	else
		119	AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.])
113	fi	120	fi
114	fi	121	fi
115	-