Changeset 1467

Timestamp:

08/05/10 17:44:43 (21 months ago)

Author:

Freddie Akeroyd

Message:

Add nexus-config (uses pkg-config) Refs #228

Location:

trunk

Files:

• configure.ac (modified) (6 diffs)
• scripts/Makefile.am (modified) (1 diff)
• scripts/nexus-config.in (added)
• scripts/nexus_pc.in (modified) (1 diff)

trunk/configure.ac

@@ -130 +130 @@
         FC=
         WITH_F90=no
+fi
+
+AC_ARG_WITH([matlabroot], AC_HELP_STRING([--with-matlabroot=path to matlab install dir], [Specify location of matlab installation directory]),
+        [], [with_matlabroot=no])
+if test x"$with_matlabroot" != x"no" ; then
+    MATLABROOT="$with_matlabroot"
+fi
+AC_PATH_PROG(MATLAB,matlab,[],[$MATLABROOT/bin:/usr/local/matlab/bin:/opt/matlab/bin:$PATH])
+if test x"$MATLABROOT" = x -a x"$MATLAB" != x; then
+    MATLABROOT=`dirname $MATLAB`/..
 fi
 
@@ -719 +729 @@
 AM_CONDITIONAL(HAVE_OPENGENIE, [test ! -z "$OPENGENIEROOT"])
 AM_CONDITIONAL(HAVE_DOXYGEN, [test ! -z "$DOXYGEN"])
+AM_CONDITIONAL(HAVE_MATLAB, [test ! -z "$MATLAB"])
 AM_CONDITIONAL(HAVE_PDFLATEX, [test ! -z "$PDFLATEX"])
 AM_CONDITIONAL(HAVE_DOT, [test ! -z "$DOT"])
@@ -728 +739 @@
 AC_CONFIG_FILES(test/Makefile test/atlocal)
 AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
+if test X$MATLAB != X; then
+    for i in glnxa64 glnxi64 glnx86 maci maci64; do
+        if test -r "$MATLABROOT/bin/$i"; then
+                MATLAB_ARCH="$i"
+        fi
+    done
+    case $MATLAB_ARCH in
+        glnx86)
+            MATLAB_MEXSUFFIX=mexglx
+            ;;
+        glnxa64)
+            MATLAB_MEXSUFFIX=mexa64
+            ;;
+        glnxi64)
+            MATLAB_MEXSUFFIX=mexi64
+            ;;
+        maci)
+            MATLAB_MEXSUFFIX=mexmaci
+            ;;
+    esac
+    AC_SUBST(MATLAB_MEXSUFFIX)
+    AC_SUBST(MATLAB_ARCH)
+    AC_SUBST(MATLABROOT)
+fi
 
 LINUX_DISTRIBUTION
@@ -783 +819 @@
                 macosx_install_kit/pkg.config
                 scripts/Makefile
+                scripts/nexus-config
                 scripts/nexus.pc:scripts/nexus_pc.in
                 scripts/nxbuild])
@@ -818 +855 @@
 IDLBINDING=`if test -n "$IDLROOT" ; then echo yes ; else echo no ; fi` 
 PYTHONBINDING=`if test -n "$HAVE_PYTHON_FALSE" ; then echo yes; else echo no ; fi` 
+MATLABBINDING=`if test -n "$MATLAB" ; then echo "yes (matlabroot=$MATLABROOT)"; else echo no ; fi`
+
 if test -n "$SWIG" ; then 
     SWIGBINDING="yes ("
@@ -852 +891 @@
                 SWIG:          ${SWIGBINDING}
                  IDL:          ${IDLBINDING} (--with-idlroot=${IDLROOT}, --with-idldlm=${IDLDLM})
+                 MATLAB:               ${MATLABBINDING} (--with-matlabroot=${MATLABROOT})
               PYTHON:          ${PYTHONBINDING} (PYTHONROOT=${PYTHONROOT}, numpy found: $PYTHON_numpy_found)
 

trunk/scripts/Makefile.am

@@ -1 +1 @@
 pkgconfigdir            = ${libdir}/pkgconfig
-nodist_bin_SCRIPTS      = nxbuild
+nodist_bin_SCRIPTS      = nxbuild nexus-config
 
-EXTRA_DIST              = nxbuild.in nexus_pc.in
+EXTRA_DIST              = nxbuild.in nexus_pc.in nexus-config.in
 
 pkgconfig_DATA          = nexus.pc

trunk/scripts/nexus_pc.in

@@ -10 +10 @@
 Requires:
 Conflicts:
-Libs:   -L${libdir} -lNeXus @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBS@
-Cflags: -I${includedir} @HDF4_CPPFLAGS@ @HDF5_CPPFLAGS@ @XML_CPPFLAGS@
+Libs:   -L${libdir} -lNeXusCPP -lNeXus @HDF4_LDFLAGS@ @HDF5_LDFLAGS@ @XML_LDFLAGS@ @LIBS@
+Cflags: -I${includedir}/nexus -I${includedir} @HDF4_CPPFLAGS@ @HDF5_CPPFLAGS@ @XML_CPPFLAGS@