Changeset 1156

Timestamp:

14/01/09 16:43:38 (3 years ago)

Author:

Freddie Akeroyd

Message:

refs #115

Location:

branches/4.2

Files:

• bindings/idl/Makefile.am (modified) (1 diff)
• configure.ac (modified) (5 diffs)

branches/4.2/bindings/idl/Makefile.am

@@ -39 +39 @@
 libNeXusIDL_API_la_SOURCES = NeXusIDL-API.c handle.c handle.h
 libNeXusIDL_API_la_LIBADD = $(top_builddir)/src/libNeXus.la
-libNeXusIDL_API_la_LDFLAGS = @SHARED_LDFLAGS@ -Wl,--no-undefined -L$(IDLROOT)/bin/bin.linux.$(IDLARCH) -lidl $(LDFLAGS)
+libNeXusIDL_API_la_LDFLAGS = @SHARED_LDFLAGS@ -Wl,--no-undefined -L$(IDLROOT)/bin/$(IDL_HOST) -lidl $(LDFLAGS)
 
 AM_CPPFLAGS = -I$(IDLROOT)/external/include
+
+install-exec-hook :
+        ( cd $(DESTDIR)$(libdir); ln -s libNeXusIDL-API.so NeXusIDL-API.so )
+
+NeXusIDL-API.so : libNeXusIDL-API.la
+        ln -sf .libs/libNeXusIDL-API.so $@
+
+CLEANFILES = NeXusIDL-API.so
 
 EXTRA_DIST = \

branches/4.2/configure.ac

@@ -60 +60 @@
 AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug],[Turn off optimisation]), [enable_debug=$enableval],[enable_debug=no])
 
+AC_ARG_ENABLE([32bit], AC_HELP_STRING([--enable-32bit],[build 32bit binary on 64 bit computer]), [enable_32bit=$enableval],[enable_32bit=no])
+
 dnl Checks for programs.
 AC_ARG_WITH([cc], AC_HELP_STRING([--with-cc=c compiler], [Specify name of C compiler]),
@@ -183 +185 @@
 AM_CONDITIONAL(HAVE_IDL, [test "$IDLROOT" != ""])
 
-dnl Work out the architecture for IDL
-if test -n "IDLROOT" ; then
-    AS_CASE([$build_cpu], [x86|i386|i686], [IDLARCH=x86], [IDLARCH=$build_cpu])
-    AC_SUBST(IDLARCH)
-fi
 
 AC_ARG_WITH([doxygen], AC_HELP_STRING([--with-doxygen=/path/to/doxygen], [Specify path to doxygen]), [with_doxygen=$withval], [with_doxygen=no])
@@ -290 +287 @@
 AM_CONDITIONAL(HAVE_MS_LIB, [test ! -z "$MS_LIB"])
 
+# strict aliasing causes issues with casts from NXmalloc()
+CFLAGS="-fno-strict-aliasing"
+CXXFLAGS="-fno-strict-aliasing"
+
 # check for debug
 if test "$enable_debug" = "yes"; then
-    CFLAGS="-O0 -g"
-    CXXFLAGS="-O0 -g"
+    CFLAGS="$CFLAGS -O0 -g"
+    CXXFLAGS="$CXXFLAGS -O0 -g"
+fi
+
+if test "$enable_32bit" = "yes"; then
+    CFLAGS="$CFLAGS -m32"
+    CXXFLAGS="$CXXFLAGS -m32"
 fi
 
@@ -337 +343 @@
 AC_SUBST(LIBXML2_CFLAGS)
 LIBXML2_CFLAGS='`xml2-config --cflags`'
+
+# set up for linux here - mac is covered in the case $host statement
+if test $enable_32bit = yes; then
+    IDL_HOST="bin.linux.x86"    # force 32 bit on a 64 bit machine
+else
+    IDL_HOST="bin.linux.$build_cpu"
+fi
+AC_SUBST(IDL_HOST)
 
 case $host in
@@ -389 +403 @@
 dnl           archive_cmds='$CC -dynamiclib -single_module'
 dnl     fi
+        if test $enable_32bit = yes; then
+            IDL_HOST="bin.darwin.i386" # force 32bit build
+        else
+            IDL_HOST="bin.darwin.i386"
+        fi
         ;;
 esac