[Pkg-ace-commits] [pkg-ace] r541 - trunk/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-11-08 22:40:58 +0000 (Thu, 08 Nov 2007)
New Revision: 541

Modified:
   trunk/debian/rules
Log:
add missing autoconf stuff by hand to reduce diff w/ regular method


Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-11-08 22:40:11 UTC (rev 540)
+++ trunk/debian/rules	2007-11-08 22:40:58 UTC (rev 541)
@@ -11,6 +11,7 @@
 
 export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -52,6 +53,8 @@
 # Where we install every file before calling dh_install
 DT := debian/tmp
 
+CONFIG := objdir/ace/config.h
+
 extract-stamp: $(ACE_ARCHIVE)
 	tar -xjf $<
 	touch $@
@@ -258,8 +261,20 @@
            --enable-inline --enable-probe \
            --enable-symbol-visibility \
            --enable-ace-reactor-notification-queue
-	echo '#define ACE_GPERF "gperf-ace"' >> objdir/ace/config.h
-	echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> objdir/ace/config.h
+	echo '#define ACE_GPERF "gperf-ace"' >> $(CONFIG)
+	echo '#define TAO_IDL_INCLUDE_DIR "/usr/include/tao"' >> $(CONFIG)
+
+#	To remove once the autoconf macros exist
+	for i in 16 32 64 ; do \
+		echo "#define ACE_HAS_BSWAP_$$i" >> $(CONFIG) ; \
+	done
+	echo "#define ACE_HAS_RECURSIVE_MUTEXES" >> $(CONFIG)
+
+ifneq (,$(findstring $(DEB_HOST_ARCH),i386 amd64))
+	echo "#define ACE_HAS_INTEL_ASSEMBLY" >> $(CONFIG)
+endif
+
+#	TODO: ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO?
 	touch $@
 
 .PHONY: configure