[Fedora-directory-commits] adminutil Makefile.am, 1.3, 1.4 Makefile.in, 1.4, 1.5 adminutil.spec, 1.5, 1.6 configure, 1.4, 1.5 configure.ac, 1.3, 1.4 aclocal.m4, 1.4, 1.5 missing, 1.3, 1.4 install-sh, 1.3, 1.4 depcomp, 1.3, 1.4 config.guess, 1.3, 1.4 compile, 1.3, 1.4 config.sub, 1.3, 1.4
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri May 25 22:55:57 UTC 2007
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8401/adminutil
Modified Files:
Makefile.am Makefile.in adminutil.spec configure configure.ac
aclocal.m4 missing install-sh depcomp config.guess compile
config.sub
Log Message:
Resolves: bug 235293
Bug Description: Review Request: adminutil - Utility library for Fedora Directory Server administration
Fix Description:
1) Use macros consistently in the spec file
2) Use install -p to ensure header file timestamps are preserved
3) Fixed acclanglist.c to use LGPL
4) Link admsslutil against adminutil to resolve undefined symbols
5) Check for genrb in icu.m4
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 17 May 2007 19:25:12 -0000 1.3
+++ Makefile.am 25 May 2007 22:55:54 -0000 1.4
@@ -17,7 +17,9 @@
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
+if enable_tests
SASL_LINK = @sasl_lib@ -lsasl2
+endif
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
#------------------------
@@ -26,6 +28,7 @@
lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
pkgdata_DATA = root.res en.res en_US.res
+if enable_tests
check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
@@ -51,6 +54,7 @@
psetwrite_SOURCES = tests/psetwrite.c
psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
psetwrite_LDADD = $(TEST_LDADD)
+endif
#------------------------
# Installed Files
@@ -123,5 +127,5 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 17 May 2007 19:25:12 -0000 1.4
+++ Makefile.in 25 May 2007 22:55:54 -0000 1.5
@@ -37,8 +37,9 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-check_PROGRAMS = retrieveSIE$(EXEEXT) retrieveSIEssl$(EXEEXT) \
- psetread$(EXEEXT) psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
+ at enable_tests_TRUE@check_PROGRAMS = retrieveSIE$(EXEEXT) \
+ at enable_tests_TRUE@ retrieveSIEssl$(EXEEXT) psetread$(EXEEXT) \
+ at enable_tests_TRUE@ psetreadssl$(EXEEXT) psetwrite$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/adminutil.pc.in \
$(top_srcdir)/configure \
@@ -84,7 +85,7 @@
lib/libadminutil/libadminutil_la-strlist.lo \
lib/libadminutil/libadminutil_la-uginfo.lo
libadminutil_la_OBJECTS = $(am_libadminutil_la_OBJECTS)
-libadmsslutil_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+libadmsslutil_la_DEPENDENCIES = libadminutil.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libadmsslutil_la_OBJECTS = \
@@ -96,26 +97,35 @@
lib/libadmsslutil/libadmsslutil_la-sslerror.lo \
lib/libadmsslutil/libadmsslutil_la-uginfossl.lo
libadmsslutil_la_OBJECTS = $(am_libadmsslutil_la_OBJECTS)
-am_psetread_OBJECTS = tests/psetread-psetread.$(OBJEXT)
+am__psetread_SOURCES_DIST = tests/psetread.c
+ at enable_tests_TRUE@am_psetread_OBJECTS = \
+ at enable_tests_TRUE@ tests/psetread-psetread.$(OBJEXT)
psetread_OBJECTS = $(am_psetread_OBJECTS)
-am__DEPENDENCIES_2 = libadmsslutil.la libadminutil.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-psetread_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_psetreadssl_OBJECTS = tests/psetreadssl-psetreadssl.$(OBJEXT)
+ at enable_tests_TRUE@am__DEPENDENCIES_2 = libadmsslutil.la \
+ at enable_tests_TRUE@ libadminutil.la $(am__DEPENDENCIES_1) \
+ at enable_tests_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ at enable_tests_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at enable_tests_TRUE@psetread_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__psetreadssl_SOURCES_DIST = tests/psetreadssl.c
+ at enable_tests_TRUE@am_psetreadssl_OBJECTS = \
+ at enable_tests_TRUE@ tests/psetreadssl-psetreadssl.$(OBJEXT)
psetreadssl_OBJECTS = $(am_psetreadssl_OBJECTS)
-psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_psetwrite_OBJECTS = tests/psetwrite-psetwrite.$(OBJEXT)
+ at enable_tests_TRUE@psetreadssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__psetwrite_SOURCES_DIST = tests/psetwrite.c
+ at enable_tests_TRUE@am_psetwrite_OBJECTS = \
+ at enable_tests_TRUE@ tests/psetwrite-psetwrite.$(OBJEXT)
psetwrite_OBJECTS = $(am_psetwrite_OBJECTS)
-psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_retrieveSIE_OBJECTS = tests/retrieveSIE-retrieveSIE.$(OBJEXT)
+ at enable_tests_TRUE@psetwrite_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__retrieveSIE_SOURCES_DIST = tests/retrieveSIE.c
+ at enable_tests_TRUE@am_retrieveSIE_OBJECTS = \
+ at enable_tests_TRUE@ tests/retrieveSIE-retrieveSIE.$(OBJEXT)
retrieveSIE_OBJECTS = $(am_retrieveSIE_OBJECTS)
-retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_retrieveSIEssl_OBJECTS = \
- tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT)
+ at enable_tests_TRUE@retrieveSIE_DEPENDENCIES = $(am__DEPENDENCIES_2)
+am__retrieveSIEssl_SOURCES_DIST = tests/retrieveSIEssl.c
+ at enable_tests_TRUE@am_retrieveSIEssl_OBJECTS = tests/retrieveSIEssl-retrieveSIEssl.$(OBJEXT)
retrieveSIEssl_OBJECTS = $(am_retrieveSIEssl_OBJECTS)
-retrieveSIEssl_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ at enable_tests_TRUE@retrieveSIEssl_DEPENDENCIES = \
+ at enable_tests_TRUE@ $(am__DEPENDENCIES_2)
DEFAULT_INCLUDES = -I. -I$(srcdir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -132,9 +142,9 @@
$(psetwrite_SOURCES) $(retrieveSIE_SOURCES) \
$(retrieveSIEssl_SOURCES)
DIST_SOURCES = $(libadminutil_la_SOURCES) $(libadmsslutil_la_SOURCES) \
- $(psetread_SOURCES) $(psetreadssl_SOURCES) \
- $(psetwrite_SOURCES) $(retrieveSIE_SOURCES) \
- $(retrieveSIEssl_SOURCES)
+ $(am__psetread_SOURCES_DIST) $(am__psetreadssl_SOURCES_DIST) \
+ $(am__psetwrite_SOURCES_DIST) $(am__retrieveSIE_SOURCES_DIST) \
+ $(am__retrieveSIEssl_SOURCES_DIST)
adminincDATA_INSTALL = $(INSTALL_DATA)
admsslincDATA_INSTALL = $(INSTALL_DATA)
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
@@ -238,6 +248,8 @@
build_vendor = @build_vendor@
datadir = @datadir@
debug_defs = @debug_defs@
+enable_tests_FALSE = @enable_tests_FALSE@
+enable_tests_TRUE = @enable_tests_TRUE@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -295,7 +307,7 @@
NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
-SASL_LINK = @sasl_lib@ -lsasl2
+ at enable_tests_TRUE@SASL_LINK = @sasl_lib@ -lsasl2
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
#------------------------
@@ -303,24 +315,24 @@
#------------------------
lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
pkgdata_DATA = root.res en.res en_US.res
-TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
-TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
-retrieveSIE_SOURCES = tests/retrieveSIE.c
-retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
-retrieveSIE_LDADD = $(TEST_LDADD)
-retrieveSIEssl_SOURCES = tests/retrieveSIEssl.c
-retrieveSIEssl_CPPFLAGS = $(TEST_CPPFLAGS)
-retrieveSIEssl_LDADD = $(TEST_LDADD)
-psetread_SOURCES = tests/psetread.c
-psetread_CPPFLAGS = $(TEST_CPPFLAGS)
-psetread_LDADD = $(TEST_LDADD)
-psetreadssl_SOURCES = tests/psetreadssl.c
-psetreadssl_CPPFLAGS = $(TEST_CPPFLAGS)
-psetreadssl_LDADD = $(TEST_LDADD)
-psetwrite_SOURCES = tests/psetwrite.c
-psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
-psetwrite_LDADD = $(TEST_LDADD)
+ at enable_tests_TRUE@TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
+ at enable_tests_TRUE@TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+ at enable_tests_TRUE@TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+ at enable_tests_TRUE@retrieveSIE_SOURCES = tests/retrieveSIE.c
+ at enable_tests_TRUE@retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
+ at enable_tests_TRUE@retrieveSIE_LDADD = $(TEST_LDADD)
+ at enable_tests_TRUE@retrieveSIEssl_SOURCES = tests/retrieveSIEssl.c
+ at enable_tests_TRUE@retrieveSIEssl_CPPFLAGS = $(TEST_CPPFLAGS)
+ at enable_tests_TRUE@retrieveSIEssl_LDADD = $(TEST_LDADD)
+ at enable_tests_TRUE@psetread_SOURCES = tests/psetread.c
+ at enable_tests_TRUE@psetread_CPPFLAGS = $(TEST_CPPFLAGS)
+ at enable_tests_TRUE@psetread_LDADD = $(TEST_LDADD)
+ at enable_tests_TRUE@psetreadssl_SOURCES = tests/psetreadssl.c
+ at enable_tests_TRUE@psetreadssl_CPPFLAGS = $(TEST_CPPFLAGS)
+ at enable_tests_TRUE@psetreadssl_LDADD = $(TEST_LDADD)
+ at enable_tests_TRUE@psetwrite_SOURCES = tests/psetwrite.c
+ at enable_tests_TRUE@psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
+ at enable_tests_TRUE@psetwrite_LDADD = $(TEST_LDADD)
#------------------------
# Installed Files
@@ -380,7 +392,7 @@
lib/libadmsslutil/uginfossl.c
libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
-libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
+libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
all: all-am
Index: adminutil.spec
===================================================================
RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- adminutil.spec 23 May 2007 13:56:01 -0000 1.5
+++ adminutil.spec 25 May 2007 22:55:54 -0000 1.6
@@ -7,7 +7,7 @@
Summary: Utility library for directory server administration
Name: adminutil
Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
@@ -35,16 +35,15 @@
well as resource handling (ICU ures API).
%package devel
-Summary: Development and header files for %{name}
-Group: Development/Libraries
+Summary: Development and header files for %{name}
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-BuildRequires: nspr-devel >= %{nspr_version}
-BuildRequires: nss-devel >= %{nss_version}
-BuildRequires: svrcore-devel >= %{svrcore_version}
-BuildRequires: mozldap-devel >= %{mozldap_version}
-BuildRequires: libicu-devel >= %{icu_version}
-BuildRequires: icu >= %{icu_version}
+Requires: pkgconfig
+Requires: nspr-devel >= %{nspr_version}
+Requires: nss-devel >= %{nss_version}
+Requires: svrcore-devel >= %{svrcore_version}
+Requires: mozldap-devel >= %{mozldap_version}
+Requires: libicu-devel >= %{icu_version}
%description devel
Development files and header files necessary to build applications
@@ -55,15 +54,15 @@
%build
-%configure
-make
+%configure --disable-tests
+%{__make} %{?_smp_mflags}
%install
%{__rm} -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -85,6 +84,12 @@
%{_includedir}/libadmsslutil
%changelog
+* Wed May 23 2007 Rich Megginson <rmeggins at redhat.com> - 1.1.1-3
+- more fedora review stuff - use macros consistently
+- make sure install preserves timestamps
+- use lgpl instead of gpl for acclanglist.c
+- fix undefined weak symbols in libadmsslutil
+
* Fri May 18 2007 Rich Megginson <rmeggins at redhat.com> - 1.1.1-2
- pkgconfig is a requires not a build requires
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure 17 May 2007 19:25:12 -0000 1.4
+++ configure 25 May 2007 22:55:54 -0000 1.5
@@ -465,7 +465,7 @@
#endif"
ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs debug_defs PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS platform_defs debug_defs enable_tests_TRUE enable_tests_FALSE PKG_CONFIG ICU_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir sasl_inc sasl_lib icu_inc icu_lib icu_libdir icu_bin WINNT_TRUE WINNT_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1038,7 +1038,8 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-debug Enable debug features
+ --enable-debug Enable debug features
+ --enable-tests Enable tests to be built (default: yes)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -4285,7 +4286,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4288 "configure"' > conftest.$ac_ext
+ echo '#line 4289 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5420,7 +5421,7 @@
# Provide some information about the compiler.
-echo "$as_me:5423:" \
+echo "$as_me:5424:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6483,11 +6484,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6486: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6490: \$? = $ac_status" >&5
+ echo "$as_me:6491: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6751,11 +6752,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6754: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6758: \$? = $ac_status" >&5
+ echo "$as_me:6759: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6855,11 +6856,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6858: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6859: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6862: \$? = $ac_status" >&5
+ echo "$as_me:6863: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8324,7 +8325,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8327 "configure"' > conftest.$ac_ext
+ echo '#line 8328 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9221,7 +9222,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9224 "configure"
+#line 9225 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9321,7 +9322,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9324 "configure"
+#line 9325 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11664,11 +11665,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11667: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11668: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11671: \$? = $ac_status" >&5
+ echo "$as_me:11672: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11768,11 +11769,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11771: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11775: \$? = $ac_status" >&5
+ echo "$as_me:11776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12304,7 +12305,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12307 "configure"' > conftest.$ac_ext
+ echo '#line 12308 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13362,11 +13363,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13366: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13369: \$? = $ac_status" >&5
+ echo "$as_me:13370: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13466,11 +13467,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13473: \$? = $ac_status" >&5
+ echo "$as_me:13474: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14915,7 +14916,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14918 "configure"' > conftest.$ac_ext
+ echo '#line 14919 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15693,11 +15694,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15696: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15700: \$? = $ac_status" >&5
+ echo "$as_me:15701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15961,11 +15962,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15964: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15968: \$? = $ac_status" >&5
+ echo "$as_me:15969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16065,11 +16066,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16068: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16069: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16072: \$? = $ac_status" >&5
+ echo "$as_me:16073: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17534,7 +17535,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17537 "configure"' > conftest.$ac_ext
+ echo '#line 17538 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22888,6 +22889,34 @@
fi;
+if test -z "$enable_tests" ; then
+ enable_tests=yes # default is on - --disable-tests to disable
+fi
+echo "$as_me:$LINENO: checking for --enable-tests" >&5
+echo $ECHO_N "checking for --enable-tests... $ECHO_C" >&6
+# Check whether --enable-tests or --disable-tests was given.
+if test "${enable_tests+set}" = set; then
+ enableval="$enable_tests"
+
+fi;
+if test "$enable_tests" = "yes" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+if test "$enable_tests" = "yes"; then
+ enable_tests_TRUE=
+ enable_tests_FALSE='#'
+else
+ enable_tests_TRUE='#'
+ enable_tests_FALSE=
+fi
+
+
# BEGIN COPYRIGHT BLOCK
@@ -23465,6 +23494,7 @@
{ (exit 1); exit 1; }; }
fi
+if test "$enable_tests" = "yes" ; then
# -*- tab-width: 4; -*-
# Configure paths for SASL
# Public domain - Nathan Kinder <nkinder at redhat.com> 2006-06-26
@@ -23590,6 +23620,7 @@
fi
fi
+fi
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -23776,6 +23807,12 @@
fi
fi
+if test ! -f "$icu_bin/genrb" ; then
+ { { echo "$as_me:$LINENO: error: genrb not found in $icu_bin - please specify ICU bin directory" >&5
+echo "$as_me: error: genrb not found in $icu_bin - please specify ICU bin directory" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
# All rights reserved.
@@ -24020,6 +24057,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${enable_tests_TRUE}" && test -z "${enable_tests_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"enable_tests\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"enable_tests\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${WINNT_TRUE}" && test -z "${WINNT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"WINNT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -24626,6 +24670,8 @@
s, at LIBOBJS@,$LIBOBJS,;t t
s, at platform_defs@,$platform_defs,;t t
s, at debug_defs@,$debug_defs,;t t
+s, at enable_tests_TRUE@,$enable_tests_TRUE,;t t
+s, at enable_tests_FALSE@,$enable_tests_FALSE,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
s, at ICU_CONFIG@,$ICU_CONFIG,;t t
s, at nspr_inc@,$nspr_inc,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.ac 8 May 2007 19:25:45 -0000 1.3
+++ configure.ac 25 May 2007 22:55:54 -0000 1.4
@@ -71,7 +71,8 @@
AC_SUBST([platform_defs])
AC_MSG_CHECKING(for --enable-debug)
-AC_ARG_ENABLE(debug, [ --enable-debug Enable debug features],
+AC_ARG_ENABLE(debug,
+ AS_HELP_STRING([--enable-debug], [Enable debug features]),
[
AC_MSG_RESULT(yes)
debug_defs="-DLDAP_DEBUG"
@@ -82,12 +83,27 @@
])
AC_SUBST([debug_defs])
+if test -z "$enable_tests" ; then
+ enable_tests=yes # default is on - --disable-tests to disable
+fi
+AC_MSG_CHECKING(for --enable-tests)
+AC_ARG_ENABLE(tests,
+ AS_HELP_STRING([--enable-tests], [Enable tests to be built (default: yes)]))
+if test "$enable_tests" = "yes" ; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(enable_tests,test "$enable_tests" = "yes")
+
AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
m4_include(m4/mozldap.m4)
+if test "$enable_tests" = "yes" ; then
m4_include(m4/sasl.m4)
+fi
m4_include(m4/icu.m4)
m4_include(m4/fhs.m4)
More information about the Fedora-directory-commits
mailing list