merge from 1.2

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@1583 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
Lars-Kool · Sep 30, 2008 · 4c059c5 · 4c059c5
1 parent 703dea5
commit 4c059c5
Show file tree

Hide file tree

Showing 52 changed files with 388 additions and 382 deletions.
diff --git a/DeviceAdapters/ASIFW1000/Makefile.am b/DeviceAdapters/ASIFW1000/Makefile.am
@@ -6,6 +6,6 @@ ASIFW1000_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 ASIFW1000_la_LDFLAGS = -module
 
 install:
-	cp .libs/ASIFW1000.so $(IJPATH)/$(MMPREFIX)ASIFW1000
+	cp .libs/ASIFW1000.so $(DEVICEADAPTERPATH)/$(MMPREFIX)ASIFW1000$(MMSUFFIX)
 
 EXTRA_DIST = ASIFW1000.vcproj license.txt
diff --git a/DeviceAdapters/ASIStage/Makefile.am b/DeviceAdapters/ASIStage/Makefile.am
@@ -6,6 +6,6 @@ ASIStage_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 ASIStage_la_LDFLAGS = -module
 
 install:
-	cp .libs/ASIStage.so $(IJPATH)/$(MMPREFIX)ASIStage
+	cp .libs/ASIStage.so $(DEVICEADAPTERPATH)/$(MMPREFIX)ASIStage$(MMSUFFIX)
 
 EXTRA_DIST = ASIStage.vcproj license.txt
diff --git a/DeviceAdapters/Conix/Makefile.am b/DeviceAdapters/Conix/Makefile.am
@@ -6,4 +6,4 @@ Conix_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Conix_la_LDFLAGS = -module
 
 install:
-	cp .libs/Conix.so $(IJPATH)/$(MMPREFIX)Conix
+	cp .libs/Conix.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Conix$(MMSUFFIX)
diff --git a/DeviceAdapters/DAZStage/Makefile.am b/DeviceAdapters/DAZStage/Makefile.am
@@ -6,7 +6,7 @@ DAZStage_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 DAZStage_la_LDFLAGS = -module
 
 install:
-	cp .libs/DAZStage.so $(IJPATH)/$(MMPREFIX)DAZStage
+	cp .libs/DAZStage.so $(DEVICEADAPTERPATH)/$(MMPREFIX)DAZStage$(MMSUFFIX)
 
 EXTRA_DIST = DAZStage.vcproj license.txt
 
diff --git a/DeviceAdapters/DemoCamera/Makefile.am b/DeviceAdapters/DemoCamera/Makefile.am
@@ -5,6 +5,6 @@ DemoCamera_la_LDFLAGS = -module
 DemoCamera_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 
 install:
-	cp .libs/DemoCamera.so $(IJPATH)/$(MMPREFIX)DemoCamera
+	cp .libs/DemoCamera.so $(DEVICEADAPTERPATH)/$(MMPREFIX)DemoCamera$(MMSUFFIX)
 
 EXTRA_DIST = DemoCamera.vcproj license.txt
diff --git a/DeviceAdapters/DemoStreamingCamera/Makefile.am b/DeviceAdapters/DemoStreamingCamera/Makefile.am
@@ -5,6 +5,6 @@ DemoStreamingCamera_la_LDFLAGS = -module
 DemoStreamingCamera_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a $(LIBACE)
 
 install:
-	cp .libs/DemoStreamingCamera.so $(IJPATH)/$(MMPREFIX)DemoStreamingCamera
+	cp .libs/DemoStreamingCamera.so $(DEVICEADAPTERPATH)/$(MMPREFIX)DemoStreamingCamera$(MMSUFFIX)
 
 EXTRA_DIST = DemoStreamingCamera.vcproj license.txt
diff --git a/DeviceAdapters/Hamamatsu/Makefile.am b/DeviceAdapters/Hamamatsu/Makefile.am
@@ -7,11 +7,11 @@ Hamamatsu_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Hamamatsu_la_LDFLAGS = -module $(DCAMFRAMEWORKS)
 
 install:
-	cp .libs/Hamamatsu.so $(IJPATH)/$(MMPREFIX)Hamamatsu
+	cp .libs/Hamamatsu.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Hamamatsu$(MMSUFFIX)
 
 install-strip:
-	cp .libs/Hamamatsu.so $(IJPATH)/$(MMPREFIX)Hamamatsu
-	strip -x $(IJPATH)/$(MMPREFIX)Hamamatsu
+	cp .libs/Hamamatsu.so $(DEVICEADAPTERPATHPATH)/$(MMPREFIX)Hamamatsu$(MMSUFFIX)
+	strip -x $(DEVICEADAPTERPATHPATH)/$(MMPREFIX)Hamamatsu$(MMSUFFIX)
 
 EXTRA_DIST = Hamamatsu.vcproj license.txt
 
diff --git a/DeviceAdapters/K8055/Makefile.am b/DeviceAdapters/K8055/Makefile.am
@@ -6,4 +6,4 @@ K8055_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 K8055_la_LDFLAGS = -module
 
 install:
-	cp .libs/K8055.so $(IJPATH)/$(MMPREFIX)K8055
+	cp .libs/K8055.so $(DEVICEADAPTERPATHPATH)/$(MMPREFIX)K8055$(MMSUFFIX)
diff --git a/DeviceAdapters/K8061/Makefile.am b/DeviceAdapters/K8061/Makefile.am
@@ -7,4 +7,4 @@ K8061_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 K8061_la_LDFLAGS = -module
 
 install:
-	cp .libs/K8061.so $(IJPATH)/$(MMPREFIX)K8061
+	cp .libs/K8061.so $(DEVICEADAPTERPATH)/$(MMPREFIX)K8061$(MMSUFFIX)
diff --git a/DeviceAdapters/Ludl/Makefile.am b/DeviceAdapters/Ludl/Makefile.am
@@ -6,7 +6,11 @@ Ludl_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Ludl_la_LDFLAGS = -module
 
 install:
-	cp .libs/Ludl.so $(IJPATH)/$(MMPREFIX)Ludl
+	cp .libs/Ludl.so $(DEVICEADAPTERPATH)/$(MMPREFIX)$(thislib)$(MMSUFFIX)
+
+install-strip:
+	cp .libs/$(MMPREFIX)Ludl.so $(DEVICEADAPTERPATH)/Ludl$(MMSUFFIX)
+	strip -x (DEVICEADAPTERPATH)/$(MMPREFIX)Ludl$(MMSUFFIX)
 
 ##EXTRA_DIST = Ludl_vc8.vcproj Ludl.vcproj license.txt
 EXTRA_DIST = license.txt
diff --git a/DeviceAdapters/LudlLow/Makefile.am b/DeviceAdapters/LudlLow/Makefile.am
@@ -6,7 +6,7 @@ LudlLow_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 LudlLow_la_LDFLAGS = -module
 
 install:
-	cp .libs/LudlLow.so $(IJPATH)/$(MMPREFIX)LudlLow
+	cp .libs/LudlLow.so $(DEVICEADAPTERPATH)/$(MMPREFIX)LudlLow$(MMSUFFIX)
 
 ##EXTRA_DIST = Ludl_vc8.vcproj Ludl.vcproj license.txt
 EXTRA_DIST = license.txt
diff --git a/DeviceAdapters/Nikon/Makefile.am b/DeviceAdapters/Nikon/Makefile.am
@@ -6,7 +6,7 @@ Nikon_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Nikon_la_LDFLAGS = -module
 
 install:
-	cp .libs/Nikon.so $(IJPATH)/$(MMPREFIX)Nikon
+	cp .libs/Nikon.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Nikon$(MMSUFFIX)
 
 EXTRA_DIST = Nikon.vcproj license.txt
 
diff --git a/DeviceAdapters/NikonTE2000/Makefile.am b/DeviceAdapters/NikonTE2000/Makefile.am
@@ -6,6 +6,6 @@ NikonTE2000_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 NikonTE2000_la_LDFLAGS = -module
 
 install:
-	cp .libs/NikonTE2000.so $(IJPATH)/$(MMPREFIX)NikonTE2000
+	cp .libs/NikonTE2000.so $(DEVICEADAPTERPATH)/$(MMPREFIX)NikonTE2000$(MMSUFFIX)
 
 EXTRA_DIST = NikonTE2000.vcproj NikonTE2000_vc8.sln license.txt
diff --git a/DeviceAdapters/PI/Makefile.am b/DeviceAdapters/PI/Makefile.am
@@ -6,4 +6,4 @@ PI_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 PI_la_LDFLAGS = -module
 
 install:
-	cp .libs/PI.so $(IJPATH)/$(MMPREFIX)PI
+	cp .libs/PI.so $(DEVICEADAPTERPATH)/$(MMPREFIX)PI$(MMSUFFIX)
diff --git a/DeviceAdapters/PI_GCS/Makefile.am b/DeviceAdapters/PI_GCS/Makefile.am
@@ -6,4 +6,4 @@ PIGCS_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 PIGCS_la_LDFLAGS = -module
 
 install:
-	cp .libs/PIGCS.so $(IJPATH)/$(MMPREFIX)PIGCS
+	cp .libs/PIGCS.so $(DEVICEADAPTERPATH)/$(MMPREFIX)PIGCS$(MMSUFFIX)
diff --git a/DeviceAdapters/PVCAM/Makefile.am b/DeviceAdapters/PVCAM/Makefile.am
@@ -6,6 +6,6 @@ PVCAM_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a $(LIBACE)
 PVCAM_la_LDFLAGS = -module $(PVCAMFRAMEWORKS)
 
 install:
-	cp .libs/PVCAM.so $(IJPATH)/$(MMPREFIX)PVCAM
+	cp .libs/PVCAM.so $(DEVICEADAPTERPATH)/$(MMPREFIX)PVCAM$(MMSUFFIX)
 
 EXTRA_DIST = PVCAM.vcproj license.txt
diff --git a/DeviceAdapters/Pecon/Makefile.am b/DeviceAdapters/Pecon/Makefile.am
@@ -6,6 +6,6 @@ Pecon_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Pecon_la_LDFLAGS = -module
 
 install:
-	cp .libs/Pecon.so $(IJPATH)/$(MMPREFIX)Pecon
+	cp .libs/Pecon.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Pecon$(MMSUFFIX)
 
 EXTRA_DIST = Pecon.vcproj license.txt
diff --git a/DeviceAdapters/Prior/Makefile.am b/DeviceAdapters/Prior/Makefile.am
@@ -6,6 +6,6 @@ Prior_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Prior_la_LDFLAGS = -module
 
 install:
-	cp .libs/Prior.so $(IJPATH)/$(MMPREFIX)Prior
+	cp .libs/Prior.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Prior$(MMSUFFIX)
 
 EXTRA_DIST = Prior.vcproj license.txt
diff --git a/DeviceAdapters/QCam/Makefile.am b/DeviceAdapters/QCam/Makefile.am
@@ -6,6 +6,6 @@ QCam_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 QCam_la_LDFLAGS = -module -framework QCam
 
 install:
-	cp .libs/QCam.so $(IJPATH)/$(MMPREFIX)QCam
+	cp .libs/QCam.so $(DEVICEADAPTERPATH)/$(MMPREFIX)QCam$(MMSUFFIX)
 
 EXTRA_DIST = QCam.vcproj
diff --git a/DeviceAdapters/SerialManagerUNIX/Makefile.am b/DeviceAdapters/SerialManagerUNIX/Makefile.am
@@ -7,6 +7,7 @@ SerialManager_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 SerialManager_la_LDFLAGS = -module $(SERIALFRAMEWORKS)
 
 install:
-	cp .libs/SerialManager.so $(IJPATH)/$(MMPREFIX)SerialManager
+	cp .libs/SerialManager.so $(DEVICEADAPTERPATH)/$(MMPREFIX)SerialManager$(MMSUFFIX)
+
 
 EXTRA_DIST = license.txt
diff --git a/DeviceAdapters/Skeleton/Makefile.am b/DeviceAdapters/Skeleton/Makefile.am
@@ -6,6 +6,6 @@ Skeleton__la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Skeleton_la_LDFLAGS = -module
 
 install:
-	cp .libs/Skeleton.so $(IJPATH)/$(MMPREFIX)Skeleton
+	cp .libs/Skeleton.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Skeleton$(MMSUFFIX)
 
 EXTRA_DIST = license.txt
diff --git a/DeviceAdapters/SpectralLMM5/Makefile.am b/DeviceAdapters/SpectralLMM5/Makefile.am
@@ -6,6 +6,7 @@ SpectralLMM5_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 SpectralLMM5_la_LDFLAGS = -module
 
 install:
-	cp .libs/SpectralLMM5.so $(IJPATH)/$(MMPREFIX)SpectralLMM5
+	cp .libs/SpectralLMM5.so $(DEVICEADAPTERPATH)/$(MMPREFIX)SpectralLMM5$(MMSUFFIX)
+
 
 EXTRA_DIST =  license.txt
diff --git a/DeviceAdapters/SutterLambda/Makefile.am b/DeviceAdapters/SutterLambda/Makefile.am
@@ -6,6 +6,6 @@ SutterLambda_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 SutterLambda_la_LDFLAGS = -module
 
 install:
-	cp .libs/SutterLambda.so $(IJPATH)/$(MMPREFIX)SutterLambda
+	cp .libs/SutterLambda.so $(DEVICEADAPTERPATH)/$(MMPREFIX)SutterLambda$(MMSUFFIX)
 
 EXTRA_DIST = SutterLambda.vcproj license.txt
diff --git a/DeviceAdapters/USBManager/Makefile.am b/DeviceAdapters/USBManager/Makefile.am
@@ -6,6 +6,6 @@ USBManager_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a  $(LIBUSB)
 USBManager_la_LDFLAGS = -module
 
 install:
-	cp .libs/USBManager.so $(IJPATH)/$(MMPREFIX)USBManager
+	cp .libs/USBManager.so $(DEVICEADAPTERPATH)/$(MMPREFIX)USBManager$(MMSUFFIX)
 
 EXTRA_DIST = license.txt
diff --git a/DeviceAdapters/Vincent/Makefile.am b/DeviceAdapters/Vincent/Makefile.am
@@ -6,6 +6,6 @@ Vincent_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 Vincent_la_LDFLAGS = -module
 
 install:
-	cp .libs/Vincent.so $(IJPATH)/$(MMPREFIX)Vincent
+	cp .libs/Vincent.so $(DEVICEADAPTERPATH)/$(MMPREFIX)Vincent$(MMSUFFIX)
 
 EXTRA_DIST =  Vincent.vcproj license.txt
diff --git a/DeviceAdapters/Yokogawa/Makefile.am b/DeviceAdapters/Yokogawa/Makefile.am
@@ -9,5 +9,5 @@ CSUX_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 CSUX_la_LDFLAGS = -module
 
 install:
-	cp .libs/CSU22.so $(IJPATH)/$(MMPREFIX)CSU22
-	cp .libs/CSUX.so $(IJPATH)/$(MMPREFIX)CSUX
+	cp .libs/CSU22.so $(DEVICEADAPTERPATH)/$(MMPREFIX)CSU22$(MMSUFFIX)
+	cp .libs/CSUX.so $(DEVICEADAPTERPATH)/$(MMPREFIX)CSUX$(MMSUFFIX)
diff --git a/DeviceAdapters/ZeissCAN/Makefile.am b/DeviceAdapters/ZeissCAN/Makefile.am
@@ -6,4 +6,4 @@ ZeissCAN_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a
 ZeissCAN_la_LDFLAGS = -module
 
 install:
-	cp .libs/ZeissCAN.so $(IJPATH)/$(MMPREFIX)ZeissCAN
+	cp .libs/ZeissCAN.so $(DEVICEADAPTERPATH)/$(MMPREFIX)ZeissCAN$(MMSUFFIX)
diff --git a/DeviceAdapters/ZeissCAN29/Makefile.am b/DeviceAdapters/ZeissCAN29/Makefile.am
@@ -6,4 +6,4 @@ ZeissCAN29_la_LDFLAGS = -module
 ZeissCAN29_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a 
 
 install:
-	cp .libs/ZeissCAN29.so $(IJPATH)/$(MMPREFIX)ZeissCAN29
+	cp .libs/ZeissCAN29.so $(DEVICEADAPTERPATH)/$(MMPREFIX)ZeissCAN29$(MMSUFFIX)
diff --git a/DeviceAdapters/configure.in b/DeviceAdapters/configure.in
@@ -9,73 +9,12 @@ AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 
 
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_LIBTOOL
+m4_include([../configure.common])
 
 
-# GCC version
-if test "x$GXX" = "xyes"; then
-  AC_MSG_CHECKING([GNU compiler version])
 
-  # Don't pass CXXFLAGS to the following CXX command as some
-  # of them can't be specified along with '-v'.
-  cc_version=["`$CXX -v 2>&1 </dev/null |grep 'gcc version' |\
-          sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"]
-  AC_MSG_RESULT([$cc_version])
 
-  # Some version numbers
-  cc_vers_major=`echo $cc_version | cut -f1 -d.`
-  cc_vers_minor=`echo $cc_version | cut -f2 -d.`
-  cc_vers_patch=`echo $cc_version | cut -f3 -d.`
-  test -n "$cc_vers_major" || cc_vers_major=0
-  test -n "$cc_vers_minor" || cc_vers_minor=0
-  test -n "$cc_vers_patch" || cc_vers_patch=0
-  cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
 
-  if test $cc_vers_major -lt 3; then
-    AC_MSG_ERROR([gcc >= 3.0 is needed to compile MicroManager])
-  fi
-fi 
-
-# On linux, some gcc versions build shared libraries unusable in java when using
-# the -O2 optimization.  Switch it off here:
-
-if test $cc_vers_major -gt 3; then
-   case $host in
-      *-*-linux*) CXXFLAGS="-g -O";;
-   esac
-fi
-
-#---------------------------------------------------
-# Check for ACE, static on Mac and libtool lib on Linux
-#---------------------------------------------------
-AC_MSG_CHECKING(for libACE)
-if test -z "$LIBACE" 
-then    
-   case $host in
-   *-*-linux*) 
-   if test -r /usr/local/lib/libACE.la ; then
-      LIBACE="/usr/local/lib/libACE.la"
-     if test -r /usr/lib/libACE.a ; then
-        LIBACE="/usr/lib/libACE.a"
-      else
-         AC_MSG_ERROR([not found, download from http://deuce.doc.wustl.edu/Download.html, build and install (cd ACE_wrappers \ mkdir build \ cd build \ ../configure \ make \ make install ) and rerun configure])
-      fi
-   fi
-   ;;
-  *-*-darwin*) 
-  if test -r /usr/local/lib/libACE.a; then
-      LIBACE="/usr/local/lib/libACE.a"
-   else
-      AC_MSG_ERROR([not found, download from http://deuce.doc.wustl.edu/Download.html, build and install (cd ACE_wrappers \ mkdir build \ cd build \ ../configure --enable-static\ make \ make install ) and rerun configure])
-   fi
-   ;;
-   esac
-fi
-AC_MSG_RESULT($LIBACE)
-AC_SUBST(LIBACE)
 
 # Checks for header files.
 # Only build Hamamatsu driver when header files are present
@@ -186,23 +125,6 @@ AC_HEADER_STDBOOL
 AC_C_CONST
 AC_C_INLINE
 
-#----------------------------------------------------------------
-# LINKFORSHARED are the flags passed to the $(CC) command that links
-# -- this is only needed for a few systems
-#----------------------------------------------------------------
-AC_MSG_CHECKING(LINKFORSHARED)
-if test -z "$LINKFORSHARED"
-then    
-case $host in   
-   *-*-aix*)   LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
-   *-*-hp*) LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
-   *-*-linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
-   *-*-next*) LINKFORSHARED="-u libsys_s";;
-   *-sco-sysv*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;                  
-   *-*-irix6*) LINKFORSHARED="-all";;   esac
-fi
-AC_MSG_RESULT($LINKFORSHARED)
-AC_SUBST(LINKFORSHARED)
 
 # On the Mac we need some frameworks that can be in the way on Linux
 case $host in 
@@ -221,42 +143,27 @@ AC_SUBST(DCAMFRAMEWORKS)
 AC_SUBST(PVCAMFRAMEWORKS)
 AC_SUBST(SERIALFRAMEWORKS)
 
-# Micro-Manager libraries have a prefix to make them unique.  This prefix is defined here:
+# Micro-Manager libraries have a prefix & suffix to make them unique.  These are defined here:
+case $host in
+   *-*-linux*)
+   MMSUFFIX=".so.0"
+   MMPREFIX="libmmgr_dal_"
+   ;;
+esac
+if test -z "$MMSUFFIX"; then
+  MMSUFFIX=""
+fi
+if test -z "$MMPREFIX"; then
+  MMPREFIX="mmgr_dal_"
+fi
+
+AC_MSG_CHECKING(library suffix)
+AC_MSG_RESULT($MMSUFFIX)
+AC_SUBST(MMSUFFIX)
 AC_MSG_CHECKING(library prefix)
-MMPREFIX="mmgr_dal_"
 AC_MSG_RESULT($MMPREFIX)
 AC_SUBST(MMPREFIX)
 
-# Determine if we need to look for ImageJ
-AC_MSG_CHECKING(whether to build for imagej)
-AC_ARG_WITH(imagej, [  --with-imagej=path        Path to ImageJ-based GUI], [IMAGEJDIR="$withval"], [IMAGEJDIR="yes"])
-AC_MSG_RESULT($IMAGEJDIR)
-
-if test "$IMAGEJDIR" != "no" ; then
-   #----------------------------------------------------------------
-   # Find ImageJ directory
-   #----------------------------------------------------------------
-   AC_MSG_CHECKING(for ImageJ directory)
-
-   if test -z "$IMAGEJDIR"; then  
-      IMAGEJDIR="/Applications/ImageJ /usr/local/ImageJ /usr/local/imagej "
-   fi  
-
-   IJPATH=""                                                                   
-   for d in $IMAGEJDIR ; do                                                    
-     if test -d "$d" ; then 
-       AC_MSG_RESULT($d)
-       IJPATH=$d
-       break
-     fi
-   done
-
-   if test "$IJPATH" = "" ; then
-     AC_MSG_ERROR([not found, Use the without-imagej directive to build without ImageJ or install ImageJ (http://rsb.info.nih.gov/ij/ and rerun configure, possibly using the --with-imagej=path directive])
-   fi
-fi
-
-AC_SUBST(IJPATH)
 
 # Checks for library functions.
 AC_HEADER_STDC

diff --git a/DeviceAdapters/dc1394/Makefile.am b/DeviceAdapters/dc1394/Makefile.am
@@ -7,6 +7,6 @@ dc1394_la_LIBADD = ../../MMDevice/.libs/libMMDevice.a /usr/local/lib/libdc1394.a
 dc1394_la_LDFLAGS = -module
 
 install:
-	cp .libs/dc1394.so $(IJPATH)/$(MMPREFIX)dc1394
+	cp .libs/dc1394.so $(DEVICEADAPTERPATH)/$(MMPREFIX)dc1394$(MMSUFFIX)
 
 EXTRA_DIST = license.txt