Merge branch 'master' into maverick

- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx

scan.c

@@ -999,7 +999,11 @@ int GetScanVarName(pScanData self, int iWhich, char *pName, int iLength)
     return 0;
   }
 }
-
+/*---------------------------------------------------------------------*/
+int isScanRunning(pScanData self)
+{
+  return self->iActive;
+}
 /*---------------------------------------------------------------------*/
 int GetScanVarStep(pScanData self, int iWhich, float *fStep)
 {
@@ -1720,6 +1724,12 @@ int ScanWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
     SCWrite(pCon, pBueffel, eValue);
     return 1;
   }
+/*-------- isactive */
+  else if (strcmp(argv[1], "isactive") == 0) {
+    snprintf(pBueffel,sizeof(pBueffel)-1, "%s.active = %d", argv[0], self->iActive);
+    SCWrite(pCon, pBueffel, eValue);
+    return 1;
+  }
 /*--------- getvardata */
   else if (strcmp(argv[1], "getvardata") == 0) {
     /* we need an integer parameter saying which */