Attachment 157558 Details for Bug 245208 – diffs

[patch] diffs

cvsdiffs (text/plain), 6.51 KB, created by Rich Megginson on 2007-06-21 17:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-21 17:38:50 UTC

Size: 6.51 KB

patch

obsolete

>Index: adminutil/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminutil/Makefile.am,v
>retrieving revision 1.4
>diff -u -8 -r1.4 Makefile.am
>--- adminutil/Makefile.am	25 May 2007 22:55:54 -0000	1.4
>+++ adminutil/Makefile.am	21 Jun 2007 17:33:24 -0000
>@@ -1,11 +1,14 @@
> # look for included m4 files in the ./m4/ directory
> ACLOCAL_AMFLAGS = -I m4
> 
>+LIBCSTD=@LIBCSTD@
>+LIBCRUN=@LIBCRUN@
>+
> #------------------------
> # Compiler Flags
> #------------------------
> BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
> PLATFORM_DEFINES = @platform_defs@
> DEBUG_DEFINES = @debug_defs@
> ADMINUTIL_DEFINES = -DADMSDK_BUILDNUM=$(BUILDNUM) -DPROPERTYDIR="\"$(pkgdatadir)\"" -DNET_SSL
> ADMINUTIL_INCLUDES = -I$(srcdir)/include
>@@ -15,24 +18,32 @@
> # Linker Flags
> #------------------------
> 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
>+ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata $(LIBCSTD) $(LIBCRUN)
> 
> #------------------------
> # Build Products
> #------------------------
> lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
> pkgdata_DATA = root.res en.res en_US.res
> 
>+# this is just a dummy to make automake define
>+# the CXXLINK macro
>+if CXXLINK_REQUIRED
>+noinst_PROGRAMS = dummy
>+dummy_SOURCES = lib/dummy.cpp
>+dummy_LINK = $(CXXLINK)
>+endif
>+
> if enable_tests
> check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
> 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
>@@ -109,23 +120,29 @@
> 	lib/libadminutil/resource.c \
> 	lib/libadminutil/srvutil.c \
> 	lib/libadminutil/strlist.c \
> 	lib/libadminutil/uginfo.c
> 
> libadminutil_la_CPPFLAGS =  $(AM_CPPFLAGS) @nspr_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
>+libadminutil_la_LINK = $(CXXLINK)
>+endif
> 
> #------------------------
> # libadmsslutil
> #------------------------
> libadmsslutil_la_SOURCES = lib/libadmsslutil/admsslutil.c \
> 	lib/libadmsslutil/certmgt.c \
> 	lib/libadmsslutil/psetcssl.c \
> 	lib/libadmsslutil/secpwd.c \
> 	lib/libadmsslutil/srvutilssl.c \
> 	lib/libadmsslutil/sslerror.c \
> 	lib/libadmsslutil/uginfossl.c
> 
> libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
> libadmsslutil_la_LIBADD = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
> libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
>+if CXXLINK_REQUIRED
>+libadmsslutil_la_LINK = $(CXXLINK)
>+endif
>Index: adminutil/autogen.sh
>===================================================================
>RCS file: /cvs/dirsec/adminutil/autogen.sh,v
>retrieving revision 1.1
>diff -u -8 -r1.1 autogen.sh
>--- adminutil/autogen.sh	30 Oct 2006 19:25:16 -0000	1.1
>+++ adminutil/autogen.sh	21 Jun 2007 17:33:25 -0000
>@@ -28,16 +28,19 @@
> * )
>     echo "Found autoconf version $AC_VERSION"
>     ;;
> esac
> 
> # Check automake version
> AM_VERSION=`automake --version | grep '^automake' | sed 's/.*) *//'`
> case $AM_VERSION in
>+1.1*)
>+    echo "Found automake version $AM_VERSION"
>+    ;; # ok
> '' | 0.* | 1.[0-8]* | 1.9.[0-1]* )
>     echo "You must have automake version 1.9.2 or later installed (found version $AM_VERSION)."
>     exit 1
>     ;;
> * )
>     echo "Found automake version $AM_VERSION"
>     ;;
> esac
>Index: adminutil/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminutil/configure.ac,v
>retrieving revision 1.4
>diff -u -8 -r1.4 configure.ac
>--- adminutil/configure.ac	25 May 2007 22:55:54 -0000	1.4
>+++ adminutil/configure.ac	21 Jun 2007 17:33:25 -0000
>@@ -40,16 +40,17 @@
> AC_FUNC_MMAP
> AC_TYPE_SIGNAL
> AC_FUNC_STAT
> AC_FUNC_STRERROR_R
> AC_FUNC_STRFTIME
> AC_FUNC_VPRINTF
> AC_CHECK_FUNCS([setrlimit endpwent ftruncate getcwd gethostbyname inet_ntoa localtime_r memmove memset mkdir munmap putenv rmdir socket strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
> 
>+CXXLINK_REQUIRED=0
> # Deal with platform dependent defines
> case $host in
>   *-*-linux*)
>     platform_defs="-DXP_UNIX"
>     platform="linux"
>     ;;
>   ia64-hp-hpux*)
>     platform_defs="-DXP_UNIX"
>@@ -57,23 +58,30 @@
>     ;;
>   hppa*-hp-hpux*)
>     platform_defs="-DXP_UNIX"
>     platform="hpux"
>     ;;
>   sparc-sun-solaris*)
>     platform_defs="-DXP_UNIX"
>     platform="solaris"
>+dnl Cstd and Crun are required to link any C++ related code (ICU)
>+    LIBCSTD=-lCstd
>+    AC_SUBST([LIBCSTD], [$LIBCSTD])
>+    LIBCRUN=-lCrun
>+    AC_SUBST([LIBCRUN], [$LIBCRUN])
>+    CXXLINK_REQUIRED=1
>     ;;
>   *)
>     platform_defs=""
>     platform=""
>     ;;
> esac
> AC_SUBST([platform_defs])
>+AM_CONDITIONAL(CXXLINK_REQUIRED,test "$CXXLINK_REQUIRED" = 1)
> 
> AC_MSG_CHECKING(for --enable-debug)
> AC_ARG_ENABLE(debug,
>               AS_HELP_STRING([--enable-debug], [Enable debug features]),
> [
>   AC_MSG_RESULT(yes)
>   debug_defs="-DLDAP_DEBUG"
> ],
>Index: adminutil/m4/mozldap.m4
>===================================================================
>RCS file: /cvs/dirsec/adminutil/m4/mozldap.m4,v
>retrieving revision 1.2
>diff -u -8 -r1.2 mozldap.m4
>--- adminutil/m4/mozldap.m4	4 Apr 2007 19:37:41 -0000	1.2
>+++ adminutil/m4/mozldap.m4	21 Jun 2007 17:33:25 -0000
>@@ -71,20 +71,20 @@
> 
> # if LDAPSDK is not found yet, try pkg-config
> 
> # last resort
> if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir"; 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
>-      ldapsdk_name=mozldap
>-    elif $PKG_CONFIG --exists mozldap6; then
>+    if $PKG_CONFIG --exists mozldap6; then
>       ldapsdk_name=mozldap6
>+    elif $PKG_CONFIG --exists mozldap; then
>+      ldapsdk_name=mozldap
>     else
>       AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
>     fi
>     ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $ldapsdk_name`
>     ldapsdk_lib=`$PKG_CONFIG --libs-only-L $ldapsdk_name`
>     ldapsdk_libdir=`$PKG_CONFIG --libs-only-L $ldapsdk_name | sed -e s/-L// | sed -e s/\ *$//`
>     AC_MSG_RESULT([using system $ldapsdk_name])
>   fi

Actions: View | Diff

Attachments on bug 245208: 157558 | 157576 | 157585