Makefile.am | 2 +- Makefile.in | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)

New commits: commit ba2039806adc68c578f2f1311bf72d5ae5e9bf11 Author: Rich Megginson rmeggins@redhat.com Date: Fri Oct 22 15:00:47 2010 -0600

version 1.1.13 - add nss_inc to includes for libadminutil sources

with openldap support, admutil.c includes ssl.h - so we need to include the nss_inc directory when building

diff --git a/Makefile.am b/Makefile.am index b9e2996..a927143 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,7 @@ libadminutil_la_SOURCES = lib/libadminutil/acclanglist.c \ lib/libadminutil/strlist.c \ lib/libadminutil/uginfo.c

-libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @openldap_inc@ @ldapsdk_inc@ @icu_inc@ +libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @openldap_inc@ @ldapsdk_inc@ @icu_inc@ libadminutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION)) if CXXLINK_REQUIRED diff --git a/Makefile.in b/Makefile.in index e333ec0..ab945bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -405,7 +405,7 @@ libadminutil_la_SOURCES = lib/libadminutil/acclanglist.c \ lib/libadminutil/strlist.c \ lib/libadminutil/uginfo.c

-libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @openldap_inc@ @ldapsdk_inc@ @icu_inc@ +libadminutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nss_inc@ @nspr_inc@ @openldap_inc@ @ldapsdk_inc@ @icu_inc@ libadminutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK) libadminutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION)) @CXXLINK_REQUIRED_FALSE@libadminutil_la_LINK = $(LINK) diff --git a/configure b/configure index 53a7edd..75a9028 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for 389-adminutil 1.1.12. +# Generated by GNU Autoconf 2.59 for 389-adminutil 1.1.13. # # Report bugs to http://bugzilla.redhat.com/. # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='389-adminutil' PACKAGE_TARNAME='389-adminutil' -PACKAGE_VERSION='1.1.12' -PACKAGE_STRING='389-adminutil 1.1.12' +PACKAGE_VERSION='1.1.13' +PACKAGE_STRING='389-adminutil 1.1.13' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'

# Factoring default headers for most tests. @@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures 389-adminutil 1.1.12 to adapt to many kinds of systems. +`configure' configures 389-adminutil 1.1.13 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1020,7 +1020,7 @@ fi

if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of 389-adminutil 1.1.12:";; + short | recursive ) echo "Configuration of 389-adminutil 1.1.13:";; esac cat <<_ACEOF

@@ -1189,7 +1189,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<_ACEOF -389-adminutil configure 1.1.12 +389-adminutil configure 1.1.13 generated by GNU Autoconf 2.59

Copyright (C) 2003 Free Software Foundation, Inc. @@ -1203,7 +1203,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake.

-It was created by 389-adminutil $as_me 1.1.12, which was +It was created by 389-adminutil $as_me 1.1.13, which was generated by GNU Autoconf 2.59. Invocation command line was

$ $0 $@ @@ -1846,7 +1846,7 @@ fi

# Define the identity of the package. PACKAGE='389-adminutil' - VERSION='1.1.12' + VERSION='1.1.13'

cat >>confdefs.h <<_ACEOF @@ -25069,7 +25069,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF

-This file was extended by 389-adminutil $as_me 1.1.12, which was +This file was extended by 389-adminutil $as_me 1.1.13, which was generated by GNU Autoconf 2.59. Invocation command line was

CONFIG_FILES = $CONFIG_FILES @@ -25127,7 +25127,7 @@ _ACEOF

cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\ -389-adminutil config.status 1.1.12 +389-adminutil config.status 1.1.13 configured by $0, generated by GNU Autoconf 2.59, with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\"

diff --git a/configure.ac b/configure.ac index e84aa0f..fe806cf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([389-adminutil], [1.1.12], [http://bugzilla.redhat.com/]) +AC_INIT([389-adminutil], [1.1.13], [http://bugzilla.redhat.com/]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) AM_MAINTAINER_MODE AC_CANONICAL_HOST