OSSP CVS Repository

ossp - Check-in [598]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 598
Date: 2001-Aug-02 16:56:13 (local)
2001-Aug-02 14:56:13 (UTC)
User:simons
Branch:
Comment: Build modules that need 64-bit support only if 64-bit data types have been found!
Tickets:
Inspections:
Files:
ossp-pkg/xds/Makefile.in      1.13 -> 1.14     20 inserted, 20 deleted
ossp-pkg/xds/configure.ac      1.11 -> 1.12     10 inserted, 1 deleted

ossp-pkg/xds/Makefile.in 1.13 -> 1.14

--- Makefile.in  2001/08/02 10:54:27     1.13
+++ Makefile.in  2001/08/02 14:56:13     1.14
@@ -1,28 +1,28 @@
 # Build libxds.
 
-CC              = @CC@
-AR              = ar
-RANLIB          = @RANLIB@
+CC              = @CC@
+AR              = ar
+RANLIB          = @RANLIB@
 
-CPPFLAGS        = @CPPFLAGS@ @DEFS@ -D_GNU_SOURCE
-CFLAGS          = @CFLAGS@
-LDFLAGS         = @LDFLAGS@
+CPPFLAGS        = @CPPFLAGS@ @DEFS@ -D_GNU_SOURCE
+CFLAGS          = @CFLAGS@
+LDFLAGS         = @LDFLAGS@
 
-XML_OBJS        = xml-encode-int32.o       xml-decode-int32.o \
-                  xml-encode-uint32.o      xml-decode-uint32.o \
-                  xml-encode-int64.o       xml-decode-int64.o \
-                  xml-encode-uint64.o      xml-decode-uint64.o \
-                  xml-encode-double.o      xml-decode-double.o \
-                  xml-encode-begin.o       xml-decode-begin.o \
-                  xml-encode-end.o         xml-decode-end.o
+XML64_OBJS      = @xml_64_bit_objects@
+XML_OBJS        = xml-encode-int32.o       xml-decode-int32.o \
+                  xml-encode-uint32.o      xml-decode-uint32.o \
+                  xml-encode-double.o      xml-decode-double.o \
+                  xml-encode-begin.o       xml-decode-begin.o \
+                  xml-encode-end.o         xml-decode-end.o \
+                  $(XML64_OBJS)
 
-XDR_OBJS        = xdr-encode-int32.o       xdr-decode-int32.o \
-                  xdr-encode-uint32.o      xdr-decode-uint32.o \
-                  xdr-encode-int64.o       xdr-decode-int64.o \
-                  xdr-encode-uint64.o      xdr-decode-uint64.o \
-                  xdr-encode-double.o      xdr-decode-double.o \
-                  xdr-encode-octetstream.o xdr-decode-octetstream.o \
-                  xdr-encode-string.o      xdr-decode-string.o \
+XDR64_OBJS      = @xdr_64_bit_objects@
+XDR_OBJS        = xdr-encode-int32.o       xdr-decode-int32.o \
+                  xdr-encode-uint32.o      xdr-decode-uint32.o \
+                  xdr-encode-double.o      xdr-decode-double.o \
+                  xdr-encode-octetstream.o xdr-decode-octetstream.o \
+                  xdr-encode-string.o      xdr-decode-string.o \
+                  $(XDR64_OBJS)
 
 XDS_OBJS        = decode.o destroy.o encode.o getbuffer.o init.o register.o \
                   setbuffer.o unregister.o vdecode.o vencode.o find-engine.o \


ossp-pkg/xds/configure.ac 1.11 -> 1.12

--- configure.ac 2001/08/02 14:39:15     1.11
+++ configure.ac 2001/08/02 14:56:14     1.12
@@ -2,7 +2,7 @@
 
 AC_INIT(libxds)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.11 $)
+AC_REVISION($Revision: 1.12 $)
 
 dnl Get rid of the lousy -g and -O defaults in CFLAGS.
 dnl
@@ -52,6 +52,12 @@
    have_64_bit_support="#undef XDS_HAVE_64_BIT_SUPPORT"
 else
    have_64_bit_support="#define XDS_HAVE_64_BIT_SUPPORT"
+   xdr_64_bit_objects="xdr-encode-int64.o xdr-decode-int64.o"
+   xdr_64_bit_objects="$xdr_64_bit_objects xdr-encode-uint64.o xdr-decode-uint64.o"
+   xml_64_bit_objects="xml-encode-int64.o xml-decode-int64.o"
+   xml_64_bit_objects="$xml_64_bit_objects xml-encode-uint64.o xml-decode-uint64.o"
+   tests_64_bit="xdr-int64.exe xdr-uint64.exe xml-int64.exe xml-uint64.exe"
+   tests_64_bit="$tests_64_bit xds-mystruct"
 fi
 AC_SUBST([xds_uint8_t])
 AC_SUBST([xds_uint16_t])
@@ -62,6 +68,9 @@
 AC_SUBST([xds_int32_t])
 AC_SUBST([xds_int64_t])
 AC_SUBST([have_64_bit_support])
+AC_SUBST([xdr_64_bit_objects])
+AC_SUBST([xml_64_bit_objects])
+AC_SUBST([tests_64_bit])
 
 dnl Find the library containing the xdr_xxx() functions.
 dnl

CVSTrac 2.0.1