Attachment 152585 Details for Bug 236059 – cvs diff configure.ac Makefile.am autogen.sh

[patch] cvs diff configure.ac Makefile.am autogen.sh

setuputil.diffs (text/plain), 3.09 KB, created by Noriko Hosoi on 2007-04-13 20:23:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-04-13 20:23:19 UTC

Size: 3.09 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /cvs/dirsec/setuputil/configure.ac,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 configure.ac
>--- configure.ac	9 Apr 2007 22:13:37 -0000	1.2
>+++ configure.ac	13 Apr 2007 20:05:14 -0000
>@@ -52,8 +52,17 @@
>   debug_defs=""
> ])
> AC_SUBST([debug_defs])
> 
>+AC_MSG_CHECKING(for --enable-64bit)
>+AC_ARG_ENABLE(64bit, AS_HELP_STRING([--enable-64bit], [Enable 64-bit flag (effective on HP-UX only) (default: no)]),
>+[
>+  AC_MSG_RESULT(yes)
>+],
>+[
>+  AC_MSG_RESULT(no)
>+])
>+
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> AM_CONDITIONAL([WINNT], false)
> 
>@@ -66,14 +75,22 @@
>         platform_libs=""
>     # relative to sysconfdir
>     ;;
>   ia64-hp-hpux*)
>+    if test "$enable_64bit" = "yes"; then
>+      platform_defs="-DXP_UNIX -DHPUX -DHPUX_64"
>+        else
>     platform_defs="-DXP_UNIX -DHPUX"
>+        fi
>     platform="hpux"
>         platform_libs=""
>     ;;
>   hppa*-hp-hpux*)
>+    if test "$enable_64bit" = "yes"; then
>+      platform_defs="-DXP_UNIX -DHPUX -DHPUX_64"
>+    else
>     platform_defs="-DXP_UNIX -DHPUX"
>+    fi
>     platform="hpux"
>     ;;
>   sparc-sun-solaris*)
>     platform_defs="-DXP_UNIX -DSOLARIS"
>Index: Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/setuputil/Makefile.am,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 Makefile.am
>--- Makefile.am	5 Apr 2007 01:51:28 -0000	1.1
>+++ Makefile.am	13 Apr 2007 20:05:14 -0000
>@@ -100,10 +100,11 @@
>     installer/unix/lib/dialog.cc \
>     installer/unix/lib/ux-wrapper.cc
> 
> libdsinstall_la_CPPFLAGS = $(SETUPUTIL_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-libdsinstall_la_LIBADD = $(LDAPSDK_LINK) 
>+libdsinstall_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK)
> libdsinstall_la_LDFLAGS = -version-info 1:0:0
>+libdsinstall_la_LINK = $(CXXLINK)
> 
> #////////////////////////////////////////////////////////////////
> #
> #   Programs
>@@ -145,9 +146,8 @@
> fixupcmd = sed \
>         -e 's,@prefix\@,$(prefix),g' \
>         -e 's,@exec_prefix\@,$(exec_prefix),g' \
>         -e 's,@bindir\@,$(bindir),g' \
>-        -e 's,@bindir\@,$(bindir),g' \
>         -e 's,@sbindir\@,$(sbindir),g' \
>         -e 's,@libdir\@,$(libdir),g' \
>         -e 's,@includedir\@,$(includedir),g' \
>         -e 's,@nspr_libdir\@,$(nspr_libdir),g' \
>Index: autogen.sh
>===================================================================
>RCS file: /cvs/dirsec/setuputil/autogen.sh,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 autogen.sh
>--- autogen.sh	5 Apr 2007 01:53:36 -0000	1.1
>+++ autogen.sh	13 Apr 2007 20:05:14 -0000
>@@ -32,10 +32,10 @@
> 
> # Check automake version
> AM_VERSION=`automake --version | grep '^automake' | sed 's/.*) *//'`
> case $AM_VERSION in
>-'' | 0.* | 1.[0-8]* | 1.9.[0-1]* )
>-    echo "You must have automake version 1.9.2 or later installed (found version $AM_VERSION)."
>+'' | 0.* | 1.[0-8]* | 1.9.[0-5]* )
>+    echo "You must have automake version 1.9.6 or later installed (found version $AM_VERSION)."
>     exit 1
>     ;;
> * )
>     echo "Found automake version $AM_VERSION"

Actions: View | Diff

Attachments on bug 236059: 152585 | 152586 | 152588 | 152728