Changeset 1770

Timestamp:

18/11/11 09:56:23 (6 months ago)

Author:

Freddie Akeroyd

Message:

• don't install headers for tclap
• remove check for history library
• python should load API specific nexus library (i.e. libNeXus.so.1)

refs #303

Location:

trunk

Files:

• bindings/python/nxs/napi.py (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• third_party/tclap/Makefile.am (modified) (1 diff)

trunk/bindings/python/nxs/napi.py

@@ -26 +26 @@
 
 - On Windows it looks for one of libNeXus.dll or libNeXus-0.dll.
-- On OS X it looks for libNeXus.dylib
-- On Unix it looks for libNeXus.so
+- On OS X it looks for libNeXus.0.dylib
+- On Unix it looks for libNeXus.so.0
 - NEXUSDIR defaults to 'C:\\Program Files\\NeXus Data Format'.
 - PREFIX defaults to /usr/local, but is replaced by the value of --prefix during configure.
@@ -235 +235 @@
             winnxdir =  'C:/Program Files/NeXus Data Format'
 
-        files += [filedir+"/libNeXus.dll",
-                  filedir+"/libNeXus-0.dll",
-                  winnxdir + '/bin/libNeXus-0.dll']
+        files += [filedir+"/libNeXus-0.dll",
+                  winnxdir + '/bin/libNeXus-0.dll',
+                  filedir+"/libNeXus.dll"]
     else:
         if sys.platform in ('darwin'):
-            lib = 'libNeXus.dylib'
+            lib = 'libNeXus.0.dylib'
             ldenv = 'DYLD_LIBRARY_PATH'
         else:
-            lib = 'libNeXus.so'
+            lib = 'libNeXus.so.0'
             ldenv = 'LD_LIBRARY_PATH'
         # Search the load library path as well as the standard locations

trunk/configure.ac

@@ -669 +669 @@
 AC_CHECK_LIB(termcap, tputs)
 AC_CHECK_LIB(readline, readline)
-AC_CHECK_LIB(history, add_history)
+#AC_CHECK_LIB(history, add_history)
 if test x$ac_cv_lib_termcap_tputs = xyes; then READLINE_LDFLAGS="-ltermcap $READLINE_LDFLAGS"; fi
+#if test x$ac_cv_lib_history_add_history = xyes; then READLINE_LDFLAGS="-lhistory $READLINE_LDFLAGS"; fi
 if test x$ac_cv_lib_readline_readline = xyes; then READLINE_LDFLAGS="-lreadline $READLINE_LDFLAGS"; fi
-if test x$ac_cv_lib_history_add_history = xyes; then READLINE_LDFLAGS="-lhistory $READLINE_LDFLAGS"; fi
 AC_SUBST(READLINE_LDFLAGS)
 LIBS="$SAVE_LIBS"

trunk/third_party/tclap/Makefile.am

@@ -1 +1 @@
 
-libtclapincludedir = $(includedir)/tclap
+#libtclapincludedir = $(includedir)/tclap
 
-libtclapinclude_HEADERS = \
+noinst_HEADERS = \
                          CmdLineInterface.h \
                          ArgException.h \