merged r5344 through r5558 from trunk

git-svn-id: http://svn.code.sf.net/p/rts-2/code/branches/rts-2/REL_0_8_0@5559 65ab8f4e-f147-0410-b3a9-f14133ecfe55

ChangeLog

@@ -1,4 +1,7 @@
-2008-01-06
+0.7.5
+=====
+
+2009-01-06
  * [2452561] added airmass,..
 
 2008-12-28

INSTALL.alta

@@ -19,7 +19,7 @@ user@host:~/apogee$ make apogee_USB.so
 
 Then you will need to run ./configure from rts2 with --with-alta option:
 
-user@host:~/fliusb/libfli$ cd ~/rts2
+user@host:~/apogee$ cd ~/rts2
 user@host:~/rts2$ ./configure --without-wcs --with-alta=$HOME/apogee
 
 Then run make and (as root) make install. Please see RUN file for details on

INSTALL.andor

@@ -0,0 +1,24 @@
+Instructions to install Alta Apogee devices
+===========================================
+
+For Andor CCDs, you will need to install Andor SDK. You can get one from Andor
+(http://www.andor.com) if you ever ordered CCD from them. Andor works in 32bit
+as well as 64bit modes.
+
+After installing Andor SDK (please refer to attached manual) and its kernel
+driver, verifying that kernel driver is running (lsmod | grep andord). If you
+are using xIon, please make sure that you properly set mem=xxxxM to command
+line. Also bear in mind that if your system has more then 3 GB of RAM, you need
+to set mem=3000M.
+
+Sometimes install script in Andor install 32 bit libraries on 64 bit machine. Either help yourself by overwriting libandor-xx with correct _x86 variant, or ask Petr (<petr@kubanek.net>) for details.
+
+Then you will need to run ./configure from rts2 with --with-andor option:
+
+user@host:~/fliusb/libfli$ cd ~/rts2
+user@host:~/rts2$ ./configure --with-andor=$HOME/andor
+
+if Andor SDK unpacks to ~/andor. Please change directory in --with-andor to actual location of Andor SDK directory).
+
+Then run make and (as root) make install. After installing, start rts2-camd-andor. Please see RUN file for details on
+that.

INSTALL.comedi

@@ -0,0 +1,30 @@
+Instructions for Comedi devices
+===============================
+
+
+Comedi is a project to provide drivers for various measurement cards. It can be
+downloaded from http://www.comedi.org, but easier is to apt-get install
+comedi-sources libcomedi-dev.
+
+To compile modules:
+
+cd /usr/src/
+tar xjf comedi.tar.bz2
+cd modules/comedi
+./configure
+make
+
+If you hit any problems, let me know (petr [at] kubanek [dot] net). There is a
+know issue with kernels above 2.6.26, I have patch for those.
+
+Once you will have comedi installed, just rerun ./configure, it will detect
+that libcomedi is installed and will build all devices which depends on it.
+After ./configure reports yes for Comedi driver, just rerun make to build all
+comedi dependend devices.
+
+Currently only weather sensor for Bootes 2 dome depends on Comedi library - its
+source is located in src/sensord/bootes2.cpp. You can check this for example how
+to use Comedi device in your application.
+
+Then run make and (as root) make install. Please see RUN file for details on
+that.

Makefile.am

@@ -6,4 +6,5 @@ SUBDIRS =	include \
 		man
 
 EXTRA_DIST = rts2.ini autogen.sh RUN rts2.initd centrald devices services \
-	INSTALL INSTALL.alta INSTALL.fli
+	INSTALL INSTALL.alta INSTALL.fli INSTALL.paramount INSTALL.andor \
+	INSTALL.comedi

configure.in

@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.C
-AC_INIT(rts2, 0.7.3, petr@kubanek.net)
+AC_INIT(rts2, 0.7.5, petr@kubanek.net)
 
 AM_INIT_AUTOMAKE([gnu dist-bzip2])
 
@@ -66,6 +66,13 @@ esac],[cfitsio=yes])
 
 AM_CONDITIONAL(CFITSIO, test x$cfitsio != xno)
 
+AC_ARG_WITH(ncurses,
+[  --with-ncurses       path to ncurses library or "yes" if ncurses is in standard path],
+[case "${withval}" in
+	yes) ncurses=yes ;;
+	*) ncurses=${withval} ;;
+esac],[ncurses=yes])
+
 AC_ARG_WITH(jpeg,
 [  --with-jpeg       path to JPEG lib or "no" if JPEG libs are not installed],
 [case "${withval}" in
@@ -274,9 +281,12 @@ LIBS="${LIBS} -lm"; AC_SUBST(LIB_M), [cat << EOF
 EOF
 exit 1])
 
+AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(nsl, gethostbyname)
+
 if test "x${cfitsio}" != "xno"; then
   if test "x${cfitsio}" != "xyes"; then
-    LDFLAGS="${LDFLAGS} -L${cfitsio}/lib"
+    LDFLAGS="${LDFLAGS} -L${cfitsio}"
   fi
   AC_CHECK_LIB([cfitsio], [ffinit], LIB_CFITSIO="-lcfitsio"; 
 , [cat <<EOF
@@ -286,8 +296,8 @@ if test "x${cfitsio}" != "xno"; then
 EOF
 exit 1])
   if test "x${cfitsio}" != "xyes"; then
-    LIB_CFITSIO="-L${cfitsio}/lib ${LIB_CFITSIO}"
-    CFITSIO_CFLAGS="-I${cfitsio}/include"
+    LIB_CFITSIO="-L${cfitsio} ${LIB_CFITSIO}"
+    CFITSIO_CFLAGS="-I${cfitsio}"
   else
     CFITSIO_CFLAGS=""
   fi
@@ -321,13 +331,25 @@ AM_CONDITIONAL(LIBWCS, test x$libwcs != xno)
 AC_SUBST(LIBWCS_CFLAGS)
 AC_SUBST(LIBWCS_LDFLAGS)
 
-AC_CHECK_LIB([ncurses], [mvwprintw], LIB_NCURSES="-lncurses";
+if test "x${ncurses}" != "xyes"; then
+  LDFLAGS="${LDFLAGS} -L${ncurses}/lib"
+fi     
+
+AC_CHECK_LIB([ncurses], [mvwprintw], LIBNCURSES_LDFLAGS="-lncurses";
 AC_SUBST(LIB_NCURSES), [cat << EOF
 **** You don't have ncurser libraries.
 **** Please install ncursers (you need devel package as well)
 EOF
 exit 1])
 
+if test "x${ncurses}" != "xyes"; then
+  LIBNCURSES_CFLAGS="-I${ncurses}/include"
+  LIBNCURSES_LDFLAGS="-L${ncurses}/lib -lncurses"
+fi
+
+AC_SUBST(LIBNCURSES_CFLAGS)
+AC_SUBST(LIBNCURSES_LDFLAGS)
+
 if test "x${libnova}" != "xno"; then
   if test "x${libnova}" != "xyes"; then
     LDFLAGS="${LDFLAGS} -L${libnova}/lib"
@@ -458,22 +480,20 @@ AC_GSOAP
 
 AH_TEMPLATE([HAVE_PGSQL_SOAP],[Whenever PGSQL and SOAP libraries are installed])
 
-AM_CONDITIONAL(PGSQL_SOAP, test x$psql = xyes -a x$gsoap == xyes )
+AM_CONDITIONAL(PGSQL_SOAP, test x$psql = xyes -a x$gsoap = xyes )
 
-if test x$psql = xyes -a x$gsoap == xyes ; then 
+if test x$psql = xyes -a x$gsoap = xyes ; then 
   AC_DEFINE_UNQUOTED(HAVE_PGSQL_SOAP, 1, [Whenever PGSQL and SOAP libraries are installed])
 fi
 
-AC_CHECK_HEADERS
-
 # Checks for library functions.
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_FUNC_MKTIME
 AC_TYPE_SIGNAL
 AC_FUNC_STRTOD
-AC_CHECK_FUNCS([dup2 floor gethostbyname gettimeofday inet_ntoa memmove memset select socket strchr strdup strerror strtol bzero mkdir sqrt strcasecmp strncasecmp pow getaddrinfo])
+AC_CHECK_FUNCS([dup2 floor gethostbyname gettimeofday inet_ntoa memmove memset select socket strchr strdup strerror strtol bzero mkdir sqrt strcasecmp strncasecmp pow getaddrinfo getopt_long flock strtod isinf])
 
 AC_CHECK_HEADERS([limits.h]) 
 AC_FUNC_CHOWN 
@@ -488,6 +508,7 @@ AC_CONFIG_SRCDIR(src)
 AC_CONFIG_HEADER(include/config.h)
 
 AM_CONDITIONAL(NOT_GETADDRINFO, test x${ac_cv_func_getaddrinfo} = xno)
+AM_CONDITIONAL(NOT_GETOPT_LONG, test x${ac_cv_func_getopt_long} = xno)
 
 AC_OUTPUT([Makefile
 	   man/Makefile

include/config.h.in

@@ -33,6 +33,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `flock' function. */
+#undef HAVE_FLOCK
+
 /* Define to 1 if you have the `floor' function. */
 #undef HAVE_FLOOR
 
@@ -45,6 +48,9 @@
 /* Define to 1 if you have the `gethostbyname' function. */
 #undef HAVE_GETHOSTBYNAME
 
+/* Define to 1 if you have the `getopt_long' function. */
+#undef HAVE_GETOPT_LONG
+
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
@@ -57,6 +63,15 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `isinf' function. */
+#undef HAVE_ISINF
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -143,6 +158,9 @@
 /* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 
+/* Define to 1 if you have the `strtod' function. */
+#undef HAVE_STRTOD
+
 /* Define to 1 if you have the `strtol' function. */
 #undef HAVE_STRTOL
 

man/Makefile.am

@@ -23,8 +23,11 @@ EXTRA_DIST = \
     rts2-grbd.xml \
     rts2-user.xml \
     rts2-telmodeltest.xml \
-    rts.devices.xml \
-    rts2-centrald.xml
+    rts2.devices.xml \
+    rts2-centrald.xml \
+    rts2-moodd.xml \
+    rts2-sensor-system.xml \
+    rts2-sensor-apcups.xml
 
 man_MANS = \
     rts2.7 \
@@ -51,7 +54,9 @@ man_MANS = \
     rts2-telmodeltest.1 \
     rts2.devices.5 \
     rts2-centrald.1 \
-    rts2-moodd.1
+    rts2-moodd.1 \
+    rts2-sensor-system.1 \
+    rts2-sensor-apcups.1
 
 doc_FOP = \
     rts2-man.fop \

man/rts2-grbd.xml

@@ -150,7 +150,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--server <replaceable class="parameter">server-name[:host]</replaceable></option></term>
+        <term><option>--server <replaceable class="parameter">server-name[:port]</replaceable></option></term>
         <listitem>
           <para>
 	    Specify name of the host and possibly port, which runs

man/rts2-image.xml

@@ -70,6 +70,9 @@
 	  <arg choice="plain">
       	    <option>-p <replaceable>RTS2 expression</replaceable></option>
 	  </arg>
+	  <arg choice="plain">
+      	    <option>-f <replaceable>RTS2 expression</replaceable></option>
+	  </arg>
 	  <arg choice="plain">
 	    <option>-c <replaceable>RTS2 expression</replaceable></option>
 	  </arg>
@@ -165,7 +168,17 @@
         <listitem>
           <para>
 	    Specify expresion to print out. For each file, expression will be
-	    printed to standard output, one expresion on each line.
+	    printed to standard output, one expresion on each line. Please see
+	    <citerefentry><refentrytitle>rts2.ini</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+	    for expresion descrition.
+	  </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-P <replaceable>RTS2 expression</replaceable></option></term>
+        <listitem>
+          <para>
+	    Similar to -p. Add filename to the beginning of line.
 	  </para>
         </listitem>
       </varlistentry>