[Fedora-directory-commits] setuputil Makefile.am, 1.1, 1.2 configure.ac, 1.2, 1.3 autogen.sh, 1.1, 1.2

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808

Modified Files:
	Makefile.am configure.ac autogen.sh 
Log Message:
Resolves: #236059
Summary: Port setuputil onto HP-UX (comment #1)
configure.ac: Introduced --enable-64bit for HP (just adding -DHPUX_64 flag for
HP-UX)
Makefile.am: Added $(SASL_LINK) to the link command line for libdsinstall.so
autogen.sh: Upgraded automake version from 1.9.2 to 1.9.6, which is needed to
generate the proper link command line on HP-UX.  With 1.9.2, it generates
'$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
which is not appropriate to build a shared library from C++ code on HP.  1.9.6
has fixed the problem and it generates this link command:
'$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects
$libobjs $deplibs $postdep_objects $compiler_flags'



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/setuputil/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	5 Apr 2007 01:51:28 -0000	1.1
+++ Makefile.am	16 Apr 2007 23:48:16 -0000	1.2
@@ -101,8 +101,9 @@
     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)
 
 #////////////////////////////////////////////////////////////////
 #
@@ -146,7 +147,6 @@
 	-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' \


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/setuputil/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.ac	9 Apr 2007 22:13:37 -0000	1.2
+++ configure.ac	16 Apr 2007 23:48:16 -0000	1.3
@@ -53,6 +53,15 @@
 ])
 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)
@@ -67,12 +76,20 @@
     # relative to sysconfdir
     ;;
   ia64-hp-hpux*)
-    platform_defs="-DXP_UNIX -DHPUX"
+    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*)
-    platform_defs="-DXP_UNIX -DHPUX"
+    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*)


Index: autogen.sh
===================================================================
RCS file: /cvs/dirsec/setuputil/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autogen.sh	5 Apr 2007 01:53:36 -0000	1.1
+++ autogen.sh	16 Apr 2007 23:48:16 -0000	1.2
@@ -33,8 +33,8 @@
 # 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
     ;;
 * )