From 5fe9ec571ef8f8f74ce9b5a5b9193404adc8f0af Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Tue, 16 Aug 2011 11:11:10 +0200 Subject: [PATCH 01/56] Introduce Autoconf source configuration file Heyu uses a custom configuration system. Migrate to Autoconf methods instead, for ease of the code portability maintenance, and for convenience of binary package maintainers. First step: create a configuration file for Autoconf The new source file, configure.ac, has been auto generated with autoscan utility, and will be further updated with following patches. Signed-off-by: Janusz Krzysztofik --- configure.ac | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 configure.ac diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..1ceb96f --- /dev/null +++ b/configure.ac @@ -0,0 +1,35 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.68]) +AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS]) +AC_CONFIG_SRCDIR([relay.c]) +AC_CONFIG_HEADERS([config.h]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_MAKE_SET + +# Checks for libraries. + +# Checks for header files. +AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h sys/filsys.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termio.h termios.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_UID_T +AC_TYPE_MODE_T +AC_TYPE_OFF_T +AC_TYPE_PID_T + +# Checks for library functions. +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_GETGROUPS +AC_FUNC_MALLOC +AC_FUNC_MKTIME +AC_FUNC_REALLOC +AC_FUNC_STRTOD +AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv socket sqrt strchr strdup strerror strrchr strstr strtol]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT From 46a5358abdf4446239c56b988c8338feda4c8310 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 11:24:12 +0200 Subject: [PATCH 02/56] Protect Configure from being overwritten by Autoconf Rename the Configure script to Configure.sh in order to protect it from being overwritten by the autoconf command, which creates a lower case named configure script from configure.ac source file. This may happen when a user tries to build Heyu from sources unpacked over a case insensitive filesystem, like HFS+ for example. A similar problem arose in the past with the INSTALL file, being overwritten with make implicit rules, copying install.sh to install while processing 'make install'. Signed-off-by: Janusz Krzysztofik --- Configure => Configure.sh | 4 +-- INSTALL | 52 +++++++++++++++++++-------------------- Makefile.in | 4 +-- README.INSTALL | 52 +++++++++++++++++++-------------------- README.webhook | 2 +- heyufaq.txt | 8 +++--- x10config.5 | 2 +- 7 files changed, 62 insertions(+), 62 deletions(-) rename Configure => Configure.sh (99%) diff --git a/Configure b/Configure.sh similarity index 99% rename from Configure rename to Configure.sh index fc3204a..749cc02 100755 --- a/Configure +++ b/Configure.sh @@ -25,7 +25,7 @@ SYS= cat > Makefile <> Makefile if [ "$SYS" = "sysv" ] ; then echo "The Makefile has been created for sysv, however if" echo "you are running under AT&T SysV r4, please re-run" -echo "Configure with the system type parameter attsvr4" +echo "Configure.sh with the system type parameter attsvr4" else echo "The Makefile has been created for $SYS." fi diff --git a/INSTALL b/INSTALL index e848665..7180685 100644 --- a/INSTALL +++ b/INSTALL @@ -16,7 +16,7 @@ Note: If you're upgrading from a previous version of Heyu, run 'heyu stop' under that version before proceeding. Quickstart: - sh ./Configure [option] (As a normal user) + sh ./Configure.sh [option] (As a normal user) make (As a normal user) su (Become superuser) make install (As superuser) @@ -39,15 +39,15 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- -The Configure script creates a Makefile by running 'uname -s' and then +The Configure.sh script creates a Makefile by running 'uname -s' and then adding known good configuration options to the Makefile. The contents of Makefile.in is then appended to the Makefile. Changes to the makefile -should be made in Configure or Makefile.in. +should be made in Configure.sh or Makefile.in. -If Configure can not figure out what your system is, you can try -sh ./Configure generic +If Configure.sh can not figure out what your system is, you can try +sh ./Configure.sh generic or -sh ./Configure sysv +sh ./Configure.sh sysv If those don't work, we'll have to figure it out by hand. Please contact the author so your discoveries can be integrated into the next release. @@ -87,7 +87,7 @@ at compile time with switches -flags=NN, -counters=NN, and -timers=NN. The specified NN must be in the range 1-1024 and will be rounded up to the nearest multiple of 32, e.g., - sh ./Configure -flags=64 -timers=75 + sh ./Configure.sh -flags=64 -timers=75 will allocate space for 64 flags and 96 timers, the latter because the specified 75 is rounded up to 96. The number of counters will @@ -100,53 +100,53 @@ in North America, users outside this region may wish to compile without CM17A support. Since the CM17A is both powered and actuated by the DTR and RTS serial lines, support for this device might as well also be omitted if your serial port hardware does not support these lines. -To do so, run the Configure step mentioned above with the '-nocm17a' +To do so, run the Configure.sh step mentioned above with the '-nocm17a' switch, i.e., - sh ./Configure -nocm17a + sh ./Configure.sh -nocm17a By default, support for Extended Type 0 (Shutter and Shade) commands is compiled into Heyu. As there is only one module known to support these commands (the 230V, 50Hz Marmitek SW10 Shutter Motor Controller -sold in Europe), this support may be omitted by using Configure with +sold in Europe), this support may be omitted by using Configure.sh with the '-noext0' switch, i.e., - sh ./Configure -noext0 + sh ./Configure.sh -noext0 By default, support for RFXSensors is compiled into Heyu. RFXSensors require a WGL W800RF32 or RFXCOM X10 RF receiver as well as a RFXSensor transmitter. This support may be omitted by including the '-norfxs' -switch with Configure, i.e., +switch with Configure.sh, i.e., - sh ./Configure -norfxs + sh ./Configure.sh -norfxs By default, support for RFXMeters is compiled into Heyu. RFXMeters requires a 433.92 MHz RFXCOM X10 RF receiver as well as the RFXMeter transmitter. This support may be omitted by including the '-norfxm' switch -with Configure, i.e., +with Configure.sh, i.e., - sh ./Configure -norfxm + sh ./Configure.sh -norfxm By default, support for the Digimax 210 remote thermostat is compiled into Heyu. The Digimax requires a 433.92 MHz RFXCOM X10 RF receiver as well as the Digimax transmitter. This support may be omitted by -including the '-nodmx' switch with Configure, i.e., +including the '-nodmx' switch with Configure.sh, i.e., - sh ./Configure -nodmx + sh ./Configure.sh -nodmx By default, support for Oregon RF sensors is compilied into Heyu. Oregon sensor support requires a 433.92 MHz RFXCOM X10 RF receiver as well as a supported model of Oregon sensor. This support may be -omitted by including the '-noore' switch with Configure, i.e., +omitted by including the '-noore' switch with Configure.sh, i.e., - sh ./Configure -noore + sh ./Configure.sh -noore By default, support for signals received from KaKu and HomeEasy transmitters is compiled into Heyu. KaKu/HomeEasy support requires a 433.92 MHz RFXCOM X10 RF receiver. This support may be omitted -by including the '-nokaku' switch with Configure, i.e., +by including the '-nokaku' switch with Configure.sh, i.e., - sh ./Configure -nokaku + sh ./Configure.sh -nokaku Notes for Mac OS X: @@ -170,9 +170,9 @@ has been found to work on the (few) Macs tested thusfar. Notes for AT&T SysV r4: ---------------------- The function uname(1) used to determine the system type for -Configure does not distinguish this OS from other sysv systems. -Supply the system type parameter "attsvr4" to Configure, i.e., -run 'sh ./Configure attsvr4'. +Configure.sh does not distinguish this OS from other sysv systems. +Supply the system type parameter "attsvr4" to Configure.sh, i.e., +run 'sh ./Configure.sh attsvr4'. Notes for OpenSolaris: --------------------- @@ -186,8 +186,8 @@ are on the system's PATH/MANPATH and the user is responsible for adding them to the PATH/MANPATH in order to have full use of Heyu. -The user may alternatively rerun Configure for "OpenSolaris_BSD", i.e., - sh ./Configure opensolaris_bsd +The user may alternatively rerun Configure.sh for "OpenSolaris_BSD", +i.e., 'sh ./Configure.sh opensolaris_bsd', which will set the directories using the BSD convention under the /usr/local tree, which however may be deleted when OpenSolaris is upgraded. diff --git a/Makefile.in b/Makefile.in index 84ea379..0c17e1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ## Makefile template for Heyu, a program to control an X10 CM11A computer ## interface. From this point on the Makefile is copied from Makefile.in -## by the Configure program +## by the Configure.sh program ## ## This program is free software: you can redistribute it and/or modify @@ -34,7 +34,7 @@ OBJS = date.o erase.o info.o message.o relay.o \ OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ - x10scripts.5 Configure Makefile.in install.sh AUTHORS COPYING INSTALL \ + x10scripts.5 Configure.sh Makefile.in install.sh AUTHORS COPYING INSTALL \ README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 README.webhook diff --git a/README.INSTALL b/README.INSTALL index e848665..7180685 100644 --- a/README.INSTALL +++ b/README.INSTALL @@ -16,7 +16,7 @@ Note: If you're upgrading from a previous version of Heyu, run 'heyu stop' under that version before proceeding. Quickstart: - sh ./Configure [option] (As a normal user) + sh ./Configure.sh [option] (As a normal user) make (As a normal user) su (Become superuser) make install (As superuser) @@ -39,15 +39,15 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- -The Configure script creates a Makefile by running 'uname -s' and then +The Configure.sh script creates a Makefile by running 'uname -s' and then adding known good configuration options to the Makefile. The contents of Makefile.in is then appended to the Makefile. Changes to the makefile -should be made in Configure or Makefile.in. +should be made in Configure.sh or Makefile.in. -If Configure can not figure out what your system is, you can try -sh ./Configure generic +If Configure.sh can not figure out what your system is, you can try +sh ./Configure.sh generic or -sh ./Configure sysv +sh ./Configure.sh sysv If those don't work, we'll have to figure it out by hand. Please contact the author so your discoveries can be integrated into the next release. @@ -87,7 +87,7 @@ at compile time with switches -flags=NN, -counters=NN, and -timers=NN. The specified NN must be in the range 1-1024 and will be rounded up to the nearest multiple of 32, e.g., - sh ./Configure -flags=64 -timers=75 + sh ./Configure.sh -flags=64 -timers=75 will allocate space for 64 flags and 96 timers, the latter because the specified 75 is rounded up to 96. The number of counters will @@ -100,53 +100,53 @@ in North America, users outside this region may wish to compile without CM17A support. Since the CM17A is both powered and actuated by the DTR and RTS serial lines, support for this device might as well also be omitted if your serial port hardware does not support these lines. -To do so, run the Configure step mentioned above with the '-nocm17a' +To do so, run the Configure.sh step mentioned above with the '-nocm17a' switch, i.e., - sh ./Configure -nocm17a + sh ./Configure.sh -nocm17a By default, support for Extended Type 0 (Shutter and Shade) commands is compiled into Heyu. As there is only one module known to support these commands (the 230V, 50Hz Marmitek SW10 Shutter Motor Controller -sold in Europe), this support may be omitted by using Configure with +sold in Europe), this support may be omitted by using Configure.sh with the '-noext0' switch, i.e., - sh ./Configure -noext0 + sh ./Configure.sh -noext0 By default, support for RFXSensors is compiled into Heyu. RFXSensors require a WGL W800RF32 or RFXCOM X10 RF receiver as well as a RFXSensor transmitter. This support may be omitted by including the '-norfxs' -switch with Configure, i.e., +switch with Configure.sh, i.e., - sh ./Configure -norfxs + sh ./Configure.sh -norfxs By default, support for RFXMeters is compiled into Heyu. RFXMeters requires a 433.92 MHz RFXCOM X10 RF receiver as well as the RFXMeter transmitter. This support may be omitted by including the '-norfxm' switch -with Configure, i.e., +with Configure.sh, i.e., - sh ./Configure -norfxm + sh ./Configure.sh -norfxm By default, support for the Digimax 210 remote thermostat is compiled into Heyu. The Digimax requires a 433.92 MHz RFXCOM X10 RF receiver as well as the Digimax transmitter. This support may be omitted by -including the '-nodmx' switch with Configure, i.e., +including the '-nodmx' switch with Configure.sh, i.e., - sh ./Configure -nodmx + sh ./Configure.sh -nodmx By default, support for Oregon RF sensors is compilied into Heyu. Oregon sensor support requires a 433.92 MHz RFXCOM X10 RF receiver as well as a supported model of Oregon sensor. This support may be -omitted by including the '-noore' switch with Configure, i.e., +omitted by including the '-noore' switch with Configure.sh, i.e., - sh ./Configure -noore + sh ./Configure.sh -noore By default, support for signals received from KaKu and HomeEasy transmitters is compiled into Heyu. KaKu/HomeEasy support requires a 433.92 MHz RFXCOM X10 RF receiver. This support may be omitted -by including the '-nokaku' switch with Configure, i.e., +by including the '-nokaku' switch with Configure.sh, i.e., - sh ./Configure -nokaku + sh ./Configure.sh -nokaku Notes for Mac OS X: @@ -170,9 +170,9 @@ has been found to work on the (few) Macs tested thusfar. Notes for AT&T SysV r4: ---------------------- The function uname(1) used to determine the system type for -Configure does not distinguish this OS from other sysv systems. -Supply the system type parameter "attsvr4" to Configure, i.e., -run 'sh ./Configure attsvr4'. +Configure.sh does not distinguish this OS from other sysv systems. +Supply the system type parameter "attsvr4" to Configure.sh, i.e., +run 'sh ./Configure.sh attsvr4'. Notes for OpenSolaris: --------------------- @@ -186,8 +186,8 @@ are on the system's PATH/MANPATH and the user is responsible for adding them to the PATH/MANPATH in order to have full use of Heyu. -The user may alternatively rerun Configure for "OpenSolaris_BSD", i.e., - sh ./Configure opensolaris_bsd +The user may alternatively rerun Configure.sh for "OpenSolaris_BSD", +i.e., 'sh ./Configure.sh opensolaris_bsd', which will set the directories using the BSD convention under the /usr/local tree, which however may be deleted when OpenSolaris is upgraded. diff --git a/README.webhook b/README.webhook index 4a76241..fbcf257 100644 --- a/README.webhook +++ b/README.webhook @@ -49,7 +49,7 @@ Categories for flaginfo and flagbankinfo: tzflags Timer-zero flags The "helpinfo" option displays the individual help menus available, -which will vary according to the Configure options selected when +which will vary according to the Configure.sh options selected when Heyu is compiled. The help menues will only be of interest for an interface which provides a Heyu command line. diff --git a/heyufaq.txt b/heyufaq.txt index b12a031..015a874 100644 --- a/heyufaq.txt +++ b/heyufaq.txt @@ -1,7 +1,7 @@ Frequently Asked Questions This FAQ applies to Heyu Version 2. -Last updated 02/14/2011 +Last updated 08/22/2011 Q: What is Heyu? @@ -89,9 +89,9 @@ A: The whole package is included in the file heyu-VERSION.tgz This is a CD to the directory of your choice. Copy the tarred file there and type: gunzip -c heyu-VERSION.tgz | tar xvf - - To compile the program, run the Configure program (./Configure) as an - ordinary user and then type 'make'. The resulting executable program - is named simply 'heyu'. + To compile the program, run the Configure.sh program (./Configure.sh) + as an ordinary user and then type 'make'. The resulting executable + program is named simply 'heyu'. To install the program and man pages, type 'make install' while logged in as root. It will try to locate your existing configuration file diff --git a/x10config.5 b/x10config.5 index b9f6986..c52fb65 100644 --- a/x10config.5 +++ b/x10config.5 @@ -19,7 +19,7 @@ subdirectory .heyu under your home directory, i.e., $HOME/.heyu/x10config .PP For system-wide use, the configuration file may alternatively be stored as file x10.conf in the directory /etc/heyu (or as otherwise defined in -Configure for your operating system). +Configure.sh for your operating system). .PP The configuration file may be located in an additional subdirectory level under either of the directories above. The additional subdirectory From 16c4acae99bd3ede227a3f10ab80d34f73b1b57e Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 2 Jan 2012 21:31:26 +0100 Subject: [PATCH 03/56] Introduce Autoconf generated config.h In the process of migration from custom Configure.sh to Autoconf methods, update automatically generated configure.ac source file (breaking excessively long lines while being at it) and generate a standard config.h header file from it during ./Configure.sh phase. Autoconf provided Makefile generation feature from Makefile.in template has been turned off for now, left off to the existing ./Configure.sh procedure. HAVE_CONFIG_H symbol and current directory as include source have been declared explicitly before we finally switch to also using Automake, which will provide those by default. For better readability, only configure.ac source file has been added to the sources for now. To run ./Configure.sh script successfully for the first time after unpacking the sources, the Autoconf package must be installed. Two missing intermediate files, config.h.in template and configure script, should be added before an official Heyu version with Autoconf support is released, in order to drop unnecessary Autoconf package dependency. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 15 +++++++++++++++ Makefile.in | 4 +++- configure.ac | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/Configure.sh b/Configure.sh index 749cc02..12ff25b 100755 --- a/Configure.sh +++ b/Configure.sh @@ -131,6 +131,17 @@ EoF shift done +test -x configure && test configure -nt configure.ac && \ +test -s config.h.in && test config.h.in -nt configure.ac || { + type autoconf >/dev/null && type autoheader >/dev/null || { + echo "Please install autoconf package and re-run ./Configure.sh" + rm Makefile + exit + } + autoconf + autoheader +} + cat <> Makefile +( set -x + ./configure +) + if [ "$SYS" = "sysv" ] ; then echo "The Makefile has been created for sysv, however if" echo "you are running under AT&T SysV r4, please re-run" diff --git a/Makefile.in b/Makefile.in index 0c17e1f..c28942f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,6 +18,8 @@ ## ## +CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. + SRCS = date.c erase.c info.c message.c relay.c \ monitor.c reset.c setclock.c stop.c \ tty.c x10.c xread.c xwrite.c status.c cm11a.c \ @@ -50,7 +52,7 @@ heyu: $(OBJS) version.h @echo "** Now become root and run 'make install' **" @echo "" -$(OBJS): x10.h process.h sun.h Makefile +$(OBJS): config.h x10.h process.h sun.h Makefile eeprom.o: eeprom.h info.o: version.h diff --git a/configure.ac b/configure.ac index 1ceb96f..4181241 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,33 @@ +# +# configure.ac - Autoconf source file for Heyu +# +# Copyright (C) 2011 Janusz Krzysztofik +# +# Derived from an initial version genereted automatically by the +# autoscan application. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS]) +AC_INIT([Heyu], [2.10+autotools], + [heyu@tickets.assembla.com], [heyu], [http://heyu.org]) +AC_COPYRIGHT([Heyu specific bits: +Copyright (C) 2011 Janusz Krzysztofik ]) AC_CONFIG_SRCDIR([relay.c]) AC_CONFIG_HEADERS([config.h]) @@ -13,7 +38,9 @@ AC_PROG_MAKE_SET # Checks for libraries. # Checks for header files. -AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h sys/filsys.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termio.h termios.h unistd.h]) +AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h]) +AC_CHECK_HEADERS([sys/filsys.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h]) +AC_CHECK_HEADERS([syslog.h termio.h termios.h unistd.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T @@ -29,7 +56,8 @@ AC_FUNC_MALLOC AC_FUNC_MKTIME AC_FUNC_REALLOC AC_FUNC_STRTOD -AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv socket sqrt strchr strdup strerror strrchr strstr strtol]) +AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv]) +AC_CHECK_FUNCS([socket sqrt strchr strdup strerror strrchr strstr strtol]) -AC_CONFIG_FILES([Makefile]) +dnl AC_CONFIG_FILES([Makefile]) AC_OUTPUT From d6f0daa8929c987ba9aea890b146b846bcff5892 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Thu, 18 Aug 2011 19:25:08 +0200 Subject: [PATCH 04/56] Check for libraries while running ./configure In order for selected function tests to succeed, like floor() and sqrt() on a Linux system, extra libraries may have to be linked in. Select a set of required libraries automatically with suitable Autoconf library checks. Since I was not able to find out what functions were supposed to be provided by libucb, libgen and libcmd libraries on the ATT SVR4 platform, I've left them not checked for. Moreover, functions I'm looking for in librt, libsocket and libposix are rather guessed than determined. Should linking Heyu ever break on any platform with error messages about missing symbols, required library test would have to be added or corrected, based on those messages. Signed-off-by: Janusz Krzysztofik --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 4181241..c31d461 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ AC_PROG_CC AC_PROG_MAKE_SET # Checks for libraries. +AC_SEARCH_LIBS([sqrt], [m]) +AC_SEARCH_LIBS([nanosleep], [rt]) +AC_SEARCH_LIBS([syslog], [socket]) +AC_SEARCH_LIBS([tcgetattr], [posix]) # Checks for header files. AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h]) From 2de6cfaa5b85c589c02e224f26b7684933ec494b Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Wed, 17 Aug 2011 03:22:56 +0200 Subject: [PATCH 05/56] Replace gid_t with config.h provided GETGROUPS_T Autoconf generated config.h provides a GETGROUPS_T macro that should be used in place of hardcoded gid_t, that is of limited portability. Use it. Signed-off-by: Janusz Krzysztofik --- tty.c | 8 ++++++++ x10.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tty.c b/tty.c index b26d965..15f6d2d 100644 --- a/tty.c +++ b/tty.c @@ -30,6 +30,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef SCO #define _IBCS2 #endif @@ -388,7 +392,11 @@ char *make_lock_name ( char *ttydev ) { char *devstr; int x, ngrps; +#ifdef GETGROUPS_T + GETGROUPS_T grps[30]; +#else gid_t grps[30]; +#endif char *ptr; struct stat stat_buf; diff --git a/x10.c b/x10.c index 09c3c16..787c6c8 100644 --- a/x10.c +++ b/x10.c @@ -28,6 +28,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -677,7 +681,11 @@ int reread_config ( void ) int check_dir_rw ( char *pathspec, char *label ) { struct stat statb; +#ifdef GETGROUPS_T + GETGROUPS_T grps[100]; +#else gid_t grps[100]; +#endif int ngrps, j; char errmsg[256]; int msgl = sizeof(errmsg) - 1; @@ -709,7 +717,7 @@ int check_dir_rw ( char *pathspec, char *label ) } if ( (statb.st_mode & S_IRWXG) == S_IRWXG ) { - if ( (ngrps = getgroups((sizeof(grps)/sizeof(gid_t)) - 1, grps)) < 0 ) { + if ( (ngrps = getgroups((sizeof(grps)/sizeof(typeof(*grps))) - 1, grps)) < 0 ) { snprintf(errmsg, msgl, "Internal error - getgroups()"); store_error_message(errmsg); return 1; From 1c0acaa6f5f59b979cb61fe2cbc38f8868c5834d Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Wed, 17 Aug 2011 03:37:48 +0200 Subject: [PATCH 06/56] Conditionally include non-portable header files Autoconf generated config.h.in provided us with many hints about potential portability issues in the Heyu code we may face if not having them addressed correctly. A significant amount of those hints is about header files that may not always exist. Include those potentially non-portable header files conditionally, using config.h.in supported macro definitions. Signed-off-by: Janusz Krzysztofik --- cm10a.c | 26 ++++++++++++++++++++++++++ cm17a.c | 28 ++++++++++++++++++++++++++++ cmd.c | 22 ++++++++++++++++++++++ config.c | 18 ++++++++++++++++++ date.c | 12 ++++++++++++ digimax.c | 13 +++++++++++++ eeprom.c | 9 +++++++++ erase.c | 5 +++++ modules.c | 10 ++++++++++ monitor.c | 25 +++++++++++++++++++++++++ oregon.c | 14 +++++++++++++- poll.c | 22 ++++++++++++++++++++++ process.c | 18 ++++++++++++++++++ process.h | 8 ++++++++ relay.c | 20 ++++++++++++++++++++ relay_aux.c | 19 +++++++++++++++++++ reset.c | 6 ++++++ rfxcom.c | 14 +++++++++++++- setclock.c | 12 ++++++++++++ status.c | 9 +++++++++ stop.c | 10 ++++++++++ sun.c | 8 ++++++++ timing.c | 5 +++++ tty.c | 30 ++++++++++++++++++++++++++++++ tty_aux.c | 32 ++++++++++++++++++++++++++++++++ x10.c | 14 ++++++++++++++ x10aux.c | 16 ++++++++++++++++ x10state.c | 20 ++++++++++++++++++++ xread.c | 18 ++++++++++++++++++ xsync.c | 23 +++++++++++++++++++++++ xwrite.c | 19 +++++++++++++++++++ 31 files changed, 503 insertions(+), 2 deletions(-) diff --git a/cm10a.c b/cm10a.c index 5b37496..5246303 100644 --- a/cm10a.c +++ b/cm10a.c @@ -32,10 +32,18 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif #include +#ifdef HAVE_STRING_H #include +#endif #include "x10.h" #include "process.h" @@ -45,7 +53,9 @@ #endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include #ifdef LINUX @@ -54,9 +64,15 @@ #include # endif #include +#ifdef HAVE_SYS_IOCTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #include @@ -65,22 +81,32 @@ #include # else # ifdef DARWIN +#ifdef HAVE_TERMIOS_H #include +#endif # else +#ifdef HAVE_TERMIO_H #include +#endif # endif # endif # endif #endif #if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifdef HASSELECT +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif extern int verbose; diff --git a/cm17a.c b/cm17a.c index 2f1652d..b73a3f4 100644 --- a/cm17a.c +++ b/cm17a.c @@ -32,12 +32,20 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef HASCM17A /* Compile only if configured for CM17A */ #include +#ifdef HAVE_STDLIB_H #include +#endif #include +#ifdef HAVE_STRING_H #include +#endif #include "x10.h" #include "process.h" @@ -47,11 +55,15 @@ #endif #ifdef ATTSVR4 +#ifdef HAVE_SYS_TIME_H #include #endif +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include #ifdef LINUX @@ -60,9 +72,15 @@ #include # endif #include +#ifdef HAVE_SYS_IOCTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #include @@ -71,22 +89,32 @@ #include # else # ifdef DARWIN +#ifdef HAVE_TERMIOS_H #include +#endif # else +#ifdef HAVE_TERMIO_H #include +#endif # endif # endif # endif #endif #if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifdef HASSELECT +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif extern int verbose; diff --git a/cmd.c b/cmd.c index a927942..c71daa7 100644 --- a/cmd.c +++ b/cmd.c @@ -33,26 +33,48 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #if (defined(NSLEEP) || defined(ATTSVR4)) +#ifdef HAVE_SYS_TIME_H #include +#endif #endif /* NSLEEP | ATTSVR4 */ #include #include +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_LIMITS_H #include +#endif #include "x10.h" #include "process.h" #include "x10state.h" diff --git a/config.c b/config.c index 73a0306..799323c 100644 --- a/config.c +++ b/config.c @@ -32,20 +32,38 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #include #include "x10.h" diff --git a/date.c b/date.c index 310e3e9..eff3b5d 100644 --- a/date.c +++ b/date.c @@ -25,18 +25,30 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include "x10.h" +#ifdef HAVE_UNISTD_H #include +#endif #ifdef SYSV +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif +#ifdef HAVE_SYS_PARAM_H #include +#endif #ifdef BEFORE +#ifdef HAVE_SYS_FILSYS_H #include #endif +#endif #include "x10.h" diff --git a/digimax.c b/digimax.c index 7972322..33e8d39 100644 --- a/digimax.c +++ b/digimax.c @@ -33,17 +33,30 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include "x10.h" #include "process.h" diff --git a/eeprom.c b/eeprom.c index 6f05fff..48c8fa6 100644 --- a/eeprom.c +++ b/eeprom.c @@ -21,11 +21,20 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include "eeprom.h" #include "process.h" diff --git a/erase.c b/erase.c index c08eba0..d80d111 100644 --- a/erase.c +++ b/erase.c @@ -21,11 +21,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include #include "x10.h" +#ifdef HAVE_STRING_H #include +#endif extern int tty; extern int sptty; diff --git a/modules.c b/modules.c index 92683c6..02b8267 100644 --- a/modules.c +++ b/modules.c @@ -34,13 +34,23 @@ * along with this program. If not, see . */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif +#ifdef HAVE_STDLIB_H #include +#endif #include #include "process.h" #include "oregon.h" diff --git a/monitor.c b/monitor.c index cdf9be6..8d3e07f 100644 --- a/monitor.c +++ b/monitor.c @@ -21,24 +21,47 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif #include #include #include +#ifdef HAVE_SYSLOG_H #include +#endif #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include @@ -48,8 +71,10 @@ #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif extern int timeout; extern int sptty; diff --git a/oregon.c b/oregon.c index 38c3f60..7aa3341 100644 --- a/oregon.c +++ b/oregon.c @@ -33,19 +33,31 @@ * */ - +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #include #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include "x10.h" #include "process.h" diff --git a/poll.c b/poll.c index 4c71c4e..77ba014 100644 --- a/poll.c +++ b/poll.c @@ -42,30 +42,52 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include #include #include "x10.h" +#ifdef HAVE_SYSLOG_H #include +#endif #include "process.h" #include "x10state.h" #include "oregon.h" #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif extern int sptty; diff --git a/process.c b/process.c index fa41be6..e999c08 100644 --- a/process.c +++ b/process.c @@ -33,20 +33,38 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include "x10.h" #include "sun.h" diff --git a/process.h b/process.h index 5c7bf95..89691dd 100644 --- a/process.h +++ b/process.h @@ -32,8 +32,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif #include /* Some array length limits */ diff --git a/relay.c b/relay.c index 45e1c79..b935aa1 100644 --- a/relay.c +++ b/relay.c @@ -39,6 +39,10 @@ * unlink the x10_tty file */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef SCO #define _IBCS2 #endif @@ -48,18 +52,34 @@ #include #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #ifdef LINUX #include #endif +#ifdef HAVE_LIMITS_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif #include "x10.h" #include "process.h" diff --git a/relay_aux.c b/relay_aux.c index d295140..920c4c7 100644 --- a/relay_aux.c +++ b/relay_aux.c @@ -33,6 +33,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef SCO #define _IBCS2 @@ -43,18 +46,34 @@ #include #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #ifdef LINUX #include #endif +#ifdef HAVE_LIMITS_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif #include "x10.h" #include "process.h" diff --git a/reset.c b/reset.c index 9d15259..1fd090c 100644 --- a/reset.c +++ b/reset.c @@ -26,10 +26,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include +#ifdef HAVE_SYSLOG_H #include +#endif #include "x10.h" #include "process.h" diff --git a/rfxcom.c b/rfxcom.c index 8c704c8..113dd40 100644 --- a/rfxcom.c +++ b/rfxcom.c @@ -33,18 +33,30 @@ * */ - +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include "x10.h" #include "process.h" diff --git a/setclock.c b/setclock.c index d505a43..8d8310f 100644 --- a/setclock.c +++ b/setclock.c @@ -30,13 +30,25 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_SYS_TYPES_H #include +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include "x10.h" +#ifdef HAVE_SYSLOG_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif #include #include "process.h" diff --git a/status.c b/status.c index a70c41d..ad9dbd1 100644 --- a/status.c +++ b/status.c @@ -21,12 +21,21 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include +#ifdef HAVE_STRINGS_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include "x10.h" diff --git a/stop.c b/stop.c index 3ab7b5e..31bdebb 100644 --- a/stop.c +++ b/stop.c @@ -21,6 +21,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #if 0 @@ -28,9 +32,15 @@ #include "process.h" #endif #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include "x10.h" #include "process.h" diff --git a/sun.c b/sun.c index d7b82ab..cff54dd 100644 --- a/sun.c +++ b/sun.c @@ -23,9 +23,17 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef HAVE_STDLIB_H #include +#endif #include +#ifdef HAVE_STRING_H #include +#endif #include #include diff --git a/timing.c b/timing.c index c050030..cecd955 100644 --- a/timing.c +++ b/timing.c @@ -32,9 +32,14 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include /*----------------------------------------------------------------------------+ diff --git a/tty.c b/tty.c index 15f6d2d..b28d377 100644 --- a/tty.c +++ b/tty.c @@ -40,20 +40,40 @@ #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif #include #include +#ifdef HAVE_STRINGS_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIMITS_H #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif #ifdef SOLARIS +#ifdef HAVE_STRINGS_H #include #endif +#endif #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #include @@ -95,25 +115,35 @@ int sptty = -1; /* Spool */ #endif #ifdef NETBSD +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifndef SYSV +#ifdef HAVE_SGTTY_H #include +#endif struct sgttyb oldsb, newsb; void hangup(); #else #ifndef POSIX +#ifdef HAVE_TERMIO_H #include +#endif #ifndef NCC #define NCC NCCS #endif struct termio oldsb, newsb; #else +#ifdef HAVE_TERMIOS_H #include +#endif #ifdef DARWIN +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifndef NCC #define NCC NCCS #endif diff --git a/tty_aux.c b/tty_aux.c index 63389e5..d1e0a59 100644 --- a/tty_aux.c +++ b/tty_aux.c @@ -30,26 +30,50 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef SCO #define _IBCS2 #endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif #include #include +#ifdef HAVE_STRINGS_H #include +#endif +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_LIMITS_H #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif #ifdef SOLARIS +#ifdef HAVE_STRINGS_H #include #endif +#endif #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #include @@ -91,21 +115,29 @@ int tty_aux = -1; /* Real tty */ #ifndef SYSV +#ifdef HAVE_SGTTY_H #include +#endif struct sgttyb oldsb, newsb; void hangup(); #else #ifndef POSIX +#ifdef HAVE_TERMIO_H #include +#endif #ifndef NCC #define NCC NCCS #endif struct termio oldsb, newsb; #else +#ifdef HAVE_TERMIOS_H #include +#endif #if defined(DARWIN) || defined(NETBSD) +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifndef NCC #define NCC NCCS #endif diff --git a/x10.c b/x10.c index 787c6c8..35a2304 100644 --- a/x10.c +++ b/x10.c @@ -33,26 +33,40 @@ #endif #include +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include #include #include "x10.h" #include "version.h" +#ifdef HAVE_SYSLOG_H #include +#endif #include "process.h" #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif extern int tty; extern int sptty; diff --git a/x10aux.c b/x10aux.c index 4678e31..da334d2 100644 --- a/x10aux.c +++ b/x10aux.c @@ -33,14 +33,30 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STRING_H #include +#endif +#ifdef HAVE_STDLIB_H #include +#endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD)) #include #else diff --git a/x10state.c b/x10state.c index ede0924..44df359 100644 --- a/x10state.c +++ b/x10state.c @@ -32,20 +32,40 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include #if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) +#ifdef HAVE_STRING_H #include +#endif #else +#ifdef HAVE_STRINGS_H #include #endif +#endif #include +#ifdef HAVE_SYS_TYPES_H #include +#endif +#ifdef HAVE_SYS_STAT_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif +#ifdef HAVE_SYS_TIME_H #include +#endif #ifdef POSIX #define EXEC_POSIX diff --git a/xread.c b/xread.c index d46e51d..e19e19a 100644 --- a/xread.c +++ b/xread.c @@ -29,8 +29,14 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#ifdef HAVE_STDLIB_H #include +#endif #include #include #if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD) || defined(NETBSD)) @@ -38,13 +44,21 @@ #else #include #endif +#ifdef HAVE_SYSLOG_H #include +#endif +#ifdef HAVE_FCNTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif #include "x10.h" #if (defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) || defined(SYSV) || defined(OPENBSD) || defined(NETBSD)) +#ifdef HAVE_STRING_H #include /* char *strerror(); */ #endif +#endif #include @@ -58,8 +72,12 @@ extern int tty; unsigned alarm(); void sigtimer( int ); #ifdef HAS_ITIMER +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif struct itimerval iold, icurrent; #endif int xread ( int, unsigned char *, int, int ); diff --git a/xsync.c b/xsync.c index c4924f5..f1e1444 100644 --- a/xsync.c +++ b/xsync.c @@ -32,9 +32,14 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include +#ifdef HAVE_STDLIB_H #include +#endif #include #if 0 #include "x10.h" @@ -47,7 +52,9 @@ #endif #include +#ifdef HAVE_UNISTD_H #include +#endif #include #ifdef LINUX @@ -56,9 +63,15 @@ #include # endif #include +#ifdef HAVE_SYS_IOCTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #include @@ -67,22 +80,32 @@ #include # else # ifdef DARWIN +#ifdef HAVE_TERMIOS_H #include +#endif # else +#ifdef HAVE_TERMIO_H #include +#endif # endif # endif # endif #endif #if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif #ifdef HASSELECT +#ifdef HAVE_SYS_TIME_H #include +#endif +#ifdef HAVE_SYS_TYPES_H #include #endif +#endif #include "x10.h" #include "process.h" diff --git a/xwrite.c b/xwrite.c index e4ef8c0..bb7e7e3 100644 --- a/xwrite.c +++ b/xwrite.c @@ -21,6 +21,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif #include #include @@ -31,7 +34,9 @@ #endif #include +#ifdef HAVE_UNISTD_H #include +#endif #ifdef LINUX #include @@ -39,9 +44,15 @@ #include # endif #include +#ifdef HAVE_SYS_IOCTL_H #include +#endif +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_SYSLOG_H #include +#endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #include @@ -50,19 +61,27 @@ #include # else # ifdef DARWIN +#ifdef HAVE_TERMIOS_H #include +#endif # else +#ifdef HAVE_TERMIO_H #include +#endif # endif # endif # endif #endif #if (defined(OSF) || defined(DARWIN)) +#ifdef HAVE_SYS_IOCTL_H #include #endif +#endif +#ifdef HAVE_STRING_H #include +#endif #include "x10.h" #include "process.h" From c2e0639dab6a3eaea37fdcec335dacf74b9dc112 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:45:24 +0200 Subject: [PATCH 07/56] Replace custom checks/macros with Autoconf equivalents There are a few checks for system calls or library functions availability, performed while running the Heyu custom Configure.sh script. Resulting macros are stored in the custom local.h header file. There is also a hardcoded macro, put as a compiler option into the Configure.sh generated Makefile for selected host types, which enables source code paths that call sigitimer(). Replace all above with Autoconf provided tests and resulting macros. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 74 ++-------------------------------------------------- Makefile.in | 6 ++--- configure.ac | 2 ++ process.c | 3 +-- x10.h | 2 -- x10state.c | 5 ++-- xread.c | 11 ++++---- 7 files changed, 15 insertions(+), 88 deletions(-) diff --git a/Configure.sh b/Configure.sh index 12ff25b..09ab223 100755 --- a/Configure.sh +++ b/Configure.sh @@ -166,7 +166,7 @@ case "$SYS" in GROUP = root CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLINUX -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG LIBS = -lm -lc EoF ;; @@ -321,7 +321,7 @@ EoF CC = gcc CFLAGS = -g \$(DFLAGS) LIBS = -lm -lc - DFLAGS = -DSYSV -DHAS_ITIMER -DOSF1 -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DOSF1 -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; generic) @@ -342,76 +342,6 @@ EoF ;; esac -# echo "checking for unsigned long long variable type" - -rm -f local.h - -rm -f testull.c testull -cat > testull.c </dev/null 2>&1 -if [ $? = 0 ] ; then - echo "#define HASULL" >> local.h -# echo "Has unsigned long long" -# else -# echo "Does not have unsigned long long" -fi -rm -f testull.c testull - -# echo "checking for siginterrupt()" - -rm -f testsigi.c testsigi -cat > testsigi.c < -int main() -{ - int x; - x=siginterrupt(SIGALRM,1); - return 0; -} -EoF -$CC -o testsigi testsigi.c >/dev/null 2>&1 -if [ $? = 0 ] ; then - echo "#define HASSIGINT" >> local.h -# echo "Using siginterrupt()" -# else -# echo "Not using siginterrupt()" -fi -rm -f testsigi.c testsigi - - -# echo "checking for sigaction()" - -rm -f testsiga.c testsiga -cat > testsiga.c < -int main() -{ - int x; - struct sigaction act, old; - x=sigaction(SIGALRM, &act, &old); - return 0; -} -EoF -$CC -o testsiga testsiga.c >/dev/null 2>&1 -if [ $? = 0 ] ; then - echo "#define HASSIGACT" >>local.h -# echo "Using sigaction()" -# else -# echo "Not using sigaction()" -fi -rm -f testsiga.c testsiga - -if [ ! -f local.h ] ; then - touch local.h -fi - cat >> Makefile <owl_calib_energy * (configp->owl_voltage / OWLVREF); sprintf(minibuf, "X10_owlEnergy=%.4f", dblenergy); *ep++ = add_envptr(minibuf); -#ifdef HASULL +#ifdef HAVE_UNSIGNED_LONG_LONG_INT sprintf(minibuf, "X10_owlEnergyCount=%lld", (unsigned long long)x10global.longvdata3 << 32 | (unsigned long long)x10global.longvdata2); #else @@ -8290,7 +8289,7 @@ static struct { *ep++ = add_envptr(minibuf); sprintf(minibuf, "%s_%s_owlEnergy=%.4f", configp->env_alias_prefix, aliaslabel, dblenergy); *ep++ = add_envptr(minibuf); -#ifdef HASULL +#ifdef HAVE_UNSIGNED_LONG_LONG_INT sprintf(minibuf, "X10_%c%d_owlEnergyCount=%llu", hc, unit, (unsigned long long)x10global.data_storage[loc + 2] << 32 | (unsigned long long)x10global.data_storage[loc + 1]); #else diff --git a/xread.c b/xread.c index e19e19a..a8ac8a2 100644 --- a/xread.c +++ b/xread.c @@ -63,7 +63,6 @@ #include #include "process.h" -#include "local.h" extern int verbose; extern int i_am_relay, i_am_aux; @@ -71,7 +70,7 @@ extern int tty; unsigned alarm(); void sigtimer( int ); -#ifdef HAS_ITIMER +#ifdef HAVE_SETITIMER #ifdef HAVE_SYS_TIME_H #include #endif @@ -138,7 +137,7 @@ unsigned char *buf; (void)alarm(0); (void) signal(SIGALRM, sigtimer); -#ifdef HAS_ITIMER +#ifdef HAVE_SETITIMER icurrent.it_interval.tv_sec = 0; icurrent.it_interval.tv_usec = 0; icurrent.it_value.tv_sec = timeout; @@ -288,7 +287,7 @@ void sxread_isr_1( int signo ) } -#if defined(HASSIGACT) +#if defined(HAVE_SIGACTION) /*--------------------------------------------------------+ | An interruptable read() like xread(), but from a | | serial port file descriptor. Needs sigaction() | @@ -344,7 +343,7 @@ int sxread ( int fd, unsigned char *buffer, int size, int timeout ) } -#elif defined(HASSIGINT) +#elif defined(HAVE_SIGINTERRUPT) /*--------------------------------------------------------+ | An interruptable read() like xread(), but from a | | serial port file descriptor. Needs siginterrupt() | @@ -531,7 +530,7 @@ int xread ( int fd, unsigned char *buffer, int count, int timeout ) (void)alarm(0); (void) signal(SIGALRM, xread_sigtimer); -#ifdef HAS_ITIMER +#ifdef HAVE_SETITIMER icurrent.it_interval.tv_sec = 0; icurrent.it_interval.tv_usec = 0; icurrent.it_value.tv_sec = timeout; From 65ec6b070fd73bfa860ce4c42c47dec9493bd35f Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:47:12 +0200 Subject: [PATCH 08/56] Add more Autoconf checks for platform specific headers There are several conditional includes in the Heyu source files, based on custom system type dependent macros provided by Configure.sh script. In preparation for removal of that script arbitrary selections in favour of Autoconf generated rules, add checks for availability of those conditionally included header files and use resulting macros in include conditions. For consistency, also use those macros wherever the same headers were included unconditionally so far. Signed-off-by: Janusz Krzysztofik --- cm10a.c | 10 ++++++++++ cm17a.c | 10 ++++++++++ configure.ac | 3 +++ monitor.c | 2 ++ process.c | 2 ++ relay.c | 4 ++++ relay_aux.c | 4 ++++ tty.c | 6 ++++++ tty_aux.c | 6 ++++++ x10aux.c | 4 ++++ x10state.c | 10 ++++++++++ xread.c | 4 ++++ xsync.c | 10 ++++++++++ xwrite.c | 10 ++++++++++ 14 files changed, 85 insertions(+) diff --git a/cm10a.c b/cm10a.c index 5246303..c575a20 100644 --- a/cm10a.c +++ b/cm10a.c @@ -59,11 +59,17 @@ #include #ifdef LINUX +#ifdef HAVE_ASM_IOCTLS_H #include +#endif # ifdef OLDLINUX +#ifdef HAVE_LINUX_SERIAL_REG_H #include +#endif # endif +#ifdef HAVE_LINUX_SERIAL_H #include +#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -75,10 +81,14 @@ #endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) +#ifdef HAVE_SYS_TERMIOS_H #include +#endif # else # ifdef SCO +#ifdef HAVE_SYS_TERMIO_H #include +#endif # else # ifdef DARWIN #ifdef HAVE_TERMIOS_H diff --git a/cm17a.c b/cm17a.c index b73a3f4..3f39d0f 100644 --- a/cm17a.c +++ b/cm17a.c @@ -67,11 +67,17 @@ #include #ifdef LINUX +#ifdef HAVE_ASM_IOCTLS_H #include +#endif # ifdef OLDLINUX +#ifdef HAVE_LINUX_SERIAL_REG_H #include +#endif # endif +#ifdef HAVE_LINUX_SERIAL_H #include +#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -83,10 +89,14 @@ #endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) +#ifdef HAVE_SYS_TERMIOS_H #include +#endif # else # ifdef SCO +#ifdef HAVE_SYS_TERMIO_H #include +#endif # else # ifdef DARWIN #ifdef HAVE_TERMIOS_H diff --git a/configure.ac b/configure.ac index 3ad6c5a..fafec7d 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,9 @@ AC_SEARCH_LIBS([tcgetattr], [posix]) AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h]) AC_CHECK_HEADERS([sys/filsys.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h]) AC_CHECK_HEADERS([syslog.h termio.h termios.h unistd.h]) +AC_CHECK_HEADERS([asm/ioctls.h errno.h linux/serial.h linux/serial_reg.h pty.h]) +AC_CHECK_HEADERS([sys/errno.h sys/resource.h sys/termio.h sys/termios.h]) +AC_HEADER_SYS_WAIT # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T diff --git a/monitor.c b/monitor.c index 8d3e07f..9fd8fff 100644 --- a/monitor.c +++ b/monitor.c @@ -49,7 +49,9 @@ #endif #include #include +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/process.c b/process.c index 999142c..a648010 100644 --- a/process.c +++ b/process.c @@ -55,7 +55,9 @@ #endif #endif #include +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/relay.c b/relay.c index b935aa1..3c1bb3f 100644 --- a/relay.c +++ b/relay.c @@ -50,7 +50,9 @@ #include #include #include +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_STRING_H #include @@ -59,8 +61,10 @@ #include #endif #ifdef LINUX +#ifdef HAVE_SYS_RESOURCE_H #include #endif +#endif #ifdef HAVE_LIMITS_H #include #endif diff --git a/relay_aux.c b/relay_aux.c index 920c4c7..5f43b0c 100644 --- a/relay_aux.c +++ b/relay_aux.c @@ -44,7 +44,9 @@ #include #include #include +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_STRING_H #include @@ -53,8 +55,10 @@ #include #endif #ifdef LINUX +#ifdef HAVE_SYS_RESOURCE_H #include #endif +#endif #ifdef HAVE_LIMITS_H #include #endif diff --git a/tty.c b/tty.c index b28d377..ab3cd08 100644 --- a/tty.c +++ b/tty.c @@ -49,8 +49,12 @@ #ifdef HAVE_FCNTL_H #include #endif +#ifdef HAVE_SYS_RESOURCE_H #include +#endif +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_STRINGS_H #include #endif @@ -76,8 +80,10 @@ #endif #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ +#ifdef HAVE_PTY_H #include #endif +#endif #include "x10.h" #include "process.h" diff --git a/tty_aux.c b/tty_aux.c index d1e0a59..be1a5e0 100644 --- a/tty_aux.c +++ b/tty_aux.c @@ -49,8 +49,12 @@ #ifdef HAVE_FCNTL_H #include #endif +#ifdef HAVE_SYS_RESOURCE_H #include +#endif +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_STRINGS_H #include #endif @@ -76,8 +80,10 @@ #endif #ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ +#ifdef HAVE_PTY_H #include #endif +#endif #include #include diff --git a/x10aux.c b/x10aux.c index da334d2..1f73819 100644 --- a/x10aux.c +++ b/x10aux.c @@ -58,10 +58,14 @@ #include #endif #if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD)) +#ifdef HAVE_ERRNO_H #include +#endif #else +#ifdef HAVE_SYS_ERRNO_H #include #endif +#endif #include #include "x10.h" diff --git a/x10state.c b/x10state.c index 144d318..a838b7d 100644 --- a/x10state.c +++ b/x10state.c @@ -53,7 +53,9 @@ #include #endif #endif +#ifdef HAVE_ERRNO_H #include +#endif #ifdef HAVE_SYS_TYPES_H #include #endif @@ -72,8 +74,16 @@ #endif #ifdef EXEC_POSIX +#ifdef HAVE_SYS_WAIT_H #include #endif +#endif +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif #include #include diff --git a/xread.c b/xread.c index a8ac8a2..c9d4592 100644 --- a/xread.c +++ b/xread.c @@ -40,10 +40,14 @@ #include #include #if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD) || defined(NETBSD)) +#ifdef HAVE_ERRNO_H #include +#endif #else +#ifdef HAVE_SYS_ERRNO_H #include #endif +#endif #ifdef HAVE_SYSLOG_H #include #endif diff --git a/xsync.c b/xsync.c index f1e1444..afe6f73 100644 --- a/xsync.c +++ b/xsync.c @@ -58,11 +58,17 @@ #include #ifdef LINUX +#ifdef HAVE_ASM_IOCTLS_H #include +#endif # ifdef OLDLINUX +#ifdef HAVE_LINUX_SERIAL_REG_H #include +#endif # endif +#ifdef HAVE_LINUX_SERIAL_H #include +#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -74,10 +80,14 @@ #endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) +#ifdef HAVE_SYS_TERMIOS_H #include +#endif # else # ifdef SCO +#ifdef HAVE_SYS_TERMIO_H #include +#endif # else # ifdef DARWIN #ifdef HAVE_TERMIOS_H diff --git a/xwrite.c b/xwrite.c index bb7e7e3..29841d1 100644 --- a/xwrite.c +++ b/xwrite.c @@ -39,11 +39,17 @@ #endif #ifdef LINUX +#ifdef HAVE_ASM_IOCTLS_H #include +#endif # ifdef OLDLINUX +#ifdef HAVE_LINUX_SERIAL_REG_H #include +#endif # endif +#ifdef HAVE_LINUX_SERIAL_H #include +#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -55,10 +61,14 @@ #endif #else # if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) +#ifdef HAVE_SYS_TERMIOS_H #include +#endif # else # ifdef SCO +#ifdef HAVE_SYS_TERMIO_H #include +#endif # else # ifdef DARWIN #ifdef HAVE_TERMIOS_H From e27cfdb58ae4c01c566fa03e6e7c59675ed33add Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sat, 6 Aug 2011 02:56:25 +0200 Subject: [PATCH 09/56] Get rid of the custom HASSELECT macro After the select() function call has been removed from the Heyu code, the custom HASSELECT macro usage has been limited to conditionally including a few header files, now having their own dedicated availability checks/macros. Then, the macro is no longer required and can be dropped completely. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 16 ++++++++-------- cm10a.c | 2 -- cm17a.c | 2 -- xsync.c | 2 -- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Configure.sh b/Configure.sh index 09ab223..734ae2a 100755 --- a/Configure.sh +++ b/Configure.sh @@ -183,7 +183,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -206,7 +206,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG + DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -224,7 +224,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASSELECT -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -236,7 +236,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DHASSELECT -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; openbsd) @@ -246,14 +246,14 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DHASSELECT -DNEEDGTIME -DOPENBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DNEEDGTIME -DOPENBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; netbsd) cat >> Makefile <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DPOSIX -DNETBSD -DHASSELECT -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DNETBSD -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -263,7 +263,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = wheel - DFLAGS = -DPOSIX -DDARWIN -DHASSELECT $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DDARWIN $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -279,7 +279,7 @@ EoF MAN5 = /usr/local/man/man.5 CFLAGS = -O \$(DFLAGS) LIBS = -lm -lc -lsocket - DFLAGS= -DSYSV -DHASSELECT -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DSYSV -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; aix|sysv) diff --git a/cm10a.c b/cm10a.c index c575a20..998c5da 100644 --- a/cm10a.c +++ b/cm10a.c @@ -109,14 +109,12 @@ #endif #endif -#ifdef HASSELECT #ifdef HAVE_SYS_TIME_H #include #endif #ifdef HAVE_SYS_TYPES_H #include #endif -#endif extern int verbose; diff --git a/cm17a.c b/cm17a.c index 3f39d0f..feeb25d 100644 --- a/cm17a.c +++ b/cm17a.c @@ -117,14 +117,12 @@ #endif #endif -#ifdef HASSELECT #ifdef HAVE_SYS_TIME_H #include #endif #ifdef HAVE_SYS_TYPES_H #include #endif -#endif extern int verbose; diff --git a/xsync.c b/xsync.c index afe6f73..beb561f 100644 --- a/xsync.c +++ b/xsync.c @@ -108,14 +108,12 @@ #endif #endif -#ifdef HASSELECT #ifdef HAVE_SYS_TIME_H #include #endif #ifdef HAVE_SYS_TYPES_H #include #endif -#endif #include "x10.h" #include "process.h" From 121de8fceb2aab552f02991ca6c1b7fe8e1cc761 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:48:25 +0200 Subject: [PATCH 10/56] Get rid of the custom NSLEEP macro Still in preparation for substitution of the Heyu custom Configure.sh script arbitrary selections with Autoconf provided equivalents, add a check for nsleep() function availability. Replace the custom NSLEEP macro with the resulting HAVE_NSLEEP wherever used for compiling the nsleep() conditionally. It should be also safe to drop all ifdefs containing NSLEEP where used for conditional inclusion of header files, now having their dedicated availability checks and macros. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 2 +- cm17a.c | 2 +- cmd.c | 10 ++++------ configure.ac | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Configure.sh b/Configure.sh index 734ae2a..b80afb6 100755 --- a/Configure.sh +++ b/Configure.sh @@ -289,7 +289,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS = -DSYSV -DPOSIX -DNSLEEP $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; attsvr4) diff --git a/cm17a.c b/cm17a.c index feeb25d..7c05eb0 100644 --- a/cm17a.c +++ b/cm17a.c @@ -238,7 +238,7 @@ static void stdtimer ( void ) { long microsec = configp->cm17a_bit_delay; -#ifdef NSLEEP +#ifdef HAVE_NSLEEP struct timestruc_t tspec; tspec.tv_sec = microsec / 1000000L; diff --git a/cmd.c b/cmd.c index c71daa7..44ad167 100644 --- a/cmd.c +++ b/cmd.c @@ -61,11 +61,9 @@ #endif #endif -#if (defined(NSLEEP) || defined(ATTSVR4)) #ifdef HAVE_SYS_TIME_H #include #endif -#endif /* NSLEEP | ATTSVR4 */ #include #include @@ -891,7 +889,7 @@ double random_float ( void ) +---------------------------------------------------------------------*/ void millisleep( long millisec ) { - #ifdef NSLEEP + #ifdef HAVE_NSLEEP struct timestruc_t tspec; if ( millisec == 0 ) @@ -920,7 +918,7 @@ void millisleep( long millisec ) tspec.tv_nsec = 1000000L * (millisec % 1000); while ( nanosleep( &tspec, &tspec ) == -1 ); #endif /* ATTSVR4 */ - #endif /* NSLEEP */ + #endif /* HAVE_NSLEEP */ return; } @@ -930,7 +928,7 @@ void millisleep( long millisec ) +---------------------------------------------------------------------*/ void microsleep( long microsec ) { - #ifdef NSLEEP + #ifdef HAVE_NSLEEP struct timestruc_t tspec; if ( microsec == 0 ) @@ -959,7 +957,7 @@ void microsleep( long microsec ) tspec.tv_nsec = 1000L * (microsec % 1000000L); while ( nanosleep( &tspec, &tspec ) == -1 ); #endif /* ATTSVR4 */ - #endif /* NSLEEP */ + #endif /* HAVE_NSLEEP */ return; } diff --git a/configure.ac b/configure.ac index fafec7d..98cf508 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ AC_FUNC_REALLOC AC_FUNC_STRTOD AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv]) AC_CHECK_FUNCS([socket sqrt strchr strdup strerror strrchr strstr strtol]) -AC_CHECK_FUNCS([setitimer sigaction siginterrupt]) +AC_CHECK_FUNCS([nsleep setitimer sigaction siginterrupt]) dnl AC_CONFIG_FILES([Makefile]) AC_OUTPUT From bc545b220aa32c342d6f013b1c32bdd95444a2c4 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:49:25 +0200 Subject: [PATCH 11/56] Avoid using custom ATTSVR4 build time macro There is a macro, ATTSVR4, set with the Heyu Configure.sh script when an ATT flavour of a UNIX system is detected. This macro is then used at compile time for conditional inclusion of some header files, as well as for selecting usleep() as a replacement for nanosleep(), which is supposed to be missing. Since all conditionally included header files have already their Autoconf based conditions in place, there is no need to use the ATTSVR4 for this purpose any longer. However, there are cases where this macro is used, together with others, in #ifdef..#else..#endif constructs, which may require a different approach, so we leave them untouched for now. For selecting usleep() over nanosleep(), we replace this macro with a negation of the one generated with Autoconf check for nanosleep() availability. Signed-off-by: Janusz Krzysztofik --- cm17a.c | 6 ++---- cmd.c | 14 +++++++------- configure.ac | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cm17a.c b/cm17a.c index 7c05eb0..eb94e7a 100644 --- a/cm17a.c +++ b/cm17a.c @@ -54,11 +54,9 @@ #undef _IBCS2 /* conflicts with SVID3 */ #endif -#ifdef ATTSVR4 #ifdef HAVE_SYS_TIME_H #include #endif -#endif #include #ifdef HAVE_UNISTD_H @@ -247,7 +245,7 @@ static void stdtimer ( void ) while ( nsleep( &tspec, &tspec ) == -1 ); return; #else -#ifdef ATTSVR4 +#ifndef HAVE_NANOSLEEP struct timeval tspec; tspec.tv_sec = microsec / 1000000; @@ -260,7 +258,7 @@ static void stdtimer ( void ) tspec.tv_nsec = 1000L * (microsec % 1000000L); while ( nanosleep( &tspec, &tspec ) == -1 ); -#endif /* ATTSVR4 */ +#endif /* HAVE_NANOSLEEP */ return; #endif } diff --git a/cmd.c b/cmd.c index 44ad167..77e73a9 100644 --- a/cmd.c +++ b/cmd.c @@ -900,16 +900,16 @@ void millisleep( long millisec ) while ( nsleep( &tspec, &tspec ) == -1 ); #else -#ifdef ATTSVR4 +#ifndef HAVE_NANOSLEEP struct timeval tspec; #else struct timespec tspec; -#endif /* ATTSVR4 */ +#endif /* HAVE_NANOSLEEP */ if ( millisec == 0 ) return; -#ifdef ATTSVR4 +#ifndef HAVE_NANOSLEEP tspec.tv_sec = millisec / 1000; tspec.tv_usec = 1000 * (millisec % 1000); while ( usleep(tspec.tv_usec) == -1 ); @@ -917,7 +917,7 @@ void millisleep( long millisec ) tspec.tv_sec = millisec / 1000; tspec.tv_nsec = 1000000L * (millisec % 1000); while ( nanosleep( &tspec, &tspec ) == -1 ); -#endif /* ATTSVR4 */ +#endif /* HAVE_NANOSLEEP */ #endif /* HAVE_NSLEEP */ return; @@ -939,7 +939,7 @@ void microsleep( long microsec ) while ( nsleep( &tspec, &tspec ) == -1 ); #else -#ifdef ATTSVR4 +#ifndef HAVE_NANOSLEEP struct timeval tspec; #else struct timespec tspec; @@ -948,7 +948,7 @@ void microsleep( long microsec ) if ( microsec == 0 ) return; -#ifdef ATTSVR4 +#ifndef HAVE_NANOSLEEP tspec.tv_sec = microsec / 1000000; tspec.tv_usec = microsec % 1000000; while ( usleep(tspec.tv_usec) == -1 ); @@ -956,7 +956,7 @@ void microsleep( long microsec ) tspec.tv_sec = microsec / 1000000L; tspec.tv_nsec = 1000L * (microsec % 1000000L); while ( nanosleep( &tspec, &tspec ) == -1 ); -#endif /* ATTSVR4 */ +#endif /* HAVE_NANOSLEEP */ #endif /* HAVE_NSLEEP */ return; diff --git a/configure.ac b/configure.ac index 98cf508..d97f68d 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ AC_FUNC_REALLOC AC_FUNC_STRTOD AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv]) AC_CHECK_FUNCS([socket sqrt strchr strdup strerror strrchr strstr strtol]) -AC_CHECK_FUNCS([nsleep setitimer sigaction siginterrupt]) +AC_CHECK_FUNCS([nanosleep nsleep setitimer sigaction siginterrupt]) dnl AC_CONFIG_FILES([Makefile]) AC_OUTPUT From 813f1cff31efd66f15af92da8b2ee294a51d4d14 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Tue, 16 Aug 2011 20:37:11 +0200 Subject: [PATCH 12/56] Sanely include both sys/time.h and time.h To avoid potential conflicts between sys/time.h and time.h, check for a TIME_WITH_SYS_TIME macro when trying to include both. Signed-off-by: Janusz Krzysztofik --- cm10a.c | 15 +++++++++++---- cm17a.c | 15 +++++++++------ cmd.c | 16 ++++++++++------ configure.ac | 1 + monitor.c | 15 +++++++++++---- x10state.c | 13 ++++++++++--- xread.c | 14 ++++++++++---- xsync.c | 15 +++++++++++---- 8 files changed, 73 insertions(+), 31 deletions(-) diff --git a/cm10a.c b/cm10a.c index 998c5da..f144020 100644 --- a/cm10a.c +++ b/cm10a.c @@ -52,7 +52,17 @@ #undef _IBCS2 /* conflicts with SVID3 */ #endif -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -109,9 +119,6 @@ #endif #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/cm17a.c b/cm17a.c index eb94e7a..0ff2842 100644 --- a/cm17a.c +++ b/cm17a.c @@ -54,11 +54,17 @@ #undef _IBCS2 /* conflicts with SVID3 */ #endif -#ifdef HAVE_SYS_TIME_H -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif -#include #ifdef HAVE_UNISTD_H #include #endif @@ -115,9 +121,6 @@ #endif #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif diff --git a/cmd.c b/cmd.c index 77e73a9..4ed6843 100644 --- a/cmd.c +++ b/cmd.c @@ -61,15 +61,19 @@ #endif #endif -#ifdef HAVE_SYS_TIME_H -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif + #ifdef HAVE_LIMITS_H #include #endif diff --git a/configure.ac b/configure.ac index d97f68d..e60f1ba 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,7 @@ AC_CHECK_HEADERS([syslog.h termio.h termios.h unistd.h]) AC_CHECK_HEADERS([asm/ioctls.h errno.h linux/serial.h linux/serial_reg.h pty.h]) AC_CHECK_HEADERS([sys/errno.h sys/resource.h sys/termio.h sys/termios.h]) AC_HEADER_SYS_WAIT +AC_HEADER_TIME # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T diff --git a/monitor.c b/monitor.c index 9fd8fff..5004074 100644 --- a/monitor.c +++ b/monitor.c @@ -32,9 +32,18 @@ #ifdef HAVE_SYS_STAT_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif + #ifdef HAVE_SYS_TYPES_H #include #endif @@ -65,8 +74,6 @@ #endif #endif -#include - #include "x10.h" #include "process.h" diff --git a/x10state.c b/x10state.c index a838b7d..a42ce67 100644 --- a/x10state.c +++ b/x10state.c @@ -65,8 +65,16 @@ #ifdef HAVE_SYSLOG_H #include #endif -#ifdef HAVE_SYS_TIME_H -#include + +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #ifdef POSIX @@ -86,7 +94,6 @@ #endif #include -#include #include "x10.h" #include "process.h" #include "sun.h" diff --git a/xread.c b/xread.c index c9d4592..78e5378 100644 --- a/xread.c +++ b/xread.c @@ -64,7 +64,16 @@ #endif #endif -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif #include "process.h" @@ -75,9 +84,6 @@ extern int tty; unsigned alarm(); void sigtimer( int ); #ifdef HAVE_SETITIMER -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif diff --git a/xsync.c b/xsync.c index beb561f..b57fff2 100644 --- a/xsync.c +++ b/xsync.c @@ -51,7 +51,17 @@ #undef _IBCS2 /* conflicts with SVID3 */ #endif -#include +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -108,9 +118,6 @@ #endif #endif -#ifdef HAVE_SYS_TIME_H -#include -#endif #ifdef HAVE_SYS_TYPES_H #include #endif From fd853038c621c02916e1765a6604d54ed00eb56a Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:50:28 +0200 Subject: [PATCH 13/56] Drop custom include conditions Since all non-portable headers are already included conditionally, based on Autoconf provided macros, drop any other include conditions that refer to custom macros defined with the Heyu Configure.sh script. Signed-off-by: Janusz Krzysztofik --- cm10a.c | 16 ---------------- cm17a.c | 16 ---------------- cmd.c | 3 --- config.c | 3 --- date.c | 4 ---- digimax.c | 3 --- modules.c | 3 --- monitor.c | 5 ----- oregon.c | 3 --- poll.c | 5 ----- process.c | 3 --- relay.c | 2 -- relay_aux.c | 2 -- rfxcom.c | 3 --- tty.c | 8 -------- tty_aux.c | 6 ------ x10.c | 5 ----- x10aux.c | 3 --- x10state.c | 5 ----- xread.c | 12 ++++-------- xsync.c | 16 ---------------- xwrite.c | 16 ---------------- 22 files changed, 4 insertions(+), 138 deletions(-) diff --git a/cm10a.c b/cm10a.c index f144020..13d1873 100644 --- a/cm10a.c +++ b/cm10a.c @@ -68,15 +68,12 @@ #endif #include -#ifdef LINUX #ifdef HAVE_ASM_IOCTLS_H #include #endif -# ifdef OLDLINUX #ifdef HAVE_LINUX_SERIAL_REG_H #include #endif -# endif #ifdef HAVE_LINUX_SERIAL_H #include #endif @@ -89,35 +86,22 @@ #ifdef HAVE_SYSLOG_H #include #endif -#else -# if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #ifdef HAVE_SYS_TERMIOS_H #include #endif -# else -# ifdef SCO #ifdef HAVE_SYS_TERMIO_H #include #endif -# else -# ifdef DARWIN #ifdef HAVE_TERMIOS_H #include #endif -# else #ifdef HAVE_TERMIO_H #include #endif -# endif -# endif -# endif -#endif -#if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/cm17a.c b/cm17a.c index 0ff2842..cafb432 100644 --- a/cm17a.c +++ b/cm17a.c @@ -70,15 +70,12 @@ #endif #include -#ifdef LINUX #ifdef HAVE_ASM_IOCTLS_H #include #endif -# ifdef OLDLINUX #ifdef HAVE_LINUX_SERIAL_REG_H #include #endif -# endif #ifdef HAVE_LINUX_SERIAL_H #include #endif @@ -91,35 +88,22 @@ #ifdef HAVE_SYSLOG_H #include #endif -#else -# if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #ifdef HAVE_SYS_TERMIOS_H #include #endif -# else -# ifdef SCO #ifdef HAVE_SYS_TERMIO_H #include #endif -# else -# ifdef DARWIN #ifdef HAVE_TERMIOS_H #include #endif -# else #ifdef HAVE_TERMIO_H #include #endif -# endif -# endif -# endif -#endif -#if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/cmd.c b/cmd.c index 4ed6843..d4286ff 100644 --- a/cmd.c +++ b/cmd.c @@ -51,15 +51,12 @@ #ifdef HAVE_UNISTD_H #include #endif -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #ifdef TIME_WITH_SYS_TIME # include diff --git a/config.c b/config.c index 799323c..f208f1c 100644 --- a/config.c +++ b/config.c @@ -51,15 +51,12 @@ #ifdef HAVE_UNISTD_H #include #endif -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #ifdef HAVE_SYSLOG_H #include diff --git a/date.c b/date.c index eff3b5d..da120e7 100644 --- a/date.c +++ b/date.c @@ -35,20 +35,16 @@ #ifdef HAVE_UNISTD_H #include #endif -#ifdef SYSV #ifdef HAVE_SYS_TYPES_H #include #endif -#endif #ifdef HAVE_SYS_PARAM_H #include #endif -#ifdef BEFORE #ifdef HAVE_SYS_FILSYS_H #include #endif -#endif #include "x10.h" diff --git a/digimax.c b/digimax.c index 33e8d39..e47e458 100644 --- a/digimax.c +++ b/digimax.c @@ -48,15 +48,12 @@ #include #endif #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include "x10.h" #include "process.h" diff --git a/modules.c b/modules.c index 02b8267..fb658d3 100644 --- a/modules.c +++ b/modules.c @@ -39,15 +39,12 @@ #endif #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #ifdef HAVE_STDLIB_H #include #endif diff --git a/monitor.c b/monitor.c index 5004074..41d6228 100644 --- a/monitor.c +++ b/monitor.c @@ -64,26 +64,21 @@ #ifdef HAVE_SYSLOG_H #include #endif -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include "x10.h" #include "process.h" -#ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #ifdef HAVE_SYS_TYPES_H #include #endif -#endif extern int timeout; extern int sptty; diff --git a/oregon.c b/oregon.c index 7aa3341..2d67644 100644 --- a/oregon.c +++ b/oregon.c @@ -49,15 +49,12 @@ #endif #include #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include "x10.h" #include "process.h" diff --git a/poll.c b/poll.c index 77ba014..8978f10 100644 --- a/poll.c +++ b/poll.c @@ -63,15 +63,12 @@ #ifdef HAVE_STRING_H #include #endif -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include #include #include "x10.h" @@ -82,12 +79,10 @@ #include "x10state.h" #include "oregon.h" -#ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #ifdef HAVE_SYS_TYPES_H #include #endif -#endif extern int sptty; diff --git a/process.c b/process.c index a648010..5f45044 100644 --- a/process.c +++ b/process.c @@ -45,15 +45,12 @@ #include #endif #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include #ifdef HAVE_ERRNO_H #include diff --git a/relay.c b/relay.c index 3c1bb3f..105bf2b 100644 --- a/relay.c +++ b/relay.c @@ -60,11 +60,9 @@ #ifdef HAVE_SYSLOG_H #include #endif -#ifdef LINUX #ifdef HAVE_SYS_RESOURCE_H #include #endif -#endif #ifdef HAVE_LIMITS_H #include #endif diff --git a/relay_aux.c b/relay_aux.c index 5f43b0c..e729df0 100644 --- a/relay_aux.c +++ b/relay_aux.c @@ -54,11 +54,9 @@ #ifdef HAVE_SYSLOG_H #include #endif -#ifdef LINUX #ifdef HAVE_SYS_RESOURCE_H #include #endif -#endif #ifdef HAVE_LIMITS_H #include #endif diff --git a/rfxcom.c b/rfxcom.c index 113dd40..7533a9c 100644 --- a/rfxcom.c +++ b/rfxcom.c @@ -48,15 +48,12 @@ #include #endif #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include "x10.h" #include "process.h" diff --git a/tty.c b/tty.c index ab3cd08..05ede3c 100644 --- a/tty.c +++ b/tty.c @@ -73,17 +73,13 @@ #ifdef HAVE_STDLIB_H #include #endif -#ifdef SOLARIS #ifdef HAVE_STRINGS_H #include #endif -#endif -#ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #ifdef HAVE_PTY_H #include #endif -#endif #include "x10.h" #include "process.h" @@ -120,11 +116,9 @@ int sptty = -1; /* Spool */ #endif #endif -#ifdef NETBSD #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifndef SYSV #ifdef HAVE_SGTTY_H @@ -145,11 +139,9 @@ struct termio oldsb, newsb; #ifdef HAVE_TERMIOS_H #include #endif -#ifdef DARWIN #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifndef NCC #define NCC NCCS #endif diff --git a/tty_aux.c b/tty_aux.c index be1a5e0..152f2e3 100644 --- a/tty_aux.c +++ b/tty_aux.c @@ -73,17 +73,13 @@ #ifdef HAVE_STDLIB_H #include #endif -#ifdef SOLARIS #ifdef HAVE_STRINGS_H #include #endif -#endif -#ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #ifdef HAVE_PTY_H #include #endif -#endif #include #include @@ -139,11 +135,9 @@ struct termio oldsb, newsb; #ifdef HAVE_TERMIOS_H #include #endif -#if defined(DARWIN) || defined(NETBSD) #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifndef NCC #define NCC NCCS #endif diff --git a/x10.c b/x10.c index 35a2304..fab4e80 100644 --- a/x10.c +++ b/x10.c @@ -43,15 +43,12 @@ #ifdef HAVE_STDLIB_H #include #endif -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #include #include #include "x10.h" @@ -61,12 +58,10 @@ #endif #include "process.h" -#ifdef __GLIBC__ /* msf - added for glibc/rh 5.0 */ #ifdef HAVE_SYS_TYPES_H #include #endif -#endif extern int tty; extern int sptty; diff --git a/x10aux.c b/x10aux.c index 1f73819..04428c6 100644 --- a/x10aux.c +++ b/x10aux.c @@ -57,15 +57,12 @@ #ifdef HAVE_SYSLOG_H #include #endif -#if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD)) #ifdef HAVE_ERRNO_H #include #endif -#else #ifdef HAVE_SYS_ERRNO_H #include #endif -#endif #include #include "x10.h" diff --git a/x10state.c b/x10state.c index a42ce67..d67371a 100644 --- a/x10state.c +++ b/x10state.c @@ -44,15 +44,12 @@ #include #endif #include -#if defined(SYSV) || defined(FREEBSD) || defined(OPENBSD) #ifdef HAVE_STRING_H #include #endif -#else #ifdef HAVE_STRINGS_H #include #endif -#endif #ifdef HAVE_ERRNO_H #include #endif @@ -81,11 +78,9 @@ #define EXEC_POSIX #endif -#ifdef EXEC_POSIX #ifdef HAVE_SYS_WAIT_H #include #endif -#endif #ifndef WEXITSTATUS # define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif diff --git a/xread.c b/xread.c index 78e5378..dcae145 100644 --- a/xread.c +++ b/xread.c @@ -39,15 +39,12 @@ #endif #include #include -#if (defined(SCO) || defined (SOLARIS) || defined (ATTSVR4) || defined(OPENBSD) || defined(NETBSD)) #ifdef HAVE_ERRNO_H #include #endif -#else #ifdef HAVE_SYS_ERRNO_H #include #endif -#endif #ifdef HAVE_SYSLOG_H #include #endif @@ -58,11 +55,9 @@ #include #endif #include "x10.h" -#if (defined(LINUX) || defined(SOLARIS) || defined(FREEBSD) || defined(DARWIN) || defined(SYSV) || defined(OPENBSD) || defined(NETBSD)) #ifdef HAVE_STRING_H #include /* char *strerror(); */ #endif -#endif #ifdef TIME_WITH_SYS_TIME # include @@ -75,6 +70,10 @@ # endif #endif +#ifdef HAVE_UNISTD_H +#include +#endif + #include "process.h" extern int verbose; @@ -84,9 +83,6 @@ extern int tty; unsigned alarm(); void sigtimer( int ); #ifdef HAVE_SETITIMER -#ifdef HAVE_UNISTD_H -#include -#endif struct itimerval iold, icurrent; #endif int xread ( int, unsigned char *, int, int ); diff --git a/xsync.c b/xsync.c index b57fff2..743bd59 100644 --- a/xsync.c +++ b/xsync.c @@ -67,15 +67,12 @@ #endif #include -#ifdef LINUX #ifdef HAVE_ASM_IOCTLS_H #include #endif -# ifdef OLDLINUX #ifdef HAVE_LINUX_SERIAL_REG_H #include #endif -# endif #ifdef HAVE_LINUX_SERIAL_H #include #endif @@ -88,35 +85,22 @@ #ifdef HAVE_SYSLOG_H #include #endif -#else -# if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #ifdef HAVE_SYS_TERMIOS_H #include #endif -# else -# ifdef SCO #ifdef HAVE_SYS_TERMIO_H #include #endif -# else -# ifdef DARWIN #ifdef HAVE_TERMIOS_H #include #endif -# else #ifdef HAVE_TERMIO_H #include #endif -# endif -# endif -# endif -#endif -#if (defined(OSF) || defined(DARWIN) || defined(NETBSD)) #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/xwrite.c b/xwrite.c index 29841d1..a57e807 100644 --- a/xwrite.c +++ b/xwrite.c @@ -38,15 +38,12 @@ #include #endif -#ifdef LINUX #ifdef HAVE_ASM_IOCTLS_H #include #endif -# ifdef OLDLINUX #ifdef HAVE_LINUX_SERIAL_REG_H #include #endif -# endif #ifdef HAVE_LINUX_SERIAL_H #include #endif @@ -59,35 +56,22 @@ #ifdef HAVE_SYSLOG_H #include #endif -#else -# if (defined(POSIX) || defined(FREEBSD) || defined(OPENBSD)) #ifdef HAVE_SYS_TERMIOS_H #include #endif -# else -# ifdef SCO #ifdef HAVE_SYS_TERMIO_H #include #endif -# else -# ifdef DARWIN #ifdef HAVE_TERMIOS_H #include #endif -# else #ifdef HAVE_TERMIO_H #include #endif -# endif -# endif -# endif -#endif -#if (defined(OSF) || defined(DARWIN)) #ifdef HAVE_SYS_IOCTL_H #include #endif -#endif #ifdef HAVE_STRING_H #include From 2832835d872ea43776ddeb3592ee860a1676ae35 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:51:04 +0200 Subject: [PATCH 14/56] Drop a number of no longer used custom system type macros After latest cleanups, none of SOLARIS, FREEBSD, OPENBSD, ATTSVR4 nor OSF1 macros should be required any longer for configuring Heyu on platforms which have been using them so far. Drop all those symbol definitions from Configure.sh. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Configure.sh b/Configure.sh index b80afb6..2d8d2b2 100755 --- a/Configure.sh +++ b/Configure.sh @@ -183,7 +183,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -206,7 +206,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG + DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -224,7 +224,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSOLARIS -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -236,7 +236,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DNEEDGTIME -DFREEBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DNEEDGTIME -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; openbsd) @@ -246,7 +246,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DNEEDGTIME -DOPENBSD -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DNEEDGTIME -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; netbsd) @@ -300,7 +300,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DATTSVR4 -DHASTZ -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DHASTZ -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; nextstep) @@ -321,7 +321,7 @@ EoF CC = gcc CFLAGS = -g \$(DFLAGS) LIBS = -lm -lc - DFLAGS = -DSYSV -DOSF1 -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; generic) From 3e45085622413ad7ec5ac5de0f9fbc38eaf24adf Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:52:11 +0200 Subject: [PATCH 15/56] Replace custom HASTZ macro with Autoconf test for timezone In continuation of conversion from custom Configure.sh script to Autotconf provided methods, replace custom HASTZ macro with Autoconf based test which checks for a timezone global variable being declared and automatically defines a HAVE_DECL_TIMEZONE macro accordingly. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 10 +++++----- configure.ac | 14 ++++++++++++++ process.c | 4 ++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Configure.sh b/Configure.sh index 2d8d2b2..d1841cb 100755 --- a/Configure.sh +++ b/Configure.sh @@ -166,7 +166,7 @@ case "$SYS" in GROUP = root CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = -DSYSV -DPOSIX -DLINUX -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLINUX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG LIBS = -lm -lc EoF ;; @@ -183,7 +183,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -206,7 +206,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG + DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -224,7 +224,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DHASTZ $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -300,7 +300,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DHASTZ -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; nextstep) diff --git a/configure.ac b/configure.ac index e60f1ba..f6c58fc 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,20 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_UNSIGNED_LONG_LONG_INT +# Checks for declarations. +AC_CHECK_DECLS(timezone, [], [], [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +]) + # Checks for library functions. AC_FUNC_ERROR_AT_LINE AC_FUNC_FORK diff --git a/process.c b/process.c index 5f45044..97b7e2e 100644 --- a/process.c +++ b/process.c @@ -1366,7 +1366,7 @@ char *linmap2list ( unsigned long linmap ) | which provides the offset of local Legal Time and has the | | opposite sign. | +------------------------------------------------------------------*/ -#ifdef HASTZ +#if (HAVE_DECL_TIMEZONE == 1) void get_std_timezone ( void ) { struct tm *tmp; @@ -1420,7 +1420,7 @@ void get_std_timezone ( void ) std_tzone = -min(jan_off, jul_off); return; } -#endif /* End of #ifdef */ +#endif /* End of #if (HAVE_DECL_TIMEZONE == 1) */ /*------------------------------------------------------------------+ | For some places in the world, e.g., Australia, there's no | From d5b62f5120924c1d5fe436d06f4e8c8cfe29ed86 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:52:46 +0200 Subject: [PATCH 16/56] Depend RandMax value on macros availability, not system type Using custom system type dependent macros can be avoided this way, getting us still closer to removing them completely from Configure.sh. Signed-off-by: Janusz Krzysztofik --- cmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd.c b/cmd.c index d4286ff..17bc671 100644 --- a/cmd.c +++ b/cmd.c @@ -78,12 +78,10 @@ #include "process.h" #include "x10state.h" -#if defined(LINUX) +#if defined(RAND_MAX) #define RandMax RAND_MAX -#elif defined(NETBSD) +#elif defined(RANDOM_MAX) #define RandMax RANDOM_MAX -#elif defined DARWIN -#define RandMax LONG_MAX #else #define RandMax LONG_MAX #endif From 8bf5a1e7895ae9c2b1effde2802af54938f9e7fb Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:53:26 +0200 Subject: [PATCH 17/56] Drop LINUX, NETBSD and DARWIN custom macros Heyu should now build correctly even with no hints from those old Configure.sh provided macros on systems which relied on them before. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Configure.sh b/Configure.sh index d1841cb..85ae2d5 100755 --- a/Configure.sh +++ b/Configure.sh @@ -166,7 +166,7 @@ case "$SYS" in GROUP = root CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = -DSYSV -DPOSIX -DLINUX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG LIBS = -lm -lc EoF ;; @@ -253,7 +253,7 @@ EoF cat >> Makefile <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DPOSIX -DNETBSD -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -263,7 +263,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = wheel - DFLAGS = -DPOSIX -DDARWIN $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc From 5b7e55ffb57f27c7ae344cecd13066e82c5884da Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sat, 6 Aug 2011 04:07:34 +0200 Subject: [PATCH 18/56] Drop unused NEEDGTIME macro It's not used throughout the sources, so shouldn't be needed. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configure.sh b/Configure.sh index 85ae2d5..4ca526b 100755 --- a/Configure.sh +++ b/Configure.sh @@ -236,7 +236,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DNEEDGTIME -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; openbsd) @@ -246,7 +246,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DNEEDGTIME -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; netbsd) From b7769a53a4794d29bf6ffcc16884b198e095fe71 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Tue, 16 Aug 2011 21:06:24 +0200 Subject: [PATCH 19/56] Use S_ISDIR macro if defined, not limited to POSIX S_ISDIR is a macro which presence can be tested with #ifdef, so no need to depend its use on POSIX being defined. Signed-off-by: Janusz Krzysztofik --- x10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x10.c b/x10.c index fab4e80..3f6d85c 100644 --- a/x10.c +++ b/x10.c @@ -707,7 +707,7 @@ int check_dir_rw ( char *pathspec, char *label ) return 1; } -#ifdef POSIX +#ifdef S_ISDIR if ( S_ISDIR(statb.st_mode) == 0 ) { #else if ( (statb.st_mode & S_IFDIR) != S_IFDIR ) { From da71e00032700816ee0585a16935b79cdd7a12a0 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Tue, 16 Aug 2011 21:31:28 +0200 Subject: [PATCH 20/56] Replace HAS* macro names with more common HAVE_* forms Autoconf convention used while naming macros is to start them with a HAVE_ prefix, not HAS as in the current Heyu sources. Rename compile time configured feature macros using HAVE_FEATURE_ prefix before moving with their handling to Autoconf. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 14 ++++---- cm17a.c | 4 +-- cmd.c | 100 +++++++++++++++++++++++++-------------------------- config.c | 18 +++++----- digimax.c | 12 +++---- modules.c | 32 ++++++++--------- oregon.c | 34 +++++++++--------- poll.c | 2 +- process.c | 24 ++++++------- rfxcom.c | 52 +++++++++++++-------------- x10.c | 12 +++---- x10aux.c | 6 ++-- x10state.c | 66 +++++++++++++++++----------------- 13 files changed, 188 insertions(+), 188 deletions(-) diff --git a/Configure.sh b/Configure.sh index 4ca526b..d73c6d4 100755 --- a/Configure.sh +++ b/Configure.sh @@ -41,13 +41,13 @@ MAN5 = /usr/local/man/man5 EoF -CM17AFLAG="-DHASCM17A" -EXT0FLAG="-DHASEXT0" -RFXSENFLAG="-DHASRFXS" -RFXMETFLAG="-DHASRFXM" -DMXFLAG="-DHASDMX" -OREFLAG="-DHASORE" -KAKUFLAG="-DHASKAKU" +CM17AFLAG="-DHAVE_FEATURE_CM17A" +EXT0FLAG="-DHAVE_FEATURE_EXT0" +RFXSENFLAG="-DHAVE_FEATURE_RFXS" +RFXMETFLAG="-DHAVE_FEATURE_RFXM" +DMXFLAG="-DHAVE_FEATURE_DMX" +OREFLAG="-DHAVE_FEATURE_ORE" +KAKUFLAG="-DHAVE_FEATURE_KAKU" while [ $# -ge 1 ] ; do case "$1" in diff --git a/cm17a.c b/cm17a.c index cafb432..f7f8fa5 100644 --- a/cm17a.c +++ b/cm17a.c @@ -36,7 +36,7 @@ #include #endif -#ifdef HASCM17A /* Compile only if configured for CM17A */ +#ifdef HAVE_FEATURE_CM17A /* Compile only if configured for CM17A */ #include #ifdef HAVE_STDLIB_H @@ -463,7 +463,7 @@ int display_rf_xmit ( unsigned char type, unsigned int rfword, int bursts ) #else /* Stubs */ void xlate_rf( unsigned char type, char **fname, unsigned int rfword, char *hcp, int *unitp, unsigned char *nosw ) {} -#endif /* End of HASCM17A code */ +#endif /* End of HAVE_FEATURE_CM17A code */ diff --git a/cmd.c b/cmd.c index 17bc671..247bcfc 100644 --- a/cmd.c +++ b/cmd.c @@ -256,13 +256,13 @@ static char *helpstate[][3] = { {"heyu_rawstate","Hu","Heyu script raw environment state bitmap (as integer)"}, {"heyu_vflagstate","Hu","Heyu script vFlag environment state bitmap (as integer)"}, #if 0 -#if defined(HASRFXS) || defined(HASRFXM) +#if defined(HAVE_FEATURE_RFXS) || defined(HAVE_FEATURE_RFXM) {"rfxflag_state","Hu","RFXsensor/RFXmeter flag state bitmap (as integer)"}, #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE {"oreflag_state","Hu","Oregon (Electrisave, Owl) flag state bitmap (as integer)"}, #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX {"dmxflag_state","Hu","Digimax flag state bitmap (as integer)"}, #endif #endif @@ -272,7 +272,7 @@ static char *helpstate[][3] = { {NULL, NULL, NULL} }; -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS static char *helprfxsensor[][3] = { {"rfxtemp","Hu","Temperature"}, {"rfxrh","Hu","Relative Humidity"}, @@ -285,9 +285,9 @@ static char *helprfxsensor[][3] = { {"rfxtemp2","Hu","Second Temperature"}, {NULL, NULL, NULL} }; -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM static char *helprfxmeter[][3] = { {"rfxpower","Hu","Watt-Hour meter reading"}, {"rfxpanel","[n]","Total Watt-Hours for Power Panel [n]"}, @@ -297,9 +297,9 @@ static char *helprfxmeter[][3] = { {"rfxcount","Hu","Raw counter of any meter"}, {NULL, NULL, NULL} }; -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX static char *helpdigimax[][3] = { {"dmxtemp","Hu","DigiMax current temperature (C)"}, {"dmxsetpoint","Hu","DigiMax setpoint temperature (C)"}, @@ -307,9 +307,9 @@ static char *helpdigimax[][3] = { {"dmxmode","Hu","DigiMax Heat/Cool mode (1 = Heat)"}, {NULL, NULL, NULL} }; -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE static char *helporegon[][3] = { {"oretemp","Hu","Oregon sensor Temperature"}, {"orerh","Hu","Oregon sensor Relative Humidity"}, @@ -325,7 +325,7 @@ static char *helporegon[][3] = { {"owlenergy","Hu","Owl CM119 Energy"}, {NULL, NULL, NULL} }; -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ /* Descriptions of direct and uploaded macro commands */ static char *helpdirect[] = { @@ -439,7 +439,7 @@ void display_helpnotes ( void ) { printf("\n (*) Not available for use in uploaded macros.\n"); printf(" (**) Many lamp modules do NOT support this command.\n"); -#ifdef HASCM17A +#ifdef HAVE_FEATURE_CM17A printf(" (#) Fast CM17A command - see man x10cm17a(5) for configuration.\n"); #endif printf(" (@) Ignored unless state engine is running.\n"); @@ -450,22 +450,22 @@ void display_helpnotes ( void ) void display_manpage_list ( void ) { printf("\n Man pages:\n heyu(1), x10config(5), x10sched(5), x10scripts(5), x10aux(5)"); -#ifdef HASCM17A +#ifdef HAVE_FEATURE_CM17A printf(", x10cm17a(5)"); #endif -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS printf(", x10rfxsensors(5)"); #endif -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM printf(", x10rfxmeters(5)"); #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX printf(", x10digimax(5)"); #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE printf(", x10oregon(5)"); #endif -#ifdef HASKAKU +#ifdef HAVE_FEATURE_KAKU printf(", x10kaku(5)"); #endif printf(".\n\n"); @@ -709,7 +709,7 @@ static struct cmd_list { -#ifdef HASEXT0 /* Extended Type 0 (SW10 shutter controller) commands */ +#ifdef HAVE_FEATURE_EXT0 /* Extended Type 0 (SW10 shutter controller) commands */ {"shopen", 7, 6, 2, 2, F_DED | F_SHU, 0x03, 0, 7,63 }, /* Shutter open, ignore limit */ {"shopenlim", 7, 6, 2, 2, F_DED | F_SHU, 0x01, 0, 7,61 }, /* Shutter open, enforce limit */ {"shsetlim", 7, 6, 2, 2, F_DED | F_SHU, 0x02, 0, 7,62 }, /* Shutter set limit */ @@ -717,7 +717,7 @@ static struct cmd_list { {"shcloseall", 7, 6, 1, 1, F_ALL | F_SHU, 0x0B, 0, 1,65 }, /* Shutter all full close */ #endif -#ifdef HASCM17A /* CM17A ("Firecracker") commands */ +#ifdef HAVE_FEATURE_CM17A /* CM17A ("Firecracker") commands */ {"freset", 34,-1, 0, 0, F_RFS, 8, 0,12,55 }, /* CM17A Reset */ {"fon", 34,-1, 1, 1, F_RFS, 2, 0, 3,47 }, /* CM17A On RF command */ {"foff", 34,-1, 1, 1, F_RFS, 3, 0, 3,48 }, /* CM17A Off RF command */ @@ -1895,7 +1895,7 @@ void command_help ( char *command ) (!strncmp(command, "rfx", 3)) ? (HELP_RFXS | HELP_RFXM) : 0 ; #endif -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS j = 0; while ( helprfxsensor[j][0] != NULL ) { if ( strcmp(command, helprfxsensor[j][0]) == 0 ) { @@ -1905,9 +1905,9 @@ void command_help ( char *command ) } j++; } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM j = 0; while ( helprfxmeter[j][0] != NULL ) { if ( strcmp(command, helprfxmeter[j][0]) == 0 ) { @@ -1917,9 +1917,9 @@ void command_help ( char *command ) } j++; } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX j = 0; while ( helpdigimax[j][0] != NULL ) { if ( strcmp(command, helpdigimax[j][0]) == 0 ) { @@ -1929,9 +1929,9 @@ void command_help ( char *command ) } j++; } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE j = 0; while ( helporegon[j][0] != NULL ) { if ( strcmp(command, helporegon[j][0]) == 0 ) { @@ -1941,7 +1941,7 @@ void command_help ( char *command ) } j++; } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ if ( list & HELP_OPTIONS ) { /* Display options */ @@ -1954,24 +1954,24 @@ void command_help ( char *command ) if ( list & HELP_HELP ) { printf("\nUsage: heyu help [category|command] All help [or specific Category or Command]\n"); printf(" Categories: options admin direct"); -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 printf(" shutter"); #endif -#ifdef HASCM17A +#ifdef HAVE_FEATURE_CM17A printf(" cm17a"); #endif printf(" internal"); printf(" state"); -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS printf(" rfxsensor"); #endif -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM printf(" rfxmeter"); #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX printf(" digimax"); #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE printf(" oregon"); #endif printf(" webhook"); @@ -1990,37 +1990,37 @@ void command_help ( char *command ) display_gen_help(helpstate); } -#if HASRFXS +#if HAVE_FEATURE_RFXS if ( (list & HELP_STATE) || (list & HELP_RFXS) ) { /* RFXSensor state commands */ printf("\n [RFXSensor state commands (H = Housecode, u = Single unit) - require heyu engine]\n"); display_gen_help(helprfxsensor); } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM if ( (list & HELP_STATE) || (list & HELP_RFXM) ) { /* RFXMeter state commands */ printf("\n [RFXMeter state commands (H = Housecode, u = Single unit) - require heyu engine]\n"); display_gen_help(helprfxmeter); } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX if ( (list & HELP_STATE) || (list & HELP_DMX) ) { /* Digimax state commands */ printf("\n [DigiMax state commands (H = Housecode, u = Single unit) - require heyu engine]\n"); display_gen_help(helpdigimax); } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE if ( (list & HELP_STATE) || (list & HELP_ORE) ) { /* Oregon state commands */ printf("\n [Oregon group state commands (H = Housecode, u = Single unit) - require heyu engine]\n"); display_gen_help(helporegon); } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ if ( list & HELP_DIRECT ) { /* Direct commands */ @@ -2048,7 +2048,7 @@ void command_help ( char *command ) } } - #ifdef HASEXT0 + #ifdef HAVE_FEATURE_EXT0 printf("\n [Shutter (Extended Type 0) direct commands (H = Housecode, U = Units list)]\n"); for ( j = 0; j < nx10cmds; j++ ) { two = &x10command[j]; @@ -2067,7 +2067,7 @@ void command_help ( char *command ) ext0done = 1; } - #ifdef HASEXT0 + #ifdef HAVE_FEATURE_EXT0 if ( list & HELP_SHUTTER && !ext0done) { printf("\n [Shutter (Extended Type 0) direct commands (H = Housecode, U = Units list)]\n"); /* Get max string lengths for formatting output */ @@ -2095,7 +2095,7 @@ void command_help ( char *command ) } #endif /* End ifdef */ - #ifdef HASCM17A + #ifdef HAVE_FEATURE_CM17A if ( list & HELP_CM17A ) { /* Get max string lengths for formatting output */ szlbl = szarg = sztot = 0; @@ -2280,7 +2280,7 @@ void cmd_usage ( FILE *fd, int index ) int direct_command( int argc, char *argv[], int mode ) { -#ifdef HASCM17A /* Used only for CM17A commands */ +#ifdef HAVE_FEATURE_CM17A /* Used only for CM17A commands */ extern unsigned int rf_unit_code[16]; extern unsigned int rf_func_code[7]; extern unsigned int rf_nosw_code[8]; @@ -2299,7 +2299,7 @@ int direct_command( int argc, char *argv[], int mode ) unsigned char rfhcode, rfmode = RF_SLOW; long lxdata; int flux_delay; -#endif /* End of HASCM17A block */ +#endif /* End of HAVE_FEATURE_CM17A block */ extern int line_sync_mode( void ); extern int send_flag_update ( unsigned int, unsigned char ); @@ -2428,7 +2428,7 @@ unsigned long flagbank[NUM_FLAG_BANKS]; return 1; } -#ifndef HASCM17A +#ifndef HAVE_FEATURE_CM17A /* CM17A support not included */ if ( flags & F_FIR ) { sprintf(errmsg, @@ -3941,7 +3941,7 @@ unsigned long flagbank[NUM_FLAG_BANKS]; break; -#ifdef HASCM17A +#ifdef HAVE_FEATURE_CM17A case 34 : /* CM17A "Firecracker" RF commands */ noswitch = 0; @@ -4336,7 +4336,7 @@ unsigned long flagbank[NUM_FLAG_BANKS]; break; } break; -#endif /* End of HASCM17A */ +#endif /* End of HAVE_FEATURE_CM17A */ default : sprintf(errmsg, "Command '%s': Not implemented", label); diff --git a/config.c b/config.c index f208f1c..adf225c 100644 --- a/config.c +++ b/config.c @@ -3464,7 +3464,7 @@ int lookup_launcher ( LAUNCHER *launcherp, char *label ) +---------------------------------------------------------------------*/ int create_oregon_ignore_list ( void ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE ALIAS *aliasp; int j, k; @@ -3483,7 +3483,7 @@ int create_oregon_ignore_list ( void ) } j++; } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ return 0; } @@ -3727,7 +3727,7 @@ int finalize_config ( unsigned char mode ) set_elec1_nvar(configp->els_number); -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM create_rfxpower_panels(); #endif @@ -5139,22 +5139,22 @@ void get_help_topics ( char **topic, int *ntopic ) topic[(*ntopic)++] = "direct"; topic[(*ntopic)++] = "state"; topic[(*ntopic)++] = "internal"; -#ifdef HASCM17A +#ifdef HAVE_FEATURE_CM17A topic[(*ntopic)++] = "cm17a"; #endif -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 topic[(*ntopic)++] = "shutter"; #endif -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS topic[(*ntopic)++] = "rfxsensor"; #endif -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM topic[(*ntopic)++] = "rfxmeter"; #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX topic[(*ntopic)++] = "digimax"; #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE topic[(*ntopic)++] = "oregon"; #endif diff --git a/digimax.c b/digimax.c index e47e458..3043389 100644 --- a/digimax.c +++ b/digimax.c @@ -88,7 +88,7 @@ extern int lock_for_write(), munlock(); char *translate_digimax ( unsigned char *buf, unsigned char *sunchanged, int *launchp ) { -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX static char outbuf[160]; char flagslist[80], unknown[32]; ALIAS *aliasp; @@ -417,7 +417,7 @@ char *translate_digimax ( unsigned char *buf, unsigned char *sunchanged, int *la return outbuf; #else return ""; -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ } @@ -427,7 +427,7 @@ char *translate_digimax ( unsigned char *buf, unsigned char *sunchanged, int *la int show_digimax ( void ) { -#if HASDMX +#if HAVE_FEATURE_DMX ALIAS *aliasp; char hc; int unit, index, temp, count = 0, maxlabel = 0; @@ -495,12 +495,12 @@ int show_digimax ( void ) index++; } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ return 0; } -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX /*---------------------------------------------------------------------+ | Display a Digimax data value stored in the x10state structure. | +---------------------------------------------------------------------*/ @@ -591,4 +591,4 @@ int c_dmxcmds ( int argc, char *argv[] ) return 0; } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ diff --git a/modules.c b/modules.c index fb658d3..ca434c0 100644 --- a/modules.c +++ b/modules.c @@ -318,7 +318,7 @@ struct modules_st { {"VIRT4", MXLV, VSTD, VIRT4, 0, opt_onlevel, NULL }, /* Virtual module, 4 function */ {"VDATA", MXLV, VSTD, VIRTUAL, 0, NULL, NULL }, /* Virtual module data */ {"PLCSENSOR", MXLS, VSTD, PLCSEN, 0, opt_plcsensor, NULL }, /* PLC Sensor target */ -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 {"SHUTTER", MXLS0, VNON, SHUT0, XSHUT0, NULL, NULL }, /* Extended code Type 0 shutter */ {"SW10", MXLS0, VNON, SHUT0, XSHUT0, NULL, NULL }, /* Marmitek SW10 shutter control */ #endif @@ -373,7 +373,7 @@ struct modules_st { {"MS16", MXLS, VSTD, MOTION, 0, opt_x10std, NULL}, {"MS16A", MXLS, VSTD, MOTION, 0, opt_x10std, NULL}, -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE {"ORE_TH1", MXLV, VORE, VIRTUAL, 0, opt_oreTH1, NULL}, {"THGR122NX", MXLV, VORE, VIRTUAL, 0, opt_oreTH1, NULL}, {"THGN123N", MXLV, VORE, VIRTUAL, 0, opt_oreTH1, NULL}, @@ -423,28 +423,28 @@ struct modules_st { {"ORE_UV1", MXLV, VORE, VIRTUAL, 0, opt_oreUV1, NULL}, {"ORE_UV2", MXLV, VORE, VIRTUAL, 0, opt_oreUV2, NULL}, {"OWL_ELEC2", MXLV, VORE, VIRTUAL, 0, opt_owlElec2new, NULL}, -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS {"RFXSENSOR", MXLV, VRFXS, VIRTUAL, 0, opt_rfxsensor, fn_rfxsensor}, -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM {"RFXCOUNT", MXLV, VRFXM, VIRTUAL, 0, opt_rfxcount, fn_rfxcount}, {"RFXPOWER", MXLV, VRFXM, VIRTUAL, 0, opt_rfxpower, fn_rfxpower}, {"RFXWATER", MXLV, VRFXM, VIRTUAL, 0, opt_rfxwater, fn_rfxwater}, {"RFXGAS", MXLV, VRFXM, VIRTUAL, 0, opt_rfxgas, fn_rfxgas}, {"RFXPULSE", MXLV, VRFXM, VIRTUAL, 0, opt_rfxpulse, fn_rfxpulse}, -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX {"DIGIMAX", MXLV, VDMX, VIRTUAL, 0, opt_digimax, NULL}, -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASKAKU +#ifdef HAVE_FEATURE_KAKU {"KAKU_S", MXLK, VKAKU, KAM, 0, opt_kaku, NULL}, {"KAKU_P", MXLK, VKAKU, KLM, 0, opt_kaku, NULL}, -#endif /* HASKAKU */ +#endif /* HAVE_FEATURE_KAKU */ {"VISGEN", MXLV, VSEC, VIRTUAL, 0, opt_visonic, fn_visonic }, /* Generic Visonic */ @@ -1194,19 +1194,19 @@ void show_module_mask ( unsigned char hcode ) "Sensor transmits X10 power line signals"); printf("%*s (%s) %s\n", lw, "Security", bmap2asc(vmodmask[VsecMask][hcode], chr), "X10 Security RF data"); -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS printf("%*s (%s) %s\n", lw, "RFXSensor", bmap2asc(vmodmask[VrfxsMask][hcode], chr), "RFXSensor RF data"); #endif -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM printf("%*s (%s) %s\n", lw, "RFXMeter", bmap2asc(vmodmask[VrfxmMask][hcode], chr), "RFXMeter RF data"); #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX printf("%*s (%s) %s\n", lw, "Digimax", bmap2asc(vmodmask[VdmxMask][hcode], chr), "Digimax RF data"); #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE printf("%*s (%s) %s\n", lw, "Oregon", bmap2asc(vmodmask[VoreMask][hcode], chr), "Oregon RF data"); #endif @@ -1651,7 +1651,7 @@ int opt_defer ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) } -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE /*---------------------------------------------------------------------+ | General options for Oregon sensors | +---------------------------------------------------------------------*/ diff --git a/oregon.c b/oregon.c index 2d67644..25881c7 100644 --- a/oregon.c +++ b/oregon.c @@ -131,7 +131,7 @@ unsigned int bcd2dec ( unsigned int bcd, int digits ) int is_ore_ignored ( unsigned int saddr ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE int j = 0; while ( j < ore_ignore_size ) { @@ -144,7 +144,7 @@ int is_ore_ignored ( unsigned int saddr ) return 0; } -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE char *forecast_txt( int fcast ) { @@ -514,13 +514,13 @@ unsigned char channelval( char *chstr, unsigned char *buf, unsigned char mode ) } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ unsigned char oretype ( unsigned char *xbuf, unsigned char *subindx, unsigned char *subtype, unsigned char *trulen, unsigned long *addr, int *nseq ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE int j = 0; while ( j < orechk_size ) { @@ -549,7 +549,7 @@ unsigned char oretype ( unsigned char *xbuf, unsigned char *subindx, unsigned ch return 1; #else return 1; -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ } @@ -561,7 +561,7 @@ unsigned char oretype ( unsigned char *xbuf, unsigned char *subindx, unsigned ch +----------------------------------------------------------------------------*/ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *launchp ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE static char outbuf[160]; static char intvstr[32]; long intv; @@ -2065,7 +2065,7 @@ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *laun return outbuf; #else return ""; -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ } /*----------------------------------------------------------------------------+ @@ -2076,7 +2076,7 @@ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *laun +----------------------------------------------------------------------------*/ char *translate_ore_emu( unsigned char *buf, unsigned char *sunchanged, int *launchp ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE static char outbuf[160]; static char intvstr[32]; long intv; @@ -2384,11 +2384,11 @@ char *translate_ore_emu( unsigned char *buf, unsigned char *sunchanged, int *lau return outbuf; #else return ""; -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ } -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE /*---------------------------------------------------------------------+ | Display stored data for Oregon, Electrisave, and OWL sensors | +---------------------------------------------------------------------*/ @@ -2644,9 +2644,9 @@ int show_oregon ( void ) return 0; } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE /*---------------------------------------------------------------------+ | Display an Oregon data value stored in the x10state structure. | +---------------------------------------------------------------------*/ @@ -3072,12 +3072,12 @@ int c_ore_emu ( int argc, char *argv[] ) } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ int ore_maxmin_temp ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE double tvalue; int tflag; char tscale, tscale_init; @@ -3137,7 +3137,7 @@ int ore_maxmin_temp ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens int ore_maxmin_rh ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE double rhvalue; int rhflag; char rhscale; @@ -3182,7 +3182,7 @@ int ore_maxmin_rh ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) int ore_maxmin_bp ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE double bpvalue; int bpflag; char bpunits[NAME_LEN + 1]; @@ -3322,7 +3322,7 @@ int ore_maxmin_bp ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) +---------------------------------------------------------------------*/ int set_elec1_nvar ( int nvar ) { -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE int j; for ( j = 0; j < orechk_size; j++ ) { diff --git a/poll.c b/poll.c index 8978f10..817495c 100644 --- a/poll.c +++ b/poll.c @@ -793,7 +793,7 @@ int check4poll( int showdata, int timeout ) if ( xtype == 3 ) { x10state_update_ext3func(buf + i, &launchp); } -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 else if ( xtype == 0 ) { x10state_update_ext0func(buf + i, &launchp); } diff --git a/process.c b/process.c index 97b7e2e..b524f8a 100644 --- a/process.c +++ b/process.c @@ -10550,7 +10550,7 @@ int c_show1 ( int argc, char *argv[] ) printf(" l[aunchers] [H] Launchers, all or only housecode H or -e|p|r|s|t\n"); printf(" h[ousemap] [H] Overall system state, or details housecode H (*)\n"); printf(" da[wndusk] Display Dawn and Dusk times for today (*)\n"); -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX printf(" dim[levels] Dim levels of modules as percent (*)\n"); #else printf(" di[mlevels] Dim levels of modules as percent (*)\n"); @@ -10563,25 +10563,25 @@ int c_show1 ( int argc, char *argv[] ) printf(" c[onfig] Display stripped Heyu configuration file\n"); printf(" x[10security] Tabular display of all X10 Security sensors (*)\n"); -#ifdef HASRFXS -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXS +#ifdef HAVE_FEATURE_RFXM printf(" rfxs[ensors] Tabular display of all RFXSensors (*)\n"); #else printf(" rf[xsensors] Tabular display of all RFXSensors (*)\n"); #endif #endif -#ifdef HASRFXM -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXM +#ifdef HAVE_FEATURE_RFXS printf(" rfxm[eters] Tabular display of all RFXMeters (*)\n"); #else printf(" rf[xmeters] Tabular display of all RFXMeters (*)\n"); #endif #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX printf(" dig[imax] Tabular display of all DigiMax (*)\n"); #endif -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE printf(" or[egon] Tabular display of all Oregon sensors (*)\n"); printf(" ot[hers] Cumulative received address map (*) - clear with\n"); #else @@ -10809,11 +10809,11 @@ int c_show2 ( int argc, char *argv[] ) return show_x10_security(); } -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM else if ( strncmp("rfxmeters", argv[2], 4) == 0 ) { return show_rfxmeters(); } -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS else if ( (strlen(argv[2]) == 2 && strcmp("rf", argv[2]) == 0) || (strlen(argv[2]) == 3 && strcmp("rfx", argv[2]) == 0) ) { fprintf(stderr, "%s is ambiguous - supply more characters.\n", argv[2]); @@ -10827,11 +10827,11 @@ int c_show2 ( int argc, char *argv[] ) #endif -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS else if ( strncmp("rfxsensors", argv[2], 4) == 0 ) { return show_rfxsensors(); } -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM else if ( (strlen(argv[2]) == 2 && strcmp("rf", argv[2]) == 0) || (strlen(argv[2]) == 3 && strcmp("rfx", argv[2]) == 0) ) { fprintf(stderr, "%s is ambiguous - supply more characters.\n", argv[2]); @@ -10847,7 +10847,7 @@ int c_show2 ( int argc, char *argv[] ) else if ( strncmp(argv[2], "digimax", 3) == 0 ) { return show_digimax(); } -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE else if ( strncmp(argv[2], "oregon", 2) == 0 ) { return show_oregon(); } diff --git a/rfxcom.c b/rfxcom.c index 7533a9c..9362ea5 100644 --- a/rfxcom.c +++ b/rfxcom.c @@ -114,7 +114,7 @@ char *translate_rfxtype_message( unsigned char *buf ) { static char outbuf[80]; -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS sprintf(outbuf, "RFXSensorXmitter : Type %c, version %d, sample_mode %s", (char)buf[2], buf[3] & 0x7fu, (buf[3] & 0x80u ? "slow" : "fast")); #else @@ -153,7 +153,7 @@ int send_rfxsensor_ident ( unsigned short sensor, unsigned char *serial ) char *translate_rfxsensor_ident ( unsigned char *buf ) { static char outbuf[80]; -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS unsigned char addr; unsigned char chip; unsigned long serial = 0; @@ -170,13 +170,13 @@ char *translate_rfxsensor_ident ( unsigned char *buf ) addr, ((chip == 0x26) ? "DS2438" : (chip == 0x28) ? "DS18B20" : "???"), serial ); #else sprintf(outbuf, "RFXSensorInit : Heyu support not configured."); -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ return outbuf; } -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS /*---------------------------------------------------------------------+ | Convert RFXSensor temperature short word to scaled double | | temperature. | @@ -282,7 +282,7 @@ void rfxdata2pot ( unsigned short hdata, unsigned short vdata, double *vad, doub return; } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ /*---------------------------------------------------------------------+ | Retrieve raw RFXSensor data | @@ -290,7 +290,7 @@ void rfxdata2pot ( unsigned short hdata, unsigned short vdata, double *vad, doub int raw_rfxsensor_data ( ALIAS *aliasp, int index, unsigned short *tdata, unsigned short *vdata, unsigned short *hdata ) { -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS unsigned char ident, /* delta, */base, offset /*, offbase */; if ( aliasp[index].vtype != RF_XSENSOR ) { @@ -306,7 +306,7 @@ int raw_rfxsensor_data ( ALIAS *aliasp, int index, unsigned short *tdata, *vdata = x10global.rfxdata[base][offset + RFX_S]; #else *tdata = *hdata = *vdata = 0; /* Keep some compilers happy */ -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ return 0; } @@ -318,7 +318,7 @@ int raw_rfxsensor_data ( ALIAS *aliasp, int index, unsigned short *tdata, int decode_rfxsensor_data ( ALIAS *aliasp, int index, unsigned int *inmap, unsigned int *outmap, double *tempp, double *vsupp, double *vadp, double *var2p ) { -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS unsigned short tdata, hdata, vdata; unsigned char ident, /* delta, */ base, offset, /* offbase, */flags, tflag, vflag, hflag; unsigned char hcode, ucode; @@ -408,11 +408,11 @@ int decode_rfxsensor_data ( ALIAS *aliasp, int index, unsigned int *inmap, #else *inmap = *outmap = 0; *tempp = *vsupp = *vadp = *var2p = 0.0; -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ return 0; } -#if (defined(HASRFXS) || defined(HASRFXM)) +#if (defined(HAVE_FEATURE_RFXS) || defined(HAVE_FEATURE_RFXM)) /*---------------------------------------------------------------------+ | Display a RFXSensor or RFXMeter data value stored in the x10state | | structure. | @@ -432,7 +432,7 @@ int c_rfxcmds ( int argc, char *argv[] ) char *display, *sp; unsigned short data, tdata = 0, vdata = 0, hdata = 0; char obuf[60]; -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM int retcode; #endif @@ -507,7 +507,7 @@ int c_rfxcmds ( int argc, char *argv[] ) panelid = 0; sp = " "; } -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM if ( strchr(" \t\r\n", *sp) == NULL || panelid < 0 || panelid >= 0xff ) { fprintf(stderr, "Invalid power panel number '%s'\n", argv[2]); return 1; @@ -523,7 +523,7 @@ int c_rfxcmds ( int argc, char *argv[] ) fprintf(stderr, "Power panel %d data not ready.\n", panelid); return 1; } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ return 0; } @@ -641,9 +641,9 @@ int c_rfxcmds ( int argc, char *argv[] ) return 0; } -#endif /* HASRFXS || HASRFXM */ +#endif /* HAVE_FEATURE_RFXS || HAVE_FEATURE_RFXM */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM /*---------------------------------------------------------------------+ | Display stored data for all RFXMeters | +---------------------------------------------------------------------*/ @@ -755,9 +755,9 @@ int show_rfxmeters ( void ) return 0; } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS /*---------------------------------------------------------------------+ | Display stored data for all RFXSensors | +---------------------------------------------------------------------*/ @@ -1060,9 +1060,9 @@ int x10state_update_rfxsensor ( unsigned char *buf, int len, int *launchp ) return 0; } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM /*----------------------------------------------------------------------------+ | Form the unsigned long RFXMeter word for storage and further processing | | from the last 4 bytes of the data received by the RFXCOMVL receiver | @@ -1610,7 +1610,7 @@ int powerpanel_query ( unsigned char panelid, unsigned long *rfxpower ) return 1; } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ /*------------------------------------------------------------------------+ | Interpret Virtual data string, update the state, and test whether | @@ -1621,7 +1621,7 @@ int powerpanel_query ( unsigned char panelid, unsigned long *rfxpower ) char *translate_rfxmeter ( unsigned char *buf, unsigned char *sunchanged, int *launchp ) { static char outbuf[160]; -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM char flagslist[80]; ALIAS *aliasp; unsigned char func, *vdatap, vtype, seq; @@ -1765,7 +1765,7 @@ char *translate_rfxmeter ( unsigned char *buf, unsigned char *sunchanged, int *l sprintf(outbuf, "func %12s : Type 0x%02x Data (hex) %02x %02x %02x %02x", "RFdata", vtype, vdatap[0], vdatap[1], vdatap[2], vdatap[3]); } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ return outbuf; } @@ -1782,7 +1782,7 @@ struct x10list_st { +----------------------------------------------------------------------------*/ int compress_x10list ( struct x10list_st *x10list, int *listsize ) { -#ifdef HASKAKU +#ifdef HAVE_FEATURE_KAKU struct x10list_st duplist[256]; int j, k, newsize; unsigned char hcode; @@ -1804,7 +1804,7 @@ int compress_x10list ( struct x10list_st *x10list, int *listsize ) newsize++; } *listsize = newsize; -#endif /* HASKAKU */ +#endif /* HAVE_FEATURE_KAKU */ return 0; } @@ -1819,7 +1819,7 @@ int compress_x10list ( struct x10list_st *x10list, int *listsize ) char *translate_kaku ( unsigned char *xbuf, unsigned char *sunchanged, int *launchp ) { -#ifdef HASKAKU +#ifdef HAVE_FEATURE_KAKU static char outbuf[2048]; extern unsigned int signal_source; extern unsigned int kmodmask[NumKmodMasks][16]; @@ -2165,7 +2165,7 @@ char *translate_kaku ( unsigned char *xbuf, unsigned char *sunchanged, int *laun #else return ""; -#endif /* HASKAKU */ +#endif /* HAVE_FEATURE_KAKU */ } diff --git a/x10.c b/x10.c index 3f6d85c..3af8373 100644 --- a/x10.c +++ b/x10.c @@ -239,7 +239,7 @@ struct cmdentry { {"nightstate", c_sunstate, 1, 1}, {"darkstate", c_sunstate, 1, 1}, {"restore_groups", c_restore_groups, 1, 0}, -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS {"rfxflag_state", c_x10state, 1, 1}, {"rfxtemp", c_rfxcmds, 1, 1}, {"rfxrh", c_rfxcmds, 1, 1}, @@ -251,7 +251,7 @@ struct cmdentry { {"rfxtemp2", c_rfxcmds, 1, 1}, {"rfxlobat", c_rfxcmds, 1, 1}, #endif -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM {"rfxflag_state", c_x10state, 1, 1}, {"rfxpower", c_rfxcmds, 1, 1}, {"rfxwater", c_rfxcmds, 1, 1}, @@ -260,14 +260,14 @@ struct cmdentry { {"rfxcount", c_rfxcmds, 1, 1}, {"rfxpanel", c_rfxcmds, 1, 1}, #endif -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX {"dmxflag_state", c_x10state, 1, 1}, {"dmxtemp", c_dmxcmds, 1, 1}, {"dmxsetpoint", c_dmxcmds, 1, 1}, {"dmxstatus", c_dmxcmds, 1, 1}, {"dmxmode", c_dmxcmds, 1, 1}, -#endif /* HASDMX */ -#ifdef HASORE +#endif /* HAVE_FEATURE_DMX */ +#ifdef HAVE_FEATURE_ORE {"oreflag_state", c_x10state, 1, 1}, {"oretemp", c_orecmds, 1, 1}, {"orerh", c_orecmds, 1, 1}, @@ -283,7 +283,7 @@ struct cmdentry { {"owlpower", c_orecmds, 1, 1}, {"owlenergy", c_orecmds, 1, 1}, {"ore_emu", c_ore_emu, 1, 1}, -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ {"timer_times", c_timer_times, 1, 1}, {"webhook", c_webhook, 1, 1}, {"counter", c_counter, 1, 1}, diff --git a/x10aux.c b/x10aux.c index 04428c6..b0d7ecf 100644 --- a/x10aux.c +++ b/x10aux.c @@ -866,7 +866,7 @@ int rfxmeter_checksum ( unsigned char *buf ) // chksum &= 0x0fu; chksum = (chksum - 0x0fu) & 0x0fu; -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM return (int)chksum; #else return (int)0xffu; @@ -887,7 +887,7 @@ int rfxsensor_checksum ( unsigned char *buf ) chksum = ~chksum & 0x0fu; // chksum &= 0x0fu; -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS return (int)chksum; #else return (int)0xffu; @@ -934,7 +934,7 @@ unsigned char digimax_checksum ( unsigned char *buf ) (buf[4] >> 4) + (buf[4] & 0x0fu) + (buf[5] >> 4) + (buf[5] & 0x0fu)) & 0x0fu; -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX return (sum1 << 4) | sum2; #else return 0xffu; diff --git a/x10state.c b/x10state.c index d67371a..10897f7 100644 --- a/x10state.c +++ b/x10state.c @@ -3481,7 +3481,7 @@ void x10state_update_ext3func ( unsigned char *buf, int *launchp ) return; } -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 /*----------------------------------------------------------------------------+ | Update the x10state structure per the contents of the argument 'buf' | | for type 0 extended codes. 'buf' will always contain 4 bytes. | @@ -3714,7 +3714,7 @@ void x10state_update_ext0func ( unsigned char *buf, int *launchp ) return; } -#endif /* End of HASEXT0 block */ +#endif /* End of HAVE_FEATURE_EXT0 block */ /*----------------------------------------------------------------------------+ | Handler for extended code type/function which are otherwise undefined. | @@ -5902,7 +5902,7 @@ char *translate_virtual ( unsigned char *buf, int len, unsigned char *sunchanged ALIAS *aliasp; static char *typename[] = {"Std", "Ent", "Sec", "RFXSensor", "RFXMeter", "Dusk", "Visonic", "Noise"}; -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS char *marker = ""; char valbuf[60]; int stype; @@ -6123,7 +6123,7 @@ else { funclabel[func], hc, unit, vdata, aliasp[index].label); } } -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS else if ( vtype == RF_XSENSOR ) { hcode = ucode = 0; found = 0; @@ -6272,7 +6272,7 @@ else { snprintf(outbuf + strlen(outbuf), sizeof(outbuf), "%s", (*sunchanged ? " UnChg" : " Chg")); } } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ else if ( vtype == RF_RAWW800 ) { x10global.longvdata = (buf[3] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; sprintf(outbuf, "func %12s : Data (hex) %02X %02X %02X %02X", @@ -6430,7 +6430,7 @@ char *translate_sent ( unsigned char *buf, int len, int *launchp ) if ( xtype == 3 ) { x10state_update_ext3func(buf + 1, launchp); } -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 else if ( xtype == 0 ) { x10state_update_ext0func(buf + 1, launchp); } @@ -6544,7 +6544,7 @@ char *translate_sent ( unsigned char *buf, int len, int *launchp ) } -#ifdef HASEXT0 +#ifdef HAVE_FEATURE_EXT0 else if ( xfunc == 0x01 ) { sprintf(outbuf, "func shOpenLim : hu %c%-2d%s level %d (%s)", hc, unit, stmp, xdata & 0x1f, lookup_label(hc, bmap)); @@ -6563,7 +6563,7 @@ char *translate_sent ( unsigned char *buf, int len, int *launchp ) else if ( xfunc == 0x0B ) { sprintf(outbuf, "func shCloseAll : hc %c", hc); } -#endif /* HASEXT0 block */ +#endif /* HAVE_FEATURE_EXT0 block */ else if ( xfunc == 0xff ) sprintf(outbuf, "func ExtCode : Incomplete xcode in buffer."); @@ -7119,28 +7119,28 @@ char **create_heyu_environment( LAUNCHER *launcherp, unsigned char option) unsigned long longvdata; int unit; -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX int tempc, settempc; unsigned char status, oostatus; -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#if (defined(HASRFXS) || defined(HASRFXM)) +#if (defined(HAVE_FEATURE_RFXS) || defined(HAVE_FEATURE_RFXM)) char valbuf[80]; #endif -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS unsigned int inmap, outmap; double temp, vsup, vad, var2; -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM unsigned long rfxdata; extern int npowerpanels; extern int powerpanel_query(unsigned char, unsigned long *); -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE int otempc; double otemp; int obaro; @@ -7158,7 +7158,7 @@ char **create_heyu_environment( LAUNCHER *launcherp, unsigned char option) extern char *forecast_txt( int ); int uvfactor; double dblpower, dblenergy; -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ #if 0 static struct { @@ -7388,7 +7388,7 @@ static struct { *ep++ = add_envptr(minibuf); } -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX if ( actfunc == DmxSetPtFunc ) { longvdata = x10global.longvdata; settempc = (int)((longvdata & TSETPMASK) >> TSETPSHIFT); @@ -7427,10 +7427,10 @@ static struct { } } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ } -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE if ( actfunc == OreTempFunc || actfunc == OreHumidFunc || actfunc == OreBaroFunc || actfunc == OreWeightFunc || actfunc == ElsCurrFunc || actfunc == OreWindSpFunc || actfunc == OreWindAvSpFunc || actfunc == OreWindDirFunc || @@ -7564,7 +7564,7 @@ static struct { } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ if ( actfunc == DimFunc || actfunc == BrightFunc ) { sprintf(minibuf, "X10_RawVal=%d", launcherp->rawdim); @@ -7887,7 +7887,7 @@ static struct { } } -#ifdef HASRFXM +#ifdef HAVE_FEATURE_RFXM /* Add RFXMeter data if any */ aliasp = configp->aliasp; @@ -7957,9 +7957,9 @@ static struct { } } -#endif /* HASRFXM */ +#endif /* HAVE_FEATURE_RFXM */ -#ifdef HASRFXS +#ifdef HAVE_FEATURE_RFXS /* Add RFXSensor data if any */ aliasp = configp->aliasp; j = 0; @@ -8033,9 +8033,9 @@ static struct { j++; } -#endif /* HASRFXS */ +#endif /* HAVE_FEATURE_RFXS */ -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX /* Add Digimax data if any */ aliasp = configp->aliasp; j = 0; @@ -8105,9 +8105,9 @@ static struct { j++; } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE /* Add Oregon data if any */ aliasp = configp->aliasp; aliasindex = 0; @@ -8318,7 +8318,7 @@ static struct { } aliasindex++; } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ /* Append the user's original environment */ for ( j = 0; j < size; j++ ) { @@ -10765,7 +10765,7 @@ int create_normal_launcher ( LAUNCHER *launcherp, int tokc, char **tokv ) *tokv[k] = '\0'; } -#ifdef HASDMX +#ifdef HAVE_FEATURE_DMX else if ( strcmp("heat", tbuf) == 0 || strcmp("notcool", tbuf) == 0 ) { /* Digimax */ launcherp->vflags |= DMX_HEAT; @@ -10806,9 +10806,9 @@ int create_normal_launcher ( LAUNCHER *launcherp, int tokc, char **tokv ) launcherp->notvflags |= DMX_TEMP; *tokv[k] = '\0'; } -#endif /* HASDMX */ +#endif /* HAVE_FEATURE_DMX */ -#ifdef HASORE +#ifdef HAVE_FEATURE_ORE else if ( strcmp("tmin", tbuf) == 0 ) { /* Oregon Temperature */ launcherp->vflags |= ORE_TMIN; @@ -10840,7 +10840,7 @@ int create_normal_launcher ( LAUNCHER *launcherp, int tokc, char **tokv ) launcherp->vflags |= ORE_BPMAX; *tokv[k] = '\0'; } -#endif /* HASORE */ +#endif /* HAVE_FEATURE_ORE */ } From a603b8f691c7c014772ba029754cb0f853fefae6 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sat, 6 Aug 2011 13:00:12 +0200 Subject: [PATCH 21/56] Fix problematic conditional build directives Replace unfortunate "#if HAVE_" directives with probably intended "#ifdef HAVE_" forms, or compilation may break if ./configure defines a HAVE_ but empty. Signed-off-by: Janusz Krzysztofik --- cmd.c | 2 +- digimax.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd.c b/cmd.c index 247bcfc..9cf71b8 100644 --- a/cmd.c +++ b/cmd.c @@ -1990,7 +1990,7 @@ void command_help ( char *command ) display_gen_help(helpstate); } -#if HAVE_FEATURE_RFXS +#ifdef HAVE_FEATURE_RFXS if ( (list & HELP_STATE) || (list & HELP_RFXS) ) { /* RFXSensor state commands */ printf("\n [RFXSensor state commands (H = Housecode, u = Single unit) - require heyu engine]\n"); diff --git a/digimax.c b/digimax.c index 3043389..0837baf 100644 --- a/digimax.c +++ b/digimax.c @@ -427,7 +427,7 @@ char *translate_digimax ( unsigned char *buf, unsigned char *sunchanged, int *la int show_digimax ( void ) { -#if HAVE_FEATURE_DMX +#ifdef HAVE_FEATURE_DMX ALIAS *aliasp; char hc; int unit, index, temp, count = 0, maxlabel = 0; From f52f6ed4ba5c0c86f56828a4291ab655c6352b47 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:57:11 +0200 Subject: [PATCH 22/56] Delegate -no Configure.sh switch processing to Autoconf Autoconf provides a standard mechanism for including/excluding parts of source code which provide optional features by means of --enable/ --disable command line options to ./configure. Make use of this feature instead of keeping the feature switch processing handled by ./Configure.sh. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 66 ++++++++++++++++++++++++---------------------------- configure.ac | 49 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 36 deletions(-) diff --git a/Configure.sh b/Configure.sh index d73c6d4..acf73eb 100755 --- a/Configure.sh +++ b/Configure.sh @@ -41,13 +41,7 @@ MAN5 = /usr/local/man/man5 EoF -CM17AFLAG="-DHAVE_FEATURE_CM17A" -EXT0FLAG="-DHAVE_FEATURE_EXT0" -RFXSENFLAG="-DHAVE_FEATURE_RFXS" -RFXMETFLAG="-DHAVE_FEATURE_RFXM" -DMXFLAG="-DHAVE_FEATURE_DMX" -OREFLAG="-DHAVE_FEATURE_ORE" -KAKUFLAG="-DHAVE_FEATURE_KAKU" +OPTIONS= while [ $# -ge 1 ] ; do case "$1" in @@ -70,26 +64,26 @@ while [ $# -ge 1 ] ; do rm Makefile exit ;; - nocm17a|-nocm17a|NOCM17A|-NOCM17A) - CM17AFLAG= + nocm17a|-nocm17a|NOCM17A|-NOCM17A|--disable-cm17a) + OPTIONS="$OPTIONS --disable-cm17a" ;; - noext0|-noext0|NOEXT0|-NOEXT0) - EXT0FLAG= + noext0|-noext0|NOEXT0|-NOEXT0|--disable-ext0) + OPTIONS="$OPTIONS --disable-ext0" ;; - norfxs|-norfxs|NORFXS|-NORFXS) - RFXSENFLAG= + norfxs|-norfxs|NORFXS|-NORFXS|--disable-rfxs) + OPTIONS="$OPTIONS --disable-rfxs" ;; - norfxm|-norfxm|NORFXM|-NORFXM) - RFXMETFLAG= + norfxm|-norfxm|NORFXM|-NORFXM|--disable-rfxm) + OPTIONS="$OPTIONS --disable-rfxm" ;; - nodmx|-nodmx|NODMX|-NODMX) - DMXFLAG= + nodmx|-nodmx|NODMX|-NODMX|--disable-dmx) + OPTIONS="$OPTIONS --disable-dmx" ;; - noore|-noore|NOORE|-NOORE) - OREFLAG= + noore|-noore|NOORE|-NOORE|--disable-ore) + OPTIONS="$OPTIONS --disable-ore" ;; - nokaku|-nokaku|NOKAKU|-NOKAKU) - KAKUFLAG= + nokaku|-nokaku|NOKAKU|-NOKAKU|--disable-kaku) + OPTIONS="$OPTIONS --disable-kaku" ;; flags=*|-flags=*|FLAGS=*|-FLAGS=*) IFS="${IFS}=" read keyword FLAGS <> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -206,7 +200,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG + DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -224,7 +218,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -236,7 +230,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; openbsd) @@ -246,14 +240,14 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; netbsd) cat >> Makefile <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -263,7 +257,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = wheel - DFLAGS = -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -279,7 +273,7 @@ EoF MAN5 = /usr/local/man/man.5 CFLAGS = -O \$(DFLAGS) LIBS = -lm -lc -lsocket - DFLAGS= -DSYSV -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DSYSV -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; aix|sysv) @@ -289,7 +283,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS = -DSYSV -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; attsvr4) @@ -300,7 +294,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; nextstep) @@ -308,7 +302,7 @@ EoF OWNER = root GROUP = sys CC = gcc - DFLAGS = -DPOSIX $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g \$(DFLAGS) -posix LDFLAGS = -posix LIBS = -lm -lposix @@ -321,7 +315,7 @@ EoF CC = gcc CFLAGS = -g \$(DFLAGS) LIBS = -lm -lc - DFLAGS = -DSYSV -DLOCKDIR=\"/var/spool/locks\" $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DSYSV -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; generic) @@ -331,7 +325,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= $CM17AFLAG $EXT0FLAG $RFXSENFLAG $RFXMETFLAG $DMXFLAG $OREFLAG $KAKUFLAG $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; *) @@ -351,7 +345,7 @@ EoF cat Makefile.in >> Makefile ( set -x - ./configure + ./configure $OPTIONS ) if [ "$SYS" = "sysv" ] ; then diff --git a/configure.ac b/configure.ac index f6c58fc..91b4035 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,55 @@ Copyright (C) 2011 Janusz Krzysztofik ]) AC_CONFIG_SRCDIR([relay.c]) AC_CONFIG_HEADERS([config.h]) +# Optional Features +AC_MSG_CHECKING([whether to enable CM17A Firecracker support]) + AC_ARG_ENABLE([cm17a], [AS_HELP_STRING([--disable-cm17a], + [omit support for optional CM17A Firecracker device])], [], + [enable_cm17a=yes]) + AC_MSG_RESULT([$enable_cm17a]) + AS_IF([test "x$enable_cm17a" != "xno"], [AC_DEFINE([HAVE_FEATURE_CM17A], + [1], [Define if you have the CM17A Firecracker device])], []) +AC_MSG_CHECKING([whether to enable extended type 0 shutter controllers support]) + AC_ARG_ENABLE([ext0], [AS_HELP_STRING([--disable-ext0], + [omit support for extended type 0 shutter controllers])], [], + [enable_ext0=yes]) + AC_MSG_RESULT([$enable_ext0]) + AS_IF([test "x$enable_ext0" != "xno"], [AC_DEFINE([HAVE_FEATURE_EXT0], + [1], [Define if you have extended type 0 shutter controllers])], + []) +AC_MSG_CHECKING([whether to enable RFXSensors support]) + AC_ARG_ENABLE([rfxs], [AS_HELP_STRING([--disable-rfxs], + [omit support for RFXSensors])], [], [enable_rfxs=yes]) + AC_MSG_RESULT([$enable_rfxs]) + AS_IF([test "x$enable_rfxs" != "xno"], [AC_DEFINE([HAVE_FEATURE_RFXS], + [1], [Define if you have RFXSensors])], []) +AC_MSG_CHECKING([whether to enable RFXMeters support]) + AC_ARG_ENABLE([rfxm], [AS_HELP_STRING([--disable-rfxm], + [omit support for RFXMeters])], [], [enable_rfxm=yes]) + AC_MSG_RESULT([$enable_rfxm]) + AS_IF([test "x$enable_rfxm" != "xno"], [AC_DEFINE([HAVE_FEATURE_RFXM], + [1], [Define if you have RFXMeters])], []) +AC_MSG_CHECKING([whether to enable Digimax thermostat support]) + AC_ARG_ENABLE([dmx], [AS_HELP_STRING([--disable-dmx], + [omit support for the Digimax thermostat])], [], + [enable_dmx=yes]) + AC_MSG_RESULT([$enable_dmx]) + AS_IF([test "x$enable_dmx" != "xno"], [AC_DEFINE([HAVE_FEATURE_DMX], + [1], [Define if you have Digimax thermostats])], []) +AC_MSG_CHECKING([whether to enable Oregon sensors support]) + AC_ARG_ENABLE([ore], [AS_HELP_STRING([--disable-ore], + [omit support for Oregon sensors])], [], [enable_ore=yes]) + AC_MSG_RESULT([$enable_ore]) + AS_IF([test "x$enable_ore" != "xno"], [AC_DEFINE([HAVE_FEATURE_ORE], + [1], [Define if you have Oregon sensors])], []) +AC_MSG_CHECKING([whether to enable support for KaKu/HomeEasy signals]) + AC_ARG_ENABLE([kaku], [AS_HELP_STRING([--disable-kaku], + [omit support for KaKu/HomeEasy signals])], [], + [enable_kaku=yes]) + AC_MSG_RESULT([$enable_kaku]) + AS_IF([test "x$enable_kaku" != "xno"], [AC_DEFINE([HAVE_FEATURE_KAKU], + [1], [Define if you have KaKu/HomeEasy devices])], []) + # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET From 77934742d55d1226d716df96ed4d31898bf2bb9d Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 09:58:39 +0200 Subject: [PATCH 23/56] Check for struct termios/termio instead of custom defined symbols In the current Heyu code, system dependent paths in tty setup/cleanup procedures are chosen based on SYSV and/or POSIX macros provided by ./Configure.sh. However this can be done with help of autotools tests for particular structure type definitions presence. So, take the former POSIX path if "struct termios" type is recognised, or the former SYSV path if "struct termio" can be used, otherwise use "struct sgtty". Once done, drop no longer used SYSV macro definition from ./Configure.sh. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 17 +++++++------- configure.ac | 16 +++++++++++++ tty.c | 63 ++++++++++++++++++++------------------------------- tty_aux.c | 64 ++++++++++++++++++++++------------------------------ 4 files changed, 76 insertions(+), 84 deletions(-) diff --git a/Configure.sh b/Configure.sh index acf73eb..219eb4e 100755 --- a/Configure.sh +++ b/Configure.sh @@ -36,7 +36,6 @@ MAN = /usr/local/man/man1 MAN5 = /usr/local/man/man5 # set DFLAGS equal to: -# -DSYSV if using SYSTEM V # -DVOID if compiler doesn't understand 'void' EoF @@ -160,7 +159,7 @@ case "$SYS" in GROUP = root CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = -DSYSV -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG LIBS = -lm -lc EoF ;; @@ -177,7 +176,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -200,7 +199,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" + DFLAGS = -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -218,7 +217,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -273,7 +272,7 @@ EoF MAN5 = /usr/local/man/man.5 CFLAGS = -O \$(DFLAGS) LIBS = -lm -lc -lsocket - DFLAGS= -DSYSV -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; aix|sysv) @@ -283,7 +282,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS = -DSYSV -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; attsvr4) @@ -294,7 +293,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DSYSV -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; nextstep) @@ -315,7 +314,7 @@ EoF CC = gcc CFLAGS = -g \$(DFLAGS) LIBS = -lm -lc - DFLAGS = -DSYSV -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; generic) diff --git a/configure.ac b/configure.ac index 91b4035..407de69 100644 --- a/configure.ac +++ b/configure.ac @@ -105,6 +105,22 @@ AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_UNSIGNED_LONG_LONG_INT +AC_CHECK_TYPES([struct termios], [], [], [ +#ifdef HAVE_SYS_TERMIOS_H +# include +#endif +#ifdef HAVE_TERMIOS_H +# include +#endif +]) +AC_CHECK_TYPES([struct termio], [], [], [ +#ifdef HAVE_SYS_TERMIO_H +# include +#endif +#ifdef HAVE_TERMIO_H +# include +#endif +]) # Checks for declarations. AC_CHECK_DECLS(timezone, [], [], [ diff --git a/tty.c b/tty.c index 05ede3c..8f54dd6 100644 --- a/tty.c +++ b/tty.c @@ -110,44 +110,35 @@ int lock_device(); int tty = TTY_CLOSED; /* Real tty */ int sptty = -1; /* Spool */ -#ifdef POSIX -#ifndef SYSV -#define SYSV /* POSIX implies SYSV */ -#endif -#endif - #ifdef HAVE_SYS_IOCTL_H #include #endif -#ifndef SYSV -#ifdef HAVE_SGTTY_H -#include -#endif +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) +# include struct sgttyb oldsb, newsb; void hangup(); #else -#ifndef POSIX -#ifdef HAVE_TERMIO_H -#include -#endif -#ifndef NCC -#define NCC NCCS -#endif +# ifndef HAVE_STRUCT_TERMIOS +# ifdef HAVE_TERMIO_H +# include +# endif +# ifdef HAVE_SYS_TERMIO_H +# include +# endif struct termio oldsb, newsb; -#else -#ifdef HAVE_TERMIOS_H -#include -#endif -#ifdef HAVE_SYS_IOCTL_H -#include -#endif -#ifndef NCC -#define NCC NCCS -#endif +# else +# ifdef HAVE_TERMIOS_H +# include +# endif +# ifdef HAVE_SYS_TERMIOS_H +# include +# endif struct termios oldsb, newsb; -#endif - +# endif +# ifndef NCC +# define NCC NCCS +# endif #endif int setup_tty ( int lockflag ) @@ -191,7 +182,7 @@ int setup_tty ( int lockflag ) #endif -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) /* Old-style BSD/v7 sgtty calls */ (void) ioctl(tty, TIOCFLUSH, (struct sgttyb *) NULL); (void) ioctl(tty, TIOCGETP, &oldsb); @@ -201,8 +192,7 @@ int setup_tty ( int lockflag ) hangup(); newsb.sg_ispeed = newsb.sg_ospeed = B4800; /* raise DTR & set speed */ (void) ioctl(tty, TIOCSETN, &newsb); -#else -#ifndef POSIX +#elif !defined(HAVE_STRUCT_TERMIOS) /* SVr2-style termio */ if ( ioctl(tty, TCGETA, &oldsb) < 0 ) { syslog(LOG_ERR,"ioctl get"); @@ -261,7 +251,6 @@ int setup_tty ( int lockflag ) tcsetattr(tty, TCSADRAIN, &newsb); } #endif -#endif #ifdef O_NONBLOCK /* Now that we have set CLOCAL on the port, we can use blocking I/O */ @@ -277,19 +266,17 @@ void restore_tty() if ( tty == TTY_DUMMY ) return; -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) hangup(); (void) ioctl(tty, TIOCSETN, &oldsb); -#else -#ifndef POSIX +#elif !defined(HAVE_STRUCT_TERMIOS) (void) ioctl(tty, TCSETAF, &oldsb); #else tcsetattr(tty, TCSADRAIN, &oldsb); #endif -#endif } -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) void hangup() { newsb.sg_ispeed = newsb.sg_ospeed = B0; /* drop DTR */ diff --git a/tty_aux.c b/tty_aux.c index 152f2e3..a6f8849 100644 --- a/tty_aux.c +++ b/tty_aux.c @@ -109,41 +109,35 @@ int lock_device(); int tty_aux = -1; /* Real tty */ -#ifdef POSIX -#ifndef SYSV -#define SYSV /* POSIX implies SYSV */ -#endif +#ifdef HAVE_SYS_IOCTL_H +#include #endif - -#ifndef SYSV -#ifdef HAVE_SGTTY_H -#include -#endif +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) +# include struct sgttyb oldsb, newsb; void hangup(); #else -#ifndef POSIX -#ifdef HAVE_TERMIO_H -#include -#endif -#ifndef NCC -#define NCC NCCS -#endif +# ifndef HAVE_STRUCT_TERMIOS +# ifdef HAVE_TERMIO_H +# include +# endif +# ifdef HAVE_SYS_TERMIO_H +# include +# endif struct termio oldsb, newsb; -#else -#ifdef HAVE_TERMIOS_H -#include -#endif -#ifdef HAVE_SYS_IOCTL_H -#include -#endif -#ifndef NCC -#define NCC NCCS -#endif +# else +# ifdef HAVE_TERMIOS_H +# include +# endif +# ifdef HAVE_SYS_TERMIOS_H +# include +# endif struct termios oldsb, newsb; -#endif - +# endif +# ifndef NCC +# define NCC NCCS +# endif #endif /*---------------------------------------------------------------+ @@ -252,7 +246,7 @@ int setup_tty_aux( int auxbaud, int lockflag ) #endif -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) /* Old-style BSD/v7 sgtty calls */ (void) ioctl(tty_aux, TIOCFLUSH, (struct sgttyb *) NULL); (void) ioctl(tty_aux, TIOCGETP, &oldsb); @@ -262,8 +256,7 @@ int setup_tty_aux( int auxbaud, int lockflag ) hangup(); newsb.sg_ispeed = newsb.sg_ospeed = auxbaud; /* raise DTR & set speed */ (void) ioctl(tty_aux, TIOCSETN, &newsb); -#else -#ifndef POSIX +#elif !defined(HAVE_STRUCT_TERMIOS) /* SVr2-style termio */ if (ioctl(tty_aux, TCGETA, &oldsb) < 0) { syslog(LOG_ERR,"ioctl get"); @@ -322,7 +315,6 @@ int setup_tty_aux( int auxbaud, int lockflag ) tcsetattr(tty_aux, TCSADRAIN, &newsb); } #endif -#endif #ifdef O_NONBLOCK /* Now that we have set CLOCAL on the port, we can use blocking I/O */ @@ -335,19 +327,17 @@ int setup_tty_aux( int auxbaud, int lockflag ) void restore_tty_aux() { -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) hangup(); (void) ioctl(tty_aux, TIOCSETN, &oldsb); -#else -#ifndef POSIX +#elif !defined(HAVE_STRUCT_TERMIOS) (void) ioctl(tty_aux, TCSETAF, &oldsb); #else tcsetattr(tty_aux, TCSADRAIN, &oldsb); #endif -#endif } -#ifndef SYSV +#if !defined(HAVE_STRUCT_TERMIOS) && !defined(HAVE_STRUCT_TERMIO) void hangup_aux() { newsb.sg_ispeed = newsb.sg_ospeed = B0; /* drop DTR */ From 6f95e01d890a7724eeac9ca05503eb12de06f0cd Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sat, 6 Aug 2011 14:03:05 +0200 Subject: [PATCH 24/56] Replace custom POSIX symbol with unistd.h provided _POSIX_VERSION Instead of passing a custom POSIX macro definition to compiler, check for _POSIX_VERSION macro, which should be defined on POSIX systems when is included. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 22 +++++++++++----------- date.c | 2 +- x10state.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Configure.sh b/Configure.sh index 219eb4e..ba9163d 100755 --- a/Configure.sh +++ b/Configure.sh @@ -159,7 +159,7 @@ case "$SYS" in GROUP = root CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG LIBS = -lm -lc EoF ;; @@ -176,7 +176,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -199,7 +199,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DPOSIX -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" + DFLAGS = -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -217,7 +217,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -229,7 +229,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; openbsd) @@ -239,14 +239,14 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DPOSIX -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; netbsd) cat >> Makefile <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/lock\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/lock\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -256,7 +256,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = wheel - DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -282,7 +282,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; attsvr4) @@ -293,7 +293,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DPOSIX -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG EoF ;; nextstep) @@ -301,7 +301,7 @@ EoF OWNER = root GROUP = sys CC = gcc - DFLAGS = -DPOSIX $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG CFLAGS = -g \$(DFLAGS) -posix LDFLAGS = -posix LIBS = -lm -lposix diff --git a/date.c b/date.c index da120e7..b00fc31 100644 --- a/date.c +++ b/date.c @@ -85,7 +85,7 @@ int c_date( int argc, char *argv[] ) expire = expire; /* Keep compiler from complaining */ today = dowX2U(Idays); -#ifndef POSIX +#ifndef _POSIX_VERSION while (tp->tm_wday % 7 != today) tp->tm_wday++, tp->tm_mday++; #endif diff --git a/x10state.c b/x10state.c index 10897f7..76467ee 100644 --- a/x10state.c +++ b/x10state.c @@ -74,7 +74,7 @@ # endif #endif -#ifdef POSIX +#ifdef _POSIX_VERSION #define EXEC_POSIX #endif From 01215323ead1b068041211912ffea249779473f0 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:47:55 +0200 Subject: [PATCH 25/56] Add Autoconf support to recent RFXLAN related code additions RFXLAN support, which depends on header files and library functions not used before, had been added to Heyu before Autoconf support has been implemented, so it may break the code portability. This patch extends Autoconf support over the RFXLAN bits. If a header file or a function definition required by the RFXLAN related code is missing, this functionality will be omitted from the binary. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 4 ++++ INSTALL | 6 ++++++ README.INSTALL | 6 ++++++ config.c | 4 ++++ configure.ac | 13 +++++++++++++ process.h | 2 ++ tty_aux.c | 12 ++++++++++++ 7 files changed, 47 insertions(+) diff --git a/Configure.sh b/Configure.sh index ba9163d..11d90bf 100755 --- a/Configure.sh +++ b/Configure.sh @@ -56,6 +56,7 @@ while [ $# -ge 1 ] ; do echo " Switch -nodmx omits support for the Digimax thermostat." echo " Switch -noore omits support for Oregon sensors." echo " Switch -nokaku omits support for KaKu/HomeEasy signals" + echo " Switch -norfxlan omits support for RFXLAN receiver" echo " Switch -flags=n sets the number of user flags (32 min, 1024 max)" echo " Switch -counters=n sets the number of counters (32 min, 1024 max)" echo " Switch -timers=n sets the number of timers (32 min, 1024 max)" @@ -84,6 +85,9 @@ while [ $# -ge 1 ] ; do nokaku|-nokaku|NOKAKU|-NOKAKU|--disable-kaku) OPTIONS="$OPTIONS --disable-kaku" ;; + norfxlan|-norfxlan|NORFXLAN|-NORFXLAN|--disable-rfxlan) + OPTIONS="$OPTIONS --disable-rfxlan" + ;; flags=*|-flags=*|FLAGS=*|-FLAGS=*) IFS="${IFS}=" read keyword FLAGS <max_dusk = DEF_MAX_DUSK; strncpy2(configp->tty, DEF_TTY, sizeof(config.tty) - 1); configp->ttyaux[0] = '\0'; +#ifdef HAVE_FEATURE_RFXLAN configp->auxhost[0] = '\0'; configp->auxport[0] = '\0'; +#endif configp->suffixaux[0] = '\0'; configp->auxdev = 0; configp->newformat = 0; @@ -1309,6 +1311,7 @@ int parse_config_tail ( char *buffer, unsigned char source ) break; } +#ifdef HAVE_FEATURE_RFXLAN if ( ( configp->auxdev == DEV_RFXCOM32 || configp->auxdev == DEV_RFXCOMVL ) && *configp->ttyaux != '/' ) { sp = strchr(tokv[0], ':'); @@ -1321,6 +1324,7 @@ int parse_config_tail ( char *buffer, unsigned char source ) (void) strncpy2(configp->auxport, sp, sizeof(config.auxport) - 1); } } +#endif if ( configp->auxdev == DEV_RFXCOMVL && tokc > 2 ) { strupper(tokv[2]); diff --git a/configure.ac b/configure.ac index 407de69..4cc4976 100644 --- a/configure.ac +++ b/configure.ac @@ -148,5 +148,18 @@ AC_CHECK_FUNCS([alarm floor ftruncate gettimeofday memmove memset putenv]) AC_CHECK_FUNCS([socket sqrt strchr strdup strerror strrchr strstr strtol]) AC_CHECK_FUNCS([nanosleep nsleep setitimer sigaction siginterrupt]) +AC_MSG_CHECKING(whether to enable RFXLAN receiver support) + AC_ARG_ENABLE([rfxlan], [AS_HELP_STRING([--disable-rfxlan], + [omit support for RFXLAN receiver])], [], [enable_rfxlan=yes]) + AS_IF([test "x$enable_rfxlan" != "xno" && + test "x$ac_cv_header_netdb_h" != "xyes" \ + -o "x$ac_cv_func_memset" != "xyes" \ + -o "x$ac_cv_func_socket" != "xyes"], + [enable_rfxlan=no], []) + AC_MSG_RESULT($enable_rfxlan) + AS_IF([test "x$enable_rfxlan" != "xno"], + [AC_DEFINE([HAVE_FEATURE_RFXLAN], [1], + [Define if you have RFXLAN receiver])], []) + dnl AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/process.h b/process.h index 89691dd..e18d8a1 100644 --- a/process.h +++ b/process.h @@ -1224,8 +1224,10 @@ typedef struct { char tty[PATH_LEN + 1]; /* Serial port to use */ char suffix[PATH_LEN + 1]; /* Suffix for file locks */ char ttyaux[PATH_LEN + 1]; /* Auxiliary input serial port */ +#ifdef HAVE_FEATURE_RFXLAN char auxhost[NAME_LEN + 1]; /* Auxiliary input network host address or name */ char auxport[NAME_LEN + 1]; /* Auxiliary input network port number or name */ +#endif char suffixaux[PATH_LEN + 1]; /* Suffix for aux file lock */ char ttyrfxmit[PATH_LEN + 1]; /* RFXmitter serial port */ unsigned char rfxmit_freq; /* RFXmitter frequency */ diff --git a/tty_aux.c b/tty_aux.c index a6f8849..4a8c65f 100644 --- a/tty_aux.c +++ b/tty_aux.c @@ -81,8 +81,14 @@ #include #endif +#ifdef HAVE_FEATURE_RFXLAN +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#endif #include "x10.h" #include "process.h" @@ -183,6 +189,8 @@ int setup_tty_aux( int auxbaud, int lockflag ) syslog(LOG_ERR, "Opening tty_aux line."); #endif +#ifdef HAVE_FEATURE_RFXLAN +#if defined(HAVE_NETDB_H) && defined(HAVE_MEMSET) && defined(HAVE_SOCKET) if ( configp->auxhost[0] && configp->auxport[0] ) { struct addrinfo hints; struct addrinfo *result, *rp; @@ -227,6 +235,10 @@ int setup_tty_aux( int auxbaud, int lockflag ) } } } +#else +#error "No system support required for RFXLAN feature, please disable." +#endif +#endif #ifdef O_NONBLOCK /* Open with non-blocking I/O, we'll fix after we set CLOCAL */ From 8e51c224861be79937dce0bc44f9453b6116dcdc Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 11:01:35 +0200 Subject: [PATCH 26/56] Delegate flags/counters/timers Configure.sh setup to Autoconf The number of user flags, counters and timers can also be put into config.h using standard Autoconf methods. Use this instead of the ./Configure.sh setting up the Makefile to pass them as compiler options. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 52 ++++++++++++++++++++-------------------------------- configure.ac | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/Configure.sh b/Configure.sh index 11d90bf..d589de6 100755 --- a/Configure.sh +++ b/Configure.sh @@ -92,34 +92,19 @@ while [ $# -ge 1 ] ; do IFS="${IFS}=" read keyword FLAGS <> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -221,7 +206,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = sys - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG LIBS = -lm -lc -lrt EoF @@ -233,7 +218,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" EoF ;; openbsd) @@ -243,14 +228,14 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" EoF ;; netbsd) cat >> Makefile <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DLOCKDIR=\"/var/spool/lock\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/lock\" CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -260,7 +245,7 @@ EoF cat >> Makefile <<-EoF OWNER = root GROUP = wheel - DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc @@ -276,7 +261,7 @@ EoF MAN5 = /usr/local/man/man.5 CFLAGS = -O \$(DFLAGS) LIBS = -lm -lc -lsocket - DFLAGS= -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" EoF ;; aix|sysv) @@ -286,7 +271,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = EoF ;; attsvr4) @@ -297,7 +282,7 @@ EoF CC = cc CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" EoF ;; nextstep) @@ -305,7 +290,7 @@ EoF OWNER = root GROUP = sys CC = gcc - DFLAGS = $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = CFLAGS = -g \$(DFLAGS) -posix LDFLAGS = -posix LIBS = -lm -lposix @@ -318,7 +303,7 @@ EoF CC = gcc CFLAGS = -g \$(DFLAGS) LIBS = -lm -lc - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS = -DLOCKDIR=\"/var/spool/locks\" EoF ;; generic) @@ -328,7 +313,7 @@ EoF CC = gcc CFLAGS = -g -O \$(DFLAGS) -Wall LIBS = -lm -lc - DFLAGS= $FLAGS_FLAG $TIMERS_FLAG $COUNTERS_FLAG + DFLAGS= EoF ;; *) @@ -349,7 +334,10 @@ cat Makefile.in >> Makefile ( set -x ./configure $OPTIONS -) +) || { + rm Makefile + exit +} if [ "$SYS" = "sysv" ] ; then echo "The Makefile has been created for sysv, however if" diff --git a/configure.ac b/configure.ac index 4cc4976..bb1fd7e 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,38 @@ AC_MSG_CHECKING([whether to enable support for KaKu/HomeEasy signals]) AS_IF([test "x$enable_kaku" != "xno"], [AC_DEFINE([HAVE_FEATURE_KAKU], [1], [Define if you have KaKu/HomeEasy devices])], []) +AC_MSG_CHECKING([for number of user flags]) + AC_ARG_VAR([FLAGS], [set number of user flags (1 < n < 1024) [32]]) + AS_IF([test "x$FLAGS" = "x"], [FLAGS=32], + AS_IF([test $FLAGS -ge 1 && test $FLAGS -le 1024], + [FLAGS=`expr \( $FLAGS + 31 \) / 32 \* 32` + AC_DEFINE_UNQUOTED([NUM_FLAG_BANKS], [`expr $FLAGS / 32`], + [Define if you need more than 1 bank of 32 user flags each])], + AC_MSG_FAILURE( + [wrong FLAGS value "$FLAGS" (shoud be 1 < n < 1024)]))) + AC_MSG_RESULT([$FLAGS]) +AC_MSG_CHECKING([for number of user counters]) + AC_ARG_VAR([COUNTERS], + [set number of user counters (1 < n < 1024) [32]]) + AS_IF([test "x$COUNTERS" = "x"], [COUNTERS=32], + AS_IF([test $COUNTERS -ge 1 && test $COUNTERS -le 1024], + [COUNTERS=`expr \( $COUNTERS + 31 \) / 32 \* 32` + AC_DEFINE_UNQUOTED([NUM_COUNTER_BANKS], [`expr $COUNTERS / 32`], + [Define if you need more than 1 bank of 32 user counters each] + )], AC_MSG_FAILURE( + [wrong COUNTERS value "$COUNTERS" (shoud be 1 < n < 1024)]))) + AC_MSG_RESULT([$COUNTERS]) +AC_MSG_CHECKING([for number of user timers]) + AC_ARG_VAR([TIMERS], [set number of user timers (1 < n < 1024) [32]]) + AS_IF([test "x$TIMERS" = "x"], [TIMERS=32], + AS_IF([test $TIMERS -ge 1 && test $TIMERS -le 1024], + [TIMERS=`expr \( $TIMERS + 31 \) / 32 \* 32` + AC_DEFINE_UNQUOTED([NUM_TIMER_BANKS], [`expr $TIMERS / 32`], + [Define if you need more than 1 bank of 32 user timers each])], + AC_MSG_FAILURE( + [wrong TIMERS value "$TIMERS" (shoud be 1 < n < 1024)]))) + AC_MSG_RESULT([$TIMERS]) + # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET From 884184639494b267539e15a2a553c267b745c784 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:01:31 +0200 Subject: [PATCH 27/56] Replace custom VOID symbol with Autoconf equivalent From Configure.sh: # set DFLAGS equal to: # -DVOID if compiler doesn't understand 'void' Form x10.h: /* Some lints don't know about the void type */ #ifdef VOID #define void int #endif Use Autoconf to detect if void type is valid instead of instructing users to define a symbol if it's not. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 3 --- configure.ac | 1 + x10.h | 6 +++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Configure.sh b/Configure.sh index d589de6..529cc0e 100755 --- a/Configure.sh +++ b/Configure.sh @@ -35,9 +35,6 @@ BIN = /usr/local/bin MAN = /usr/local/man/man1 MAN5 = /usr/local/man/man5 -# set DFLAGS equal to: -# -DVOID if compiler doesn't understand 'void' - EoF OPTIONS= diff --git a/configure.ac b/configure.ac index bb1fd7e..9b45b7a 100644 --- a/configure.ac +++ b/configure.ac @@ -137,6 +137,7 @@ AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_UNSIGNED_LONG_LONG_INT +AC_CHECK_TYPES([void], [], [], []) AC_CHECK_TYPES([struct termios], [], [], [ #ifdef HAVE_SYS_TERMIOS_H # include diff --git a/x10.h b/x10.h index 2034d42..4a52e18 100644 --- a/x10.h +++ b/x10.h @@ -40,8 +40,12 @@ #ifndef _x10_header #define _x10_header +#ifdef HAVE_CONFIG_H +#include +#endif + /* Some lints don't know about the void type */ -#ifdef VOID +#ifndef HAVE_VOID #define void int #endif From d152e9b01d6a7084bd2534168bb7d71432baeb10 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:05:44 +0200 Subject: [PATCH 28/56] Let Autoconf create Makefile from Makefile.in Further migration to Autotools requires activation of Makefile auto- generation feature of Autoconf, with Makefile.in serving as a template. Instead of creating the top of Makefile by Configure.sh script and appending its bottom directly from Makefile.in, put the top into a separate config.mk file and include it from the Makefile.in. Then, allow configure to create a Makefile from the Makefile.in template. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 63 ++++++++++++++++++++++---------------------------- INSTALL | 4 ++-- Makefile.in | 7 ++++-- README.INSTALL | 4 ++-- configure.ac | 2 +- 5 files changed, 38 insertions(+), 42 deletions(-) diff --git a/Configure.sh b/Configure.sh index 529cc0e..a7326d3 100755 --- a/Configure.sh +++ b/Configure.sh @@ -23,14 +23,14 @@ SYS= # Heading -cat > Makefile < config.mk <> Makefile <> config.mk </dev/null && type autoheader >/dev/null || { echo "Please install autoconf package and re-run ./Configure.sh" - rm Makefile + rm -f Makefile exit } autoconf @@ -137,10 +137,10 @@ fi CC=gcc #Set default for later -echo "#This makefile is built for $SYS" >> Makefile +echo "#This makefile is built for $SYS" >> config.mk case "$SYS" in linux) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = root CC = gcc @@ -152,14 +152,14 @@ EoF sunos*|solaris) type gcc > /dev/null if [ $? = 0 ] ; then - echo "CC = gcc" >> Makefile + echo "CC = gcc" >> config.mk WALLFLAG=-Wall else CC=cc - echo "CC = cc" >> Makefile + echo "CC = cc" >> config.mk WALLFLAG= fi - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys DFLAGS = -DLOCKDIR=\"/var/spool/locks\" @@ -168,21 +168,21 @@ EoF EoF ;; opensolaris) -cat >> Makefile <> config.mk < /dev/null if [ $? = 0 ] ; then - echo "CC = gcc" >> Makefile + echo "CC = gcc" >> config.mk WALLFLAG=-Wall else CC=cc - echo "CC = cc" >> Makefile + echo "CC = cc" >> config.mk WALLFLAG= fi - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys DFLAGS = -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" @@ -193,14 +193,14 @@ EoF opensolaris_bsd) type gcc > /dev/null if [ $? = 0 ] ; then - echo "CC = gcc" >> Makefile + echo "CC = gcc" >> config.mk WALLFLAG=-Wall else CC=cc - echo "CC = cc" >> Makefile + echo "CC = cc" >> config.mk WALLFLAG= fi - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys DFLAGS = -DLOCKDIR=\"/var/spool/locks\" @@ -209,7 +209,7 @@ EoF EoF ;; freebsd) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = wheel CC = gcc @@ -219,7 +219,7 @@ EoF EoF ;; openbsd) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = wheel CC = gcc @@ -229,7 +229,7 @@ EoF EoF ;; netbsd) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER= root GROUP = wheel DFLAGS = -DLOCKDIR=\"/var/spool/lock\" @@ -239,7 +239,7 @@ EoF EoF ;; darwin) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = wheel DFLAGS = @@ -250,7 +250,7 @@ EoF ;; sco*) CC=cc - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = cc @@ -262,7 +262,7 @@ EoF EoF ;; aix|sysv) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc @@ -273,7 +273,7 @@ EoF ;; attsvr4) CC=cc - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = cc @@ -283,7 +283,7 @@ EoF EoF ;; nextstep) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc @@ -294,7 +294,7 @@ EoF EoF ;; osf) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = uucp CC = gcc @@ -304,7 +304,7 @@ EoF EoF ;; generic) - cat >> Makefile <<-EoF + cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc @@ -322,17 +322,10 @@ EoF esac -cat >> Makefile <> Makefile - ( set -x ./configure $OPTIONS ) || { - rm Makefile + rm -f Makefile exit } diff --git a/INSTALL b/INSTALL index db8209f..9a499d0 100644 --- a/INSTALL +++ b/INSTALL @@ -40,8 +40,8 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- The Configure.sh script creates a Makefile by running 'uname -s' and then -adding known good configuration options to the Makefile. The contents -of Makefile.in is then appended to the Makefile. Changes to the makefile +adding known good configuration options to the config.mk. The contents +of Makefile.in is then expanded to the Makefile. Changes to the makefile should be made in Configure.sh or Makefile.in. If Configure.sh can not figure out what your system is, you can try diff --git a/Makefile.in b/Makefile.in index c1ce7de..9438f35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,6 @@ ## Makefile template for Heyu, a program to control an X10 CM11A computer -## interface. From this point on the Makefile is copied from Makefile.in +## interface. The Makefile is expanded from Makefile.in by the Autoconf +## generated configure script, while config.mk included below is created ## by the Configure.sh program ## @@ -18,6 +19,8 @@ ## ## +include config.mk + CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. SRCS = date.c erase.c info.c message.c relay.c \ @@ -52,7 +55,7 @@ heyu: $(OBJS) version.h @echo "** Now become root and run 'make install' **" @echo "" -$(OBJS): config.h x10.h process.h sun.h Makefile +$(OBJS): config.h x10.h process.h sun.h Makefile config.mk eeprom.o: eeprom.h info.o: version.h diff --git a/README.INSTALL b/README.INSTALL index db8209f..9a499d0 100644 --- a/README.INSTALL +++ b/README.INSTALL @@ -40,8 +40,8 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- The Configure.sh script creates a Makefile by running 'uname -s' and then -adding known good configuration options to the Makefile. The contents -of Makefile.in is then appended to the Makefile. Changes to the makefile +adding known good configuration options to the config.mk. The contents +of Makefile.in is then expanded to the Makefile. Changes to the makefile should be made in Configure.sh or Makefile.in. If Configure.sh can not figure out what your system is, you can try diff --git a/configure.ac b/configure.ac index 9b45b7a..6178cd0 100644 --- a/configure.ac +++ b/configure.ac @@ -194,5 +194,5 @@ AC_MSG_CHECKING(whether to enable RFXLAN receiver support) [AC_DEFINE([HAVE_FEATURE_RFXLAN], [1], [Define if you have RFXLAN receiver])], []) -dnl AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT From f40a8faeb58a1817345f34e2864b069f0f403354 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 2 Jan 2012 21:00:25 +0100 Subject: [PATCH 29/56] Introduce Automake source configuration file A new file, Makefile.am, with a basic contents has been created in preparation for switching over to Automake. Before this happens, any changes to Heyu build time configuration and building procedure will be introduces into both this file and the old Makefile.in. Once used, this Makefile.am should allow for building and installing Heyu binary and manual pages into Heyu default locations if so selected with Autoconf --prefix, --exec-prefix, --bindir, --mandir and/or --localstatedir options passed to configure. Additionaly, extra documentation files should be installed into Autoconf selected DOCDIR, and sample configuration files into SYSCONFDIR/heyu (or SYSCONFDIR if already contained 'heyu' in its path). Automake activation directive has been added to the Autoconf source file, but left commented out for now to protect the old Makefile.in we are still usnig from being overwritten. Signed-off-by: Janusz Krzysztofik --- Makefile.am | 36 ++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 Makefile.am diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..6fb1818 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,36 @@ +# +# Makefile.am - Automake source file for Heyu +# +# Copyright (C) 2011 Janusz Krzysztofik +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +bin_PROGRAMS = heyu +heyu_SOURCES = date.c erase.c info.c message.c relay.c \ + monitor.c reset.c setclock.c stop.c \ + tty.c x10.c xread.c xwrite.c status.c cm11a.c \ + eeprom.c process.c sun.c cmd.c config.c x10state.c \ + poll.c modules.c cm17a.c xsync.c timing.c cm10a.c \ + tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c \ + x10.h eeprom.h version.h process.h sun.h x10state.h \ + rfxcom.h digimax.h oregon.h +dist_man_MANS = heyu.1 x10config.5 x10sched.5 x10scripts.5 x10cm17a.5 x10aux.5 \ + x10rfxsensors.5 x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 +dist_doc_DATA = README README2 protocol.txt history.txt heyufaq.txt \ + AUTHORS COPYING INSTALL README.cm10a README.webhook release_notes.txt +dist_pkgsysconf_DATA = x10config.sample x10.sched.sample +EXTRA_DIST = Configure.sh install.sh README.INSTALL + +*.o: Makefile diff --git a/configure.ac b/configure.ac index 6178cd0..0d651a5 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,18 @@ AC_MSG_CHECKING([for number of user timers]) [wrong TIMERS value "$TIMERS" (shoud be 1 < n < 1024)]))) AC_MSG_RESULT([$TIMERS]) +AC_SUBST([PACKAGE], [$PACKAGE_TARNAME]) +AS_CASE([$sysconfdir], + [*$PACKAGE*], [pkgsysconfdir='$(sysconfdir)'], + [\$\(prefix\)*|\$\{prefix\}*], + AS_CASE([$prefix], + [*$PACKAGE*], [pkgsysconfdir='$(sysconfdir)'], + [pkgsysconfdir='$(sysconfdir)/$(PACKAGE)']), + [pkgsysconfdir='$(sysconfdir)/$(PACKAGE)']) + AC_SUBST([pkgsysconfdir], []) + +dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign]) + # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET From a9348415f8afafd76e969c0c86361f30a868fce3 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:07:44 +0200 Subject: [PATCH 30/56] Pass runtime directory locations through Autoconf Instead of overriding default runtime directory locations by hardcoding them into CFLAGS placed in Makefile.top from ./Configure.sh, pass them to Makefile through Makefile.in substitutions using --prefix, --sysconfdir and --localstatedir ./configure options, possibly overridden with CPPFLAGS passed to ./configure if required. Default SYSBASEDIR, where Heyu looks for a system-wide x10config, is derived from SYSCONFDIR, either by appending '/heyu' to it, or using it directly if already contains 'heyu' in its path. Default LOCKDIR and SPOOLDIR locations are relative to LOCALSTATEDIR. Nothing to be added to Makefile.am, Automake can take care by itself for proper Makefile.in contents based on configure.ac. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 66 +++++++++++++++++++++++++++++----------------------- Makefile.in | 9 +++++++ configure.ac | 9 +++++++ 3 files changed, 55 insertions(+), 29 deletions(-) diff --git a/Configure.sh b/Configure.sh index a7326d3..e7ce49e 100755 --- a/Configure.sh +++ b/Configure.sh @@ -37,7 +37,7 @@ MAN5 = /usr/local/man/man5 EoF -OPTIONS= +OPTIONS="--localstatedir=/var" while [ $# -ge 1 ] ; do case "$1" in @@ -144,10 +144,10 @@ case "$SYS" in OWNER = root GROUP = root CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall - DFLAGS = + CFLAGS = -g -O -Wall LIBS = -lm -lc EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sunos*|solaris) type gcc > /dev/null @@ -162,10 +162,11 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" - CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG + CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; opensolaris) cat >> config.mk <> config.mk <<-EoF OWNER = root GROUP = sys - DFLAGS = -DSYSBASEDIR=\"/opt/heyu/etc\" -DLOCKDIR=\"/var/spool/locks\" - CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG + CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF + OPTIONS="$OPTIONS --prefix=/opt/heyu" + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; opensolaris_bsd) type gcc > /dev/null @@ -203,50 +205,53 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" - CFLAGS = -g -O \$(DFLAGS) \$WALLFLAG + CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; freebsd) cat >> config.mk <<-EoF OWNER = root GROUP = wheel CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc - DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" EoF + CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; openbsd) cat >> config.mk <<-EoF OWNER = root GROUP = wheel CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc - DFLAGS= -DLOCKDIR=\"/var/spool/lock\" -DSYSBASEDIR=\"/etc/heyu\" -DSPOOLDIR=\"/var/tmp/heyu\" EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; netbsd) cat >> config.mk <<-EoF OWNER= root GROUP = wheel - DFLAGS = -DLOCKDIR=\"/var/spool/lock\" CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; darwin) cat >> config.mk <<-EoF OWNER = root GROUP = wheel - DFLAGS = CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sco*) CC=cc @@ -258,18 +263,20 @@ EoF MAN5 = /usr/local/man/man.5 CFLAGS = -O \$(DFLAGS) LIBS = -lm -lc -lsocket - DFLAGS= -DSCO -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\" + DFLAGS= -DSCO EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' ;; aix|sysv) cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc - DFLAGS = EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" ;; attsvr4) CC=cc @@ -277,41 +284,42 @@ EoF OWNER = root GROUP = sys CC = cc - CFLAGS = -I/usr/local/include -g -O \$(DFLAGS) + CFLAGS = -I/usr/local/include -g -O LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\" -DSYSBASEDIR=\"/usr/local/etc/heyu\" EoF + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' ;; nextstep) cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc - DFLAGS = - CFLAGS = -g \$(DFLAGS) -posix + CFLAGS = -g -posix LDFLAGS = -posix LIBS = -lm -lposix EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" ;; osf) cat >> config.mk <<-EoF OWNER = root GROUP = uucp CC = gcc - CFLAGS = -g \$(DFLAGS) + CFLAGS = -g LIBS = -lm -lc - DFLAGS = -DLOCKDIR=\"/var/spool/locks\" EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; generic) cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc - CFLAGS = -g -O \$(DFLAGS) -Wall + CFLAGS = -g -O -Wall LIBS = -lm -lc - DFLAGS= EoF + OPTIONS="$OPTIONS --sysconfdir=/etc" ;; *) echo "Your system type was not understood. Please try one of " @@ -323,7 +331,7 @@ esac ( set -x - ./configure $OPTIONS + ./configure $OPTIONS CPPFLAGS="$CPPFLAGS" ) || { rm -f Makefile exit diff --git a/Makefile.in b/Makefile.in index 9438f35..a50d607 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,15 @@ ## ## +CPPFLAGS = @CPPFLAGS@ + +PACKAGE = @PACKAGE@ + +localstatedir = @localstatedir@ +pkgsysconfdir = @pkgsysconfdir@ +prefix = @prefix@ +sysconfdir = @sysconfdir@ + include config.mk CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. diff --git a/configure.ac b/configure.ac index 0d651a5..7b08812 100644 --- a/configure.ac +++ b/configure.ac @@ -121,6 +121,15 @@ AS_CASE([$sysconfdir], [pkgsysconfdir='$(sysconfdir)/$(PACKAGE)']), [pkgsysconfdir='$(sysconfdir)/$(PACKAGE)']) AC_SUBST([pkgsysconfdir], []) +AS_CASE([$CPPFLAGS], + [*-DSYSBASEDIR=*], [], + [CPPFLAGS=$CPPFLAGS' -DSYSBASEDIR=\"$(pkgsysconfdir)\"']) +AS_CASE([$CPPFLAGS], + [*-DLOCKDIR=*], [], + [CPPFLAGS=$CPPFLAGS' -DLOCKDIR=\"$(localstatedir)/lock\"']) +AS_CASE([$CPPFLAGS], + [*-DSPOOLDIR=*], [], + [CPPFLAGS=$CPPFLAGS' -DSPOOLDIR=\"$(localstatedir)/tmp/$(PACKAGE)\"']) dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign]) From e91a5c8bc0aa990c5f070048deef3ab65f207efd Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Fri, 19 Aug 2011 19:35:57 +0200 Subject: [PATCH 31/56] Move preprocessor options from CFLAGS to CPPFLAGS A few remaining -D and -I flags belong to CPPFLAGS rather than CFLAGS. Move them. Moreover, the Autoconf manual states that compiler flags used in more than one compiler phase should be put either into CC directly, or into both CPPFLAGS and LDFLAGS but not into CFLAGS. The -posix flag (nextstep case) is already placed in LDFLAGS, so use the latter option for moving it out of CFLAGS. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Configure.sh b/Configure.sh index e7ce49e..04f1414 100755 --- a/Configure.sh +++ b/Configure.sh @@ -261,12 +261,12 @@ EoF CC = cc MAN = /usr/local/man/man.1 MAN5 = /usr/local/man/man.5 - CFLAGS = -O \$(DFLAGS) + CFLAGS = -O LIBS = -lm -lc -lsocket - DFLAGS= -DSCO EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' + CPPFLAGS="$CPPFLAGS -DSCO" ;; aix|sysv) cat >> config.mk <<-EoF @@ -284,21 +284,23 @@ EoF OWNER = root GROUP = sys CC = cc - CFLAGS = -I/usr/local/include -g -O + CFLAGS = -g -O LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' + CPPFLAGS="$CPPFLAGS -I/usr/local/include" ;; nextstep) cat >> config.mk <<-EoF OWNER = root GROUP = sys CC = gcc - CFLAGS = -g -posix + CFLAGS = -g LDFLAGS = -posix LIBS = -lm -lposix EoF OPTIONS="$OPTIONS --sysconfdir=/etc" + CPPFLAGS="-posix" ;; osf) cat >> config.mk <<-EoF From 14866f5feec615ad9791be795e07dbfa59ca7bf3 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:09:15 +0200 Subject: [PATCH 32/56] Use Autoconf detected compiler program name and options Instead of selecting a compiler program and its options based on ./Configure.sh detected system type, and putting that into config.mk, substitute Autoconf detected values while creating a Makefile from Makefile.in. If gcc compiler is detected and no CFLAGS have been provided to ./configure, append '-Wall' to Autoconf selected CFLAGS. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 56 ---------------------------------------------------- Makefile.in | 2 ++ configure.ac | 3 +++ 3 files changed, 5 insertions(+), 56 deletions(-) diff --git a/Configure.sh b/Configure.sh index 04f1414..ae30925 100755 --- a/Configure.sh +++ b/Configure.sh @@ -135,34 +135,20 @@ if [ "$SYS" = "" ] ; then SYS=`uname -s | tr '[A-Z]' '[a-z]'` fi -CC=gcc #Set default for later - echo "#This makefile is built for $SYS" >> config.mk case "$SYS" in linux) cat >> config.mk <<-EoF OWNER = root GROUP = root - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sunos*|solaris) - type gcc > /dev/null - if [ $? = 0 ] ; then - echo "CC = gcc" >> config.mk - WALLFLAG=-Wall - else - CC=cc - echo "CC = cc" >> config.mk - WALLFLAG= - fi cat >> config.mk <<-EoF OWNER = root GROUP = sys - CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -174,38 +160,18 @@ cat >> config.mk < /dev/null - if [ $? = 0 ] ; then - echo "CC = gcc" >> config.mk - WALLFLAG=-Wall - else - CC=cc - echo "CC = cc" >> config.mk - WALLFLAG= - fi cat >> config.mk <<-EoF OWNER = root GROUP = sys - CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --prefix=/opt/heyu" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; opensolaris_bsd) - type gcc > /dev/null - if [ $? = 0 ] ; then - echo "CC = gcc" >> config.mk - WALLFLAG=-Wall - else - CC=cc - echo "CC = cc" >> config.mk - WALLFLAG= - fi cat >> config.mk <<-EoF OWNER = root GROUP = sys - CFLAGS = -g -O \$WALLFLAG LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -215,8 +181,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' @@ -225,8 +189,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -236,8 +198,6 @@ EoF cat >> config.mk <<-EoF OWNER= root GROUP = wheel - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -247,21 +207,16 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sco*) - CC=cc cat >> config.mk <<-EoF OWNER = root GROUP = sys - CC = cc MAN = /usr/local/man/man.1 MAN5 = /usr/local/man/man.5 - CFLAGS = -O LIBS = -lm -lc -lsocket EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -272,19 +227,14 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; attsvr4) - CC=cc cat >> config.mk <<-EoF OWNER = root GROUP = sys - CC = cc - CFLAGS = -g -O LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' @@ -294,8 +244,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - CC = gcc - CFLAGS = -g LDFLAGS = -posix LIBS = -lm -lposix EoF @@ -306,8 +254,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = uucp - CC = gcc - CFLAGS = -g LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" @@ -317,8 +263,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - CC = gcc - CFLAGS = -g -O -Wall LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" diff --git a/Makefile.in b/Makefile.in index a50d607..f034477 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,8 @@ ## ## +CC = @CC@ +CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ PACKAGE = @PACKAGE@ diff --git a/configure.ac b/configure.ac index 7b08812..67abe8d 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,10 @@ AS_CASE([$CPPFLAGS], dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # Checks for programs. +AS_IF([test "x$CFLAGS" = "x"], [no_CFLAGS="yes"], []) AC_PROG_CC +AS_IF([test "x$no_CFLAGS" = "xyes" && test "x$GCC" = "xyes"], + [CFLAGS="$CFLAGS -Wall"], []) AC_PROG_MAKE_SET # Checks for libraries. From 80076598b432471de5247d3429aa655d20734e50 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:09:57 +0200 Subject: [PATCH 33/56] Pass linker options through Autoconf Pass system dependent linker options to ./configure using LDFLAGS variable, to be substituted during Makefile.in processing, instead of placing them into config.mk from ./Configure.sh. No changes to Makefile.am required. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 7 ++++--- Makefile.in | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Configure.sh b/Configure.sh index ae30925..44b7d7f 100755 --- a/Configure.sh +++ b/Configure.sh @@ -235,20 +235,21 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lc -L/usr/ucblib -lucb -lm -lgen -lcmd + LIBS = -lc -lucb -lm -lgen -lcmd EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' CPPFLAGS="$CPPFLAGS -I/usr/local/include" + LDFLAGS="-L/usr/ucblib" ;; nextstep) cat >> config.mk <<-EoF OWNER = root GROUP = sys - LDFLAGS = -posix LIBS = -lm -lposix EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS="-posix" + LDFLAGS="-posix" ;; osf) cat >> config.mk <<-EoF @@ -277,7 +278,7 @@ esac ( set -x - ./configure $OPTIONS CPPFLAGS="$CPPFLAGS" + ./configure $OPTIONS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" ) || { rm -f Makefile exit diff --git a/Makefile.in b/Makefile.in index f034477..94607d8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ PACKAGE = @PACKAGE@ From 6f2ac020b48063de38ec3eb657041347f6148160 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Fri, 19 Aug 2011 19:55:06 +0200 Subject: [PATCH 34/56] Link with Autoconf selected libraries Instead of specifying a list of libraries to link the Heyu binary with, depend on Autoconf library detection features. Since libucb, libgen and libcmd libraries, supposed to be required on the ATT SVR4 platform, are not supported by configure.ac, I've left them specified explicitly, but passed to ./configure to be substituted from Makefile.in instead of hardcoded into config.mk. No changes to Makefile.am required. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 18 +++--------------- Makefile.in | 1 + 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Configure.sh b/Configure.sh index 44b7d7f..6c191fc 100755 --- a/Configure.sh +++ b/Configure.sh @@ -141,7 +141,6 @@ case "$SYS" in cat >> config.mk <<-EoF OWNER = root GROUP = root - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; @@ -149,7 +148,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' @@ -163,7 +161,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --prefix=/opt/heyu" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' @@ -172,7 +169,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lc -lrt EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' @@ -181,7 +177,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - LIBS = -lm -lc EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; @@ -189,7 +184,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' @@ -198,7 +192,6 @@ EoF cat >> config.mk <<-EoF OWNER= root GROUP = wheel - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' @@ -207,7 +200,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = wheel - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; @@ -217,7 +209,6 @@ EoF GROUP = sys MAN = /usr/local/man/man.1 MAN5 = /usr/local/man/man.5 - LIBS = -lm -lc -lsocket EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' @@ -227,7 +218,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; @@ -235,17 +225,16 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lc -lucb -lm -lgen -lcmd EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="-L/usr/ucblib" + LIBS="-lucb -lgen -lcmd" ;; nextstep) cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lposix EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS="-posix" @@ -255,7 +244,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = uucp - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' @@ -264,7 +252,6 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - LIBS = -lm -lc EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; @@ -278,7 +265,8 @@ esac ( set -x - ./configure $OPTIONS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" + ./configure $OPTIONS CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" \ + LIBS="$LIBS" ) || { rm -f Makefile exit diff --git a/Makefile.in b/Makefile.in index 94607d8..bb4ee4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -23,6 +23,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ PACKAGE = @PACKAGE@ From 3b410ebd561d50ed67ebd9944ae6795f8be4fa6a Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 12:30:57 +0200 Subject: [PATCH 35/56] Move target directories selection to Autoconf Instead of putting hardcoded target directory names to ./Configure.sh created config.mk, allow for Autotools methods being used. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 19 +++---------------- Makefile.am | 3 +++ Makefile.in | 13 +++++++++++++ configure.ac | 9 +++++++++ 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Configure.sh b/Configure.sh index 6c191fc..dfa314e 100755 --- a/Configure.sh +++ b/Configure.sh @@ -29,15 +29,7 @@ cat > config.mk <> config.mk <> config.mk <> config.mk <<-EoF OWNER = root GROUP = sys @@ -207,12 +194,12 @@ EoF cat >> config.mk <<-EoF OWNER = root GROUP = sys - MAN = /usr/local/man/man.1 - MAN5 = /usr/local/man/man.5 EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' CPPFLAGS="$CPPFLAGS -DSCO" + OPTIONS="$OPTIONS man1dir=/usr/local/man/man.1" + OPTIONS="$OPTIONS man5dir=/usr/local/man/man.5" ;; aix|sysv) cat >> config.mk <<-EoF diff --git a/Makefile.am b/Makefile.am index 6fb1818..9b4a3be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,4 +33,7 @@ dist_doc_DATA = README README2 protocol.txt history.txt heyufaq.txt \ dist_pkgsysconf_DATA = x10config.sample x10.sched.sample EXTRA_DIST = Configure.sh install.sh README.INSTALL +@MAN1DIR@ +@MAN5DIR@ + *.o: Makefile diff --git a/Makefile.in b/Makefile.in index bb4ee4b..52c5846 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,9 @@ ## ## +man1dir = $(mandir)/man1 +man5dir = $(mandir)/man5 + CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ @@ -27,7 +30,11 @@ LIBS = @LIBS@ PACKAGE = @PACKAGE@ +bindir = @bindir@ +datarootdir = @datarootdir@ +exec_prefix = @exec_prefix@ localstatedir = @localstatedir@ +mandir = @mandir@ pkgsysconfdir = @pkgsysconfdir@ prefix = @prefix@ sysconfdir = @sysconfdir@ @@ -36,6 +43,10 @@ include config.mk CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. +BIN = $(bindir) +MAN = $(man1dir) +MAN5 = $(man5dir) + SRCS = date.c erase.c info.c message.c relay.c \ monitor.c reset.c setclock.c stop.c \ tty.c x10.c xread.c xwrite.c status.c cm11a.c \ @@ -275,3 +286,5 @@ populate: $(EVERYTHING) $(EVERYTHING): ## co -r$(revision) $@ +@MAN1DIR@ +@MAN5DIR@ diff --git a/configure.ac b/configure.ac index 67abe8d..bace40d 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,15 @@ AS_CASE([$CPPFLAGS], [*-DSPOOLDIR=*], [], [CPPFLAGS=$CPPFLAGS' -DSPOOLDIR=\"$(localstatedir)/tmp/$(PACKAGE)\"']) +AC_MSG_CHECKING([for a custom man1dir]) + AS_IF([test "x$man1dir" != "x"], [AM_SUBST_NOTMAKE([MAN1DIR]) + AC_SUBST([MAN1DIR], [man1dir=$man1dir])], []) + AC_MSG_RESULT([$man1dir]) +AC_MSG_CHECKING([for a custom man5dir]) + AS_IF([test "x$man5dir" != "x"], [AM_SUBST_NOTMAKE([MAN5DIR]) + AC_SUBST([MAN5DIR], [man5dir=$man5dir])], []) + AC_MSG_RESULT([$man5dir]) + dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # Checks for programs. From 7f7fbd9006ca027d0a750da2cb84f5cc3ec8da12 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Fri, 19 Aug 2011 20:32:52 +0200 Subject: [PATCH 36/56] Keep default ownership of installed binary Since Heyu is installed with neither setuid, setgid nor restricted access permissions, there should be no point in setting specific user and group ownership of the installed binary. Drop this. Once done, also drop completely config.mk handling, which would now contain nothing but comments. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 66 -------------------------------------------------- INSTALL | 2 +- Makefile.in | 8 ++---- README.INSTALL | 2 +- 4 files changed, 4 insertions(+), 74 deletions(-) diff --git a/Configure.sh b/Configure.sh index dfa314e..364f6c3 100755 --- a/Configure.sh +++ b/Configure.sh @@ -20,15 +20,6 @@ # # SYS= - -# Heading - -cat > config.mk <> config.mk case "$SYS" in linux) - cat >> config.mk <<-EoF - OWNER = root - GROUP = root -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sunos*|solaris) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; opensolaris) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --prefix=/opt/heyu" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; opensolaris_bsd) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; freebsd) - cat >> config.mk <<-EoF - OWNER = root - GROUP = wheel -EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; openbsd) - cat >> config.mk <<-EoF - OWNER = root - GROUP = wheel -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; netbsd) - cat >> config.mk <<-EoF - OWNER= root - GROUP = wheel -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/lock\"' ;; darwin) - cat >> config.mk <<-EoF - OWNER = root - GROUP = wheel -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; sco*) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' CPPFLAGS="$CPPFLAGS -DSCO" @@ -202,44 +156,24 @@ EoF OPTIONS="$OPTIONS man5dir=/usr/local/man/man.5" ;; aix|sysv) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; attsvr4) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/var/spool/heyu\"' CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="-L/usr/ucblib" LIBS="-lucb -lgen -lcmd" ;; nextstep) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS="-posix" LDFLAGS="-posix" ;; osf) - cat >> config.mk <<-EoF - OWNER = root - GROUP = uucp -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\"' ;; generic) - cat >> config.mk <<-EoF - OWNER = root - GROUP = sys -EoF OPTIONS="$OPTIONS --sysconfdir=/etc" ;; *) diff --git a/INSTALL b/INSTALL index 9a499d0..76acc62 100644 --- a/INSTALL +++ b/INSTALL @@ -40,7 +40,7 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- The Configure.sh script creates a Makefile by running 'uname -s' and then -adding known good configuration options to the config.mk. The contents +passing known good options to Autoconf configure script. The contents of Makefile.in is then expanded to the Makefile. Changes to the makefile should be made in Configure.sh or Makefile.in. diff --git a/Makefile.in b/Makefile.in index 52c5846..78f7b9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ## Makefile template for Heyu, a program to control an X10 CM11A computer ## interface. The Makefile is expanded from Makefile.in by the Autoconf -## generated configure script, while config.mk included below is created +## generated configure script, called in turn, with locally selected options, ## by the Configure.sh program ## @@ -39,8 +39,6 @@ pkgsysconfdir = @pkgsysconfdir@ prefix = @prefix@ sysconfdir = @sysconfdir@ -include config.mk - CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. BIN = $(bindir) @@ -79,7 +77,7 @@ heyu: $(OBJS) version.h @echo "** Now become root and run 'make install' **" @echo "" -$(OBJS): config.h x10.h process.h sun.h Makefile config.mk +$(OBJS): config.h x10.h process.h sun.h Makefile eeprom.o: eeprom.h info.o: version.h @@ -119,9 +117,7 @@ uninstall: $(BIN)/heyu: heyu mkdir -p -m 755 $(BIN) cp heyu $(BIN) - chgrp $(GROUP) $(BIN)/heyu chmod 755 $(BIN)/heyu - chown $(OWNER) $(BIN)/heyu ./install.sh $(MAN)/heyu.1: heyu.1 diff --git a/README.INSTALL b/README.INSTALL index 9a499d0..76acc62 100644 --- a/README.INSTALL +++ b/README.INSTALL @@ -40,7 +40,7 @@ These are further explained in the man page heyu(1). CUSTOMIZING ----------- The Configure.sh script creates a Makefile by running 'uname -s' and then -adding known good configuration options to the config.mk. The contents +passing known good options to Autoconf configure script. The contents of Makefile.in is then expanded to the Makefile. Changes to the makefile should be made in Configure.sh or Makefile.in. From ca2fc9879d49c080b9ab850e0a60f67d0bb111fd Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 12:10:34 +0200 Subject: [PATCH 37/56] Call install.sh from 'make install' only if requested Extend configure with an option for conditionally calling the Heyu custom install.sh script during the install phase. This will allow binary package maintainers to use most of the Heyu build system without being forced to follow custom install steps which may not match their preferences. While being at it, change the script name to post-install.sh before a naming conflict during the upcoming switchover to Automake arises. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 1 + Makefile.am | 17 ++++++++++++++++- Makefile.in | 28 ++++++++++++++++++++-------- configure.ac | 12 ++++++++++++ install.sh => post-install.sh | 0 5 files changed, 49 insertions(+), 9 deletions(-) rename install.sh => post-install.sh (100%) diff --git a/Configure.sh b/Configure.sh index 364f6c3..18de0c1 100755 --- a/Configure.sh +++ b/Configure.sh @@ -21,6 +21,7 @@ # SYS= OPTIONS='--localstatedir=/var --mandir=$(prefix)/man' +OPTIONS="$OPTIONS --enable-postinst=./post-install.sh" while [ $# -ge 1 ] ; do case "$1" in diff --git a/Makefile.am b/Makefile.am index 9b4a3be..69ad51c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,24 @@ dist_man_MANS = heyu.1 x10config.5 x10sched.5 x10scripts.5 x10cm17a.5 x10aux.5 \ dist_doc_DATA = README README2 protocol.txt history.txt heyufaq.txt \ AUTHORS COPYING INSTALL README.cm10a README.webhook release_notes.txt dist_pkgsysconf_DATA = x10config.sample x10.sched.sample -EXTRA_DIST = Configure.sh install.sh README.INSTALL +EXTRA_DIST = Configure.sh post-install.sh README.INSTALL @MAN1DIR@ @MAN5DIR@ *.o: Makefile + +if POSTINST +all-local: usergroup.tmp userhome.tmp + +usergroup.tmp userhome.tmp: $(bin_PROGRAMS) + @echo `id` >usergroup.tmp + @echo ${HOME} >userhome.tmp + @echo "" + @echo "**Now become root and run 'make install' **" + @echo "" + +install-exec-hook: + @$(POST_INSTALL) + @POSTINST@ +endif diff --git a/Makefile.in b/Makefile.in index 78f7b9a..18f2dfe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -19,6 +19,8 @@ ## ## +bin_PROGRAMS = heyu$(EXEEXT) + man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 @@ -61,21 +63,17 @@ OBJS = date.o erase.o info.o message.o relay.o \ OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ - x10scripts.5 Configure.sh Makefile.in install.sh AUTHORS COPYING INSTALL \ + x10scripts.5 Configure.sh Makefile.in post-install.sh AUTHORS COPYING INSTALL \ README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 README.webhook EVERYTHING = $(OTHERSRC) $(SRCS) -all: heyu +@POSTINST_FALSE@all-local: +all: heyu all-local heyu: $(OBJS) version.h $(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS) - @echo `id` >usergroup.tmp - @echo ${HOME} >userhome.tmp - @echo "" - @echo "** Now become root and run 'make install' **" - @echo "" $(OBJS): config.h x10.h process.h sun.h Makefile @@ -94,6 +92,7 @@ install: $(BIN)/heyu $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 $(MAN5)/x10digimax.5 \ $(MAN5)/x10oregon.5 $(MAN5)/x10kaku.5 +@POSTINST_FALSE@install-exec-hook: maninstall: $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ @@ -118,7 +117,7 @@ $(BIN)/heyu: heyu mkdir -p -m 755 $(BIN) cp heyu $(BIN) chmod 755 $(BIN)/heyu - ./install.sh + $(MAKE) install-exec-hook $(MAN)/heyu.1: heyu.1 mkdir -p -m 755 $(MAN) @@ -284,3 +283,16 @@ $(EVERYTHING): @MAN1DIR@ @MAN5DIR@ + +@POSTINST_TRUE@all-local: usergroup.tmp userhome.tmp + +@POSTINST_TRUE@usergroup.tmp userhome.tmp: $(bin_PROGRAMS) +@POSTINST_TRUE@ @echo `id` >usergroup.tmp +@POSTINST_TRUE@ @echo ${HOME} >userhome.tmp +@POSTINST_TRUE@ @echo "" +@POSTINST_TRUE@ @echo "**Now become root and run 'make install' **" +@POSTINST_TRUE@ @echo "" + +@POSTINST_TRUE@install-exec-hook: +@POSTINST_TRUE@ @$(POST_INSTALL) +@POSTINST_TRUE@ @POSTINST@ diff --git a/configure.ac b/configure.ac index bace40d..fa0db54 100644 --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,18 @@ AC_MSG_CHECKING([for a custom man5dir]) AC_SUBST([MAN5DIR], [man5dir=$man5dir])], []) AC_MSG_RESULT([$man5dir]) +AC_MSG_CHECKING([for a custom post-install script]) + AC_ARG_ENABLE([postinst], AS_HELP_STRING([--enable-postinst], + [enable custom make rules, used for calling Heyu custom post-install script] + ), AS_CASE([$enable_postinst], + [no], [enable_postinst=], + [yes], [enable_postinst='$(srcdir)/post-install.sh'], + []), []) + AS_IF([test "x$enable_postinst" != "x"], [AM_SUBST_NOTMAKE([POSTINST]) + AC_SUBST([POSTINST], [$enable_postinst])], []) + AM_CONDITIONAL([POSTINST], [test "x$enable_postinst" != "x"]) + AC_MSG_RESULT([$enable_postinst]) + dnl AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # Checks for programs. diff --git a/install.sh b/post-install.sh similarity index 100% rename from install.sh rename to post-install.sh From 43bdbcf61efc2a81999691c6e271c81fbce63e85 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:20:15 +0200 Subject: [PATCH 38/56] Switch over to using Automake After all recent changes, it should be now possible to configure, build and install Heyu using an Automake generated Makefile.in. The Automake initialization directive has been uncommented in configure.ac, and calls to autoconf and autoheader replaced with autoreconf in Configure.sh. To give it a try, just install an Automake package in addition to Autoconf and follow the Heyu installation procedure as usually. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 19 +++++++++++++++++-- configure.ac | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Configure.sh b/Configure.sh index 18de0c1..55eb792 100755 --- a/Configure.sh +++ b/Configure.sh @@ -94,15 +94,30 @@ EoF shift done +test -x install-sh && test -x missing && test -x depcomp && \ +test -s aclocal.m4 && test aclocal.m4 -nt configure.ac && \ +test -s Makefile.in && test Makefile.in -nt configure.ac && \ + test Makefile.in -nt Makefile.am && \ test -x configure && test configure -nt configure.ac && \ test -s config.h.in && test config.h.in -nt configure.ac || { + type autoreconf >/dev/null && \ type autoconf >/dev/null && type autoheader >/dev/null || { echo "Please install autoconf package and re-run ./Configure.sh" rm -f Makefile exit } - autoconf - autoheader + type aclocal >/dev/null && type automake >/dev/null || { + echo "Please install automake package and re-run ./Configure.sh" + rm -f Makefile + exit + } + if + test -x install-sh && test -x missing && test -x depcomp + then + autoreconf --verbose + else + autoreconf --verbose --install --symlink + fi } cat < Date: Sun, 21 Aug 2011 16:53:25 +0200 Subject: [PATCH 39/56] Move SCO detection and symbol definition to configure.ac Since SCO macro is used for conditionally defining other symbols in different source files, we should better keep it, but still migrate to Autoconf. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 3 ++- configure.ac | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Configure.sh b/Configure.sh index 55eb792..6a33aec 100755 --- a/Configure.sh +++ b/Configure.sh @@ -94,6 +94,7 @@ EoF shift done +test -x config.guess && test -x config.sub && \ test -x install-sh && test -x missing && test -x depcomp && \ test -s aclocal.m4 && test aclocal.m4 -nt configure.ac && \ test -s Makefile.in && test Makefile.in -nt configure.ac && \ @@ -112,6 +113,7 @@ test -s config.h.in && test config.h.in -nt configure.ac || { exit } if + test -x config.guess && test -x config.sub && \ test -x install-sh && test -x missing && test -x depcomp then autoreconf --verbose @@ -167,7 +169,6 @@ case "$SYS" in sco*) OPTIONS="$OPTIONS --sysconfdir=/etc" CPPFLAGS='-DLOCKDIR=\"/var/spool/locks\" -DSPOOLDIR=\"/usr/tmp/heyu\"' - CPPFLAGS="$CPPFLAGS -DSCO" OPTIONS="$OPTIONS man1dir=/usr/local/man/man.1" OPTIONS="$OPTIONS man5dir=/usr/local/man/man.5" ;; diff --git a/configure.ac b/configure.ac index 108ceb8..7b68991 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,12 @@ AC_MSG_CHECKING([for a custom post-install script]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AC_CANONICAL_HOST +AS_CASE([$host_os], + [sco*], + AC_DEFINE(SCO, 1, [required for correct termio handling]), + []) + # Checks for programs. AS_IF([test "x$CFLAGS" = "x"], [no_CFLAGS="yes"], []) AC_PROG_CC From aebb30af433d47e9579f374017d68720ebbd60c4 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 12:54:00 +0200 Subject: [PATCH 40/56] Don't duplicate package version definition After switching to Automake, another VERSION symbol definition has been added automatically to config.h, based on configure.ac provided data. Add RELEASE_DATE definition to configure.ac as well and drop version.h file from the distribution to avoid mismatches. Signed-off-by: Janusz Krzysztofik --- Makefile.am | 2 +- configure.ac | 1 + info.c | 5 ++++- process.c | 1 - version.h | 22 ---------------------- x10.c | 1 - x10state.c | 1 - 7 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 version.h diff --git a/Makefile.am b/Makefile.am index 69ad51c..ec42100 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ heyu_SOURCES = date.c erase.c info.c message.c relay.c \ eeprom.c process.c sun.c cmd.c config.c x10state.c \ poll.c modules.c cm17a.c xsync.c timing.c cm10a.c \ tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c \ - x10.h eeprom.h version.h process.h sun.h x10state.h \ + x10.h eeprom.h process.h sun.h x10state.h \ rfxcom.h digimax.h oregon.h dist_man_MANS = heyu.1 x10config.5 x10sched.5 x10scripts.5 x10cm17a.5 x10aux.5 \ x10rfxsensors.5 x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 diff --git a/configure.ac b/configure.ac index 7b68991..5b25271 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_PREREQ([2.68]) AC_INIT([Heyu], [2.10+autotools], [heyu@tickets.assembla.com], [heyu], [http://heyu.org]) +AC_DEFINE([RELEASE_DATE], ["20111227"], [Release date of package]) AC_COPYRIGHT([Heyu specific bits: Copyright (C) 2011 Janusz Krzysztofik ]) AC_CONFIG_SRCDIR([relay.c]) diff --git a/info.c b/info.c index 36ec8bf..eec9864 100644 --- a/info.c +++ b/info.c @@ -22,11 +22,14 @@ */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include #include "x10.h" -#include "version.h" #include "process.h" extern unsigned int x2unitmap(); diff --git a/process.c b/process.c index b524f8a..ed6cdfa 100644 --- a/process.c +++ b/process.c @@ -68,7 +68,6 @@ #include "x10.h" #include "sun.h" #include "process.h" -#include "version.h" #define NDSTINTV 6 struct dststruct { diff --git a/version.h b/version.h deleted file mode 100644 index a45a6c7..0000000 --- a/version.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* This file tracks the version of the heyu program - * It should be manually changed when the version number is ready to be - * bumped up. - */ -#define VERSION "2.10" -#define RELEASE_DATE "20120501" diff --git a/x10.c b/x10.c index 3af8373..4003366 100644 --- a/x10.c +++ b/x10.c @@ -52,7 +52,6 @@ #include #include #include "x10.h" -#include "version.h" #ifdef HAVE_SYSLOG_H #include #endif diff --git a/x10state.c b/x10state.c index 76467ee..a224300 100644 --- a/x10state.c +++ b/x10state.c @@ -96,7 +96,6 @@ #include "rfxcom.h" #include "digimax.h" #include "oregon.h" -#include "version.h" #ifdef pid_t #define PID_T pid_t From 7f1a1a9fa3bbf28297715020e334204971538420 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 11:15:35 +0200 Subject: [PATCH 41/56] Introduce ./configure based installation instructions Replace custom INSTALL file with Automake provided generic version, applicable for any package supplied with Autoconf ./configure script. Move over the old Heyu version 1 README file to README1, then rename the old INSTALL to README, which is mentioned in the generic INSTALL as providing package specific installation instructions. Drop README.INSTALL copy - INSTALL is now safe from being overwritten by the make implicit rules with the contents of install.sh, already renamed to post-install.sh. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 2 +- INSTALL | 568 +++++++++++++++++++++++++++++++----------------- Makefile.am | 4 +- Makefile.in | 2 +- README | 264 ++++++++++++++++------ README.INSTALL | 207 ------------------ README1 | 61 ++++++ heyu.1 | 2 +- x10cm17a.5 | 2 +- x10digimax.5 | 2 +- x10kaku.5 | 2 +- x10oregon.5 | 2 +- x10rfxmeters.5 | 2 +- x10rfxsensors.5 | 2 +- 14 files changed, 638 insertions(+), 484 deletions(-) delete mode 100644 README.INSTALL create mode 100644 README1 diff --git a/Configure.sh b/Configure.sh index 6a33aec..88a2c3f 100755 --- a/Configure.sh +++ b/Configure.sh @@ -218,7 +218,7 @@ else echo "The Makefile has been created for $SYS." fi if [ "$SYS" = "opensolaris" ] ; then -echo "Please see \"Notes for OpenSolaris\" in file INSTALL before proceeding." +echo "Please see \"Notes for OpenSolaris\" in file README before proceeding." echo fi diff --git a/INSTALL b/INSTALL index 76acc62..7d1c323 100644 --- a/INSTALL +++ b/INSTALL @@ -1,207 +1,365 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. - Installing Heyu on a Unix-like system. - -(This file is duplicated as both INSTALL and README.INSTALL, in the -event your case-insensitive file system overwrites INSTALL with the -install script.) - -Heyu requires a reasonable compiler (GCC works well), the 'make' program, -and the development header (.h) files. Many OS distributions will either -install these by default or provide a visible option to include the -"development package" during OS installation. But some of the newer OS's -do not, e.g., with Ubuntu Linux it's necessary to afterward execute the -command 'apt-get install build-essential'. - -Note: If you're upgrading from a previous version of Heyu, run 'heyu stop' -under that version before proceeding. - -Quickstart: - sh ./Configure.sh [option] (As a normal user) - make (As a normal user) - su (Become superuser) - make install (As superuser) - exit (Revert to normal user) - heyu info (As a normal user, to test installation) - -(The 'make install' requires that you have write permissions to -/usr/local/bin, man page, and other directories.) - -Ubuntu Linux users should execute 'sudo make install' rather than -the three commands 'su', 'make install', and 'exit'. - -*** Kindly report any compile errors or warnings to the author.*** - -It can take 5-8 seconds to set up the heyu_relay daemon and initialize -the CM11A interface the first time Heyu is run, e.g., with 'heyu info'. - -Running 'heyu help' will display the long list of Heyu commands. -These are further explained in the man page heyu(1). - -CUSTOMIZING ------------ -The Configure.sh script creates a Makefile by running 'uname -s' and then -passing known good options to Autoconf configure script. The contents -of Makefile.in is then expanded to the Makefile. Changes to the makefile -should be made in Configure.sh or Makefile.in. - -If Configure.sh can not figure out what your system is, you can try -sh ./Configure.sh generic - or -sh ./Configure.sh sysv - -If those don't work, we'll have to figure it out by hand. Please contact -the author so your discoveries can be integrated into the next release. - -SERIAL PORTS ------------- -Many newer computers don't have built-in RS232 serial ports, only USB -ports. For these computers a USB-Serial adapter is required to connect -the CM11A. Before purchasing a USB-Serial adapter, verify that the driver -for your OS is available, either built-in to the OS, provided with the -adapter on a companion disc, or downloadable from the adapter -manufacturer's website. - -If you have a choice, select an adapter with an FTDI chipset over one -with a Prolific chipset. One dealer who specifies the chipset -and supported operating systems for each adapter model for sale is -ByteRunner (http://ww.byterunner.com). - -Drivers for adapters with a Prolific PL2303 chipset can often be found -at http://www.prolific.com.tw/eng/downloads.asp?ID=31 - -For Linux, the serial device name for a USB-Serial adapter will normally -be /dev/ttyUSBx, where x = 0 for the first adapter plugged into the -USB port and higher numbers for subsequent adapters. - -Note: The International 230V version of the CM11 sold in Europe and -elsewhere is now usually provided with a USB cable in addition to the -standard RS232 cable. Many Linux users have experienced lockups and -other problem with this USB cable (based on a Prolific chipset) which -disappeared when they switched to a regular USB-Serial adapter. - -OPTIONS -------- -By default, Heyu allocates space for 32 common flags, 32 counters, and -32 user countdown timers. The number of each of these can be increased -at compile time with switches -flags=NN, -counters=NN, and -timers=NN. -The specified NN must be in the range 1-1024 and will be rounded up to -the nearest multiple of 32, e.g., - - sh ./Configure.sh -flags=64 -timers=75 - -will allocate space for 64 flags and 96 timers, the latter because -the specified 75 is rounded up to 96. The number of counters will -remain 32. - -By default, support for the X10 CM17A "Firecracker" device is compiled -into Heyu. As there is no known version of this device available which -transmits at frequencies other than the 310 MHz used for transceivers -in North America, users outside this region may wish to compile without -CM17A support. Since the CM17A is both powered and actuated by the DTR -and RTS serial lines, support for this device might as well also be -omitted if your serial port hardware does not support these lines. -To do so, run the Configure.sh step mentioned above with the '-nocm17a' -switch, i.e., - - sh ./Configure.sh -nocm17a - -By default, support for Extended Type 0 (Shutter and Shade) commands -is compiled into Heyu. As there is only one module known to support -these commands (the 230V, 50Hz Marmitek SW10 Shutter Motor Controller -sold in Europe), this support may be omitted by using Configure.sh with -the '-noext0' switch, i.e., - - sh ./Configure.sh -noext0 - -By default, support for RFXSensors is compiled into Heyu. RFXSensors -require a WGL W800RF32 or RFXCOM X10 RF receiver as well as a RFXSensor -transmitter. This support may be omitted by including the '-norfxs' -switch with Configure.sh, i.e., - - sh ./Configure.sh -norfxs - -By default, support for RFXMeters is compiled into Heyu. RFXMeters -requires a 433.92 MHz RFXCOM X10 RF receiver as well as the RFXMeter -transmitter. This support may be omitted by including the '-norfxm' switch -with Configure.sh, i.e., - - sh ./Configure.sh -norfxm - -By default, support for the Digimax 210 remote thermostat is compiled -into Heyu. The Digimax requires a 433.92 MHz RFXCOM X10 RF receiver as -well as the Digimax transmitter. This support may be omitted by -including the '-nodmx' switch with Configure.sh, i.e., - - sh ./Configure.sh -nodmx - -By default, support for Oregon RF sensors is compilied into Heyu. -Oregon sensor support requires a 433.92 MHz RFXCOM X10 RF receiver -as well as a supported model of Oregon sensor. This support may be -omitted by including the '-noore' switch with Configure.sh, i.e., - - sh ./Configure.sh -noore - -By default, support for signals received from KaKu and HomeEasy -transmitters is compiled into Heyu. KaKu/HomeEasy support requires a -433.92 MHz RFXCOM X10 RF receiver. This support may be omitted -by including the '-nokaku' switch with Configure.sh, i.e., - - sh ./Configure.sh -nokaku - -By default, support for RFXLAN RF receiver (network version of RFXCOM) -is compiled into Heyu. This support may be omitted by including the -'-norfxlan' switch with Configure.sh, i.e., - - sh ./Configure.sh -norfxlan - - -Notes for Mac OS X: -------------------- -The heyu executable is installed in directory /usr/local/bin, which -is not on the Mac's default PATH. You will have to add this directory -to your $PATH. Similarly you may have to add the man page directory -/usr/local/man to your $MANPATH (or the /usr/share/misc/man.conf file -for newer versions of OS X which have deprecated $MANPATH). - -Newer Macs don't have an actual RS232 serial port, only a USB port, -and a USB/Serial adapter is required. The manufacturer's adapter -driver will usually add two or more different devices in /dev -(and often with "usbserial" as part of the name). You'll have -to experiment to see which one works with Heyu by trying the -different names in the TTY directive in the heyu configuration -file. The device name which also includes "cu" rather than "tty" -has been found to work on the (few) Macs tested thusfar. - - -Notes for AT&T SysV r4: ----------------------- -The function uname(1) used to determine the system type for -Configure.sh does not distinguish this OS from other sysv systems. -Supply the system type parameter "attsvr4" to Configure.sh, i.e., -run 'sh ./Configure.sh attsvr4'. - -Notes for OpenSolaris: ---------------------- -The directories in which the Heyu binary executable and man pages -are installed are set per the OpenSolaris system conventions to: - BIN = /opt/heyu/bin - MAN = /opt/heyu/man/man1 - MAN5 = /opt/heyu/man/man5 -However for a virgin OS installation, none of these directories -are on the system's PATH/MANPATH and the user is responsible -for adding them to the PATH/MANPATH in order to have full use of -Heyu. - -The user may alternatively rerun Configure.sh for "OpenSolaris_BSD", -i.e., 'sh ./Configure.sh opensolaris_bsd', -which will set the directories using the BSD convention under -the /usr/local tree, which however may be deleted when OpenSolaris -is upgraded. - -Some older versions of OpenSolaris, in particular SXCE (Solaris -Express Community Edition), may encounter an error when running -'make install' like "test: argument expected". If this occurs, -change the first line of file install.sh to read "#!/bin/ksh". +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. - - diff --git a/Makefile.am b/Makefile.am index ec42100..c760b8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,10 +28,10 @@ heyu_SOURCES = date.c erase.c info.c message.c relay.c \ rfxcom.h digimax.h oregon.h dist_man_MANS = heyu.1 x10config.5 x10sched.5 x10scripts.5 x10cm17a.5 x10aux.5 \ x10rfxsensors.5 x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 -dist_doc_DATA = README README2 protocol.txt history.txt heyufaq.txt \ +dist_doc_DATA = README README1 README2 protocol.txt history.txt heyufaq.txt \ AUTHORS COPYING INSTALL README.cm10a README.webhook release_notes.txt dist_pkgsysconf_DATA = x10config.sample x10.sched.sample -EXTRA_DIST = Configure.sh post-install.sh README.INSTALL +EXTRA_DIST = Configure.sh post-install.sh @MAN1DIR@ @MAN5DIR@ diff --git a/Makefile.in b/Makefile.in index 18f2dfe..9c0c387 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ OBJS = date.o erase.o info.o message.o relay.o \ tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ - x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ + README1 x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ x10scripts.5 Configure.sh Makefile.in post-install.sh AUTHORS COPYING INSTALL \ README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ diff --git a/README b/README index 5025ed7..cc5292e 100644 --- a/README +++ b/README @@ -1,61 +1,203 @@ - HEYU (version 1) Program overview - -This program operates an X10 module via a CM11A computer interface. It is -based on the program X10 by Larry Cambell as modified by Paul Fox. All but a -few functions have been changed enough that they no longer interwork with -the original. I think this justifies issuing the program as 'heyu' instead -of 'x10'. - -The program name comes from the old joke about having a 3rd person in the -house. Ida No was the one frequently blamed when things went wrong. In my -house it was the frequently heard yells of "Heyu! Turn off the lights!" -A poor joke, but I like it. - -The program is strictly command line driven, and works well with crontab. -Crontab can be used to schedule events. You can also upload timers and -macros to the CM11's memory. - -The program comes complete with source code, sample config files, MAN pages -an executable binary. The program has options to allow you to: - - * Get the date and time from the interface - * Get information about current settings and module states - * Turn an X10 module on or off - * Dim or brighten an X10 module - * Monitor all data sent to or from the CM11A - * Get the status of intelligent X10 modules (rr501 for instance) - * Set the X10 clock from the computer's clock (time and date) - * Zero out the macro and event memory of the X10 - * Upload macros and timers - * preset the dim level of advanced two way devices - -As of version 1.27, Heyu has the ability to send a schedule of events to the -CM11A. This enables timers and macros. - -The people at X10 have informed me that there is no way to download (to the -computer) the events stored in the CM11A. That being the case, I wrote -programs that will load the events and macros from local data files. This -will erase whatever has been stored there, but I guess that's the way it has -to be. - -This should compile on any Linux system. It should also compile on any other -BSDish or SYSV system. Just edit the #define in the make file. Make install -will try to install the man page and the program. The makefile has defines -for these locations. - -See the original README in Larry Campbell's program for some nice info on -the cp290 and the history of the program. See the original for some really -niffty uses using scheduling and macros. - -There are two demo programs included with heyu, monit and x10biff. - - * The monit program will turn off your monitor based on idle time. It's - the ultimate screen saver. - * The x10biff program will flash a light to let you know that you have - E-mail. - -Daniel B. Suthers, CCP, CSP -12-31-1996 -Updated 12-12-1999 -E-mail: dbs@tanj.com -uucp: pacbell!daver!dansst!dbs + + Installing Heyu on a Unix-like system. + +Heyu requires a reasonable compiler (GCC works well), the 'make' program, +and the development header (.h) files. Many OS distributions will either +install these by default or provide a visible option to include the +"development package" during OS installation. But some of the newer OS's +do not, e.g., with Ubuntu Linux it's necessary to afterward execute the +command 'apt-get install build-essential'. + +Note: If you're upgrading from a previous version of Heyu, run 'heyu stop' +under that version before proceeding. + +Quickstart: + sh ./Configure.sh [option] (As a normal user) + make (As a normal user) + su (Become superuser) + make install (As superuser) + exit (Revert to normal user) + heyu info (As a normal user, to test installation) + +(The 'make install' requires that you have write permissions to +/usr/local/bin, man page, and other directories.) + +Ubuntu Linux users should execute 'sudo make install' rather than +the three commands 'su', 'make install', and 'exit'. + +*** Kindly report any compile errors or warnings to the author.*** + +It can take 5-8 seconds to set up the heyu_relay daemon and initialize +the CM11A interface the first time Heyu is run, e.g., with 'heyu info'. + +Running 'heyu help' will display the long list of Heyu commands. +These are further explained in the man page heyu(1). + +CUSTOMIZING +----------- +The Configure.sh script creates a Makefile by running 'uname -s' and then +passing known good options to Autoconf configure script. The contents +of Makefile.in is then expanded to the Makefile. Changes to the makefile +should be made in Configure.sh or Makefile.in. + +If Configure.sh can not figure out what your system is, you can try +sh ./Configure.sh generic + or +sh ./Configure.sh sysv + +If those don't work, we'll have to figure it out by hand. Please contact +the author so your discoveries can be integrated into the next release. + +SERIAL PORTS +------------ +Many newer computers don't have built-in RS232 serial ports, only USB +ports. For these computers a USB-Serial adapter is required to connect +the CM11A. Before purchasing a USB-Serial adapter, verify that the driver +for your OS is available, either built-in to the OS, provided with the +adapter on a companion disc, or downloadable from the adapter +manufacturer's website. + +If you have a choice, select an adapter with an FTDI chipset over one +with a Prolific chipset. One dealer who specifies the chipset +and supported operating systems for each adapter model for sale is +ByteRunner (http://ww.byterunner.com). + +Drivers for adapters with a Prolific PL2303 chipset can often be found +at http://www.prolific.com.tw/eng/downloads.asp?ID=31 + +For Linux, the serial device name for a USB-Serial adapter will normally +be /dev/ttyUSBx, where x = 0 for the first adapter plugged into the +USB port and higher numbers for subsequent adapters. + +Note: The International 230V version of the CM11 sold in Europe and +elsewhere is now usually provided with a USB cable in addition to the +standard RS232 cable. Many Linux users have experienced lockups and +other problem with this USB cable (based on a Prolific chipset) which +disappeared when they switched to a regular USB-Serial adapter. + +OPTIONS +------- +By default, Heyu allocates space for 32 common flags, 32 counters, and +32 user countdown timers. The number of each of these can be increased +at compile time with switches -flags=NN, -counters=NN, and -timers=NN. +The specified NN must be in the range 1-1024 and will be rounded up to +the nearest multiple of 32, e.g., + + sh ./Configure.sh -flags=64 -timers=75 + +will allocate space for 64 flags and 96 timers, the latter because +the specified 75 is rounded up to 96. The number of counters will +remain 32. + +By default, support for the X10 CM17A "Firecracker" device is compiled +into Heyu. As there is no known version of this device available which +transmits at frequencies other than the 310 MHz used for transceivers +in North America, users outside this region may wish to compile without +CM17A support. Since the CM17A is both powered and actuated by the DTR +and RTS serial lines, support for this device might as well also be +omitted if your serial port hardware does not support these lines. +To do so, run the Configure.sh step mentioned above with the '-nocm17a' +switch, i.e., + + sh ./Configure.sh -nocm17a + +By default, support for Extended Type 0 (Shutter and Shade) commands +is compiled into Heyu. As there is only one module known to support +these commands (the 230V, 50Hz Marmitek SW10 Shutter Motor Controller +sold in Europe), this support may be omitted by using Configure.sh with +the '-noext0' switch, i.e., + + sh ./Configure.sh -noext0 + +By default, support for RFXSensors is compiled into Heyu. RFXSensors +require a WGL W800RF32 or RFXCOM X10 RF receiver as well as a RFXSensor +transmitter. This support may be omitted by including the '-norfxs' +switch with Configure.sh, i.e., + + sh ./Configure.sh -norfxs + +By default, support for RFXMeters is compiled into Heyu. RFXMeters +requires a 433.92 MHz RFXCOM X10 RF receiver as well as the RFXMeter +transmitter. This support may be omitted by including the '-norfxm' switch +with Configure.sh, i.e., + + sh ./Configure.sh -norfxm + +By default, support for the Digimax 210 remote thermostat is compiled +into Heyu. The Digimax requires a 433.92 MHz RFXCOM X10 RF receiver as +well as the Digimax transmitter. This support may be omitted by +including the '-nodmx' switch with Configure.sh, i.e., + + sh ./Configure.sh -nodmx + +By default, support for Oregon RF sensors is compilied into Heyu. +Oregon sensor support requires a 433.92 MHz RFXCOM X10 RF receiver +as well as a supported model of Oregon sensor. This support may be +omitted by including the '-noore' switch with Configure.sh, i.e., + + sh ./Configure.sh -noore + +By default, support for signals received from KaKu and HomeEasy +transmitters is compiled into Heyu. KaKu/HomeEasy support requires a +433.92 MHz RFXCOM X10 RF receiver. This support may be omitted +by including the '-nokaku' switch with Configure.sh, i.e., + + sh ./Configure.sh -nokaku + +By default, support for RFXLAN RF receiver (network version of RFXCOM) +is compiled into Heyu. This support may be omitted by including the +'-norfxlan' switch with Configure.sh, i.e., + + sh ./Configur.sh -norfxlan + + +Notes for Mac OS X: +------------------- +The heyu executable is installed in directory /usr/local/bin, which +is not on the Mac's default PATH. You will have to add this directory +to your $PATH. Similarly you may have to add the man page directory +/usr/local/man to your $MANPATH (or the /usr/share/misc/man.conf file +for newer versions of OS X which have deprecated $MANPATH). + +Newer Macs don't have an actual RS232 serial port, only a USB port, +and a USB/Serial adapter is required. The manufacturer's adapter +driver will usually add two or more different devices in /dev +(and often with "usbserial" as part of the name). You'll have +to experiment to see which one works with Heyu by trying the +different names in the TTY directive in the heyu configuration +file. The device name which also includes "cu" rather than "tty" +has been found to work on the (few) Macs tested thusfar. + + +Notes for AT&T SysV r4: +---------------------- +The function uname(1) used to determine the system type for +Configure.sh does not distinguish this OS from other sysv systems. +Supply the system type parameter "attsvr4" to Configure.sh, i.e., +run 'sh ./Configure.sh attsvr4'. + +Notes for OpenSolaris: +--------------------- +The directories in which the Heyu binary executable and man pages +are installed are set per the OpenSolaris system conventions to: + BIN = /opt/heyu/bin + MAN = /opt/heyu/man/man1 + MAN5 = /opt/heyu/man/man5 +However for a virgin OS installation, none of these directories +are on the system's PATH/MANPATH and the user is responsible +for adding them to the PATH/MANPATH in order to have full use of +Heyu. + +The user may alternatively rerun Configure.sh for "OpenSolaris_BSD", +i.e., 'sh ./Configure.sh opensolaris_bsd', +which will set the directories using the BSD convention under +the /usr/local tree, which however may be deleted when OpenSolaris +is upgraded. + +Some older versions of OpenSolaris, in particular SXCE (Solaris +Express Community Edition), may encounter an error when running +'make install' like "test: argument expected". If this occurs, +change the first line of file install.sh to read "#!/bin/ksh". + + + diff --git a/README.INSTALL b/README.INSTALL deleted file mode 100644 index 76acc62..0000000 --- a/README.INSTALL +++ /dev/null @@ -1,207 +0,0 @@ - - Installing Heyu on a Unix-like system. - -(This file is duplicated as both INSTALL and README.INSTALL, in the -event your case-insensitive file system overwrites INSTALL with the -install script.) - -Heyu requires a reasonable compiler (GCC works well), the 'make' program, -and the development header (.h) files. Many OS distributions will either -install these by default or provide a visible option to include the -"development package" during OS installation. But some of the newer OS's -do not, e.g., with Ubuntu Linux it's necessary to afterward execute the -command 'apt-get install build-essential'. - -Note: If you're upgrading from a previous version of Heyu, run 'heyu stop' -under that version before proceeding. - -Quickstart: - sh ./Configure.sh [option] (As a normal user) - make (As a normal user) - su (Become superuser) - make install (As superuser) - exit (Revert to normal user) - heyu info (As a normal user, to test installation) - -(The 'make install' requires that you have write permissions to -/usr/local/bin, man page, and other directories.) - -Ubuntu Linux users should execute 'sudo make install' rather than -the three commands 'su', 'make install', and 'exit'. - -*** Kindly report any compile errors or warnings to the author.*** - -It can take 5-8 seconds to set up the heyu_relay daemon and initialize -the CM11A interface the first time Heyu is run, e.g., with 'heyu info'. - -Running 'heyu help' will display the long list of Heyu commands. -These are further explained in the man page heyu(1). - -CUSTOMIZING ------------ -The Configure.sh script creates a Makefile by running 'uname -s' and then -passing known good options to Autoconf configure script. The contents -of Makefile.in is then expanded to the Makefile. Changes to the makefile -should be made in Configure.sh or Makefile.in. - -If Configure.sh can not figure out what your system is, you can try -sh ./Configure.sh generic - or -sh ./Configure.sh sysv - -If those don't work, we'll have to figure it out by hand. Please contact -the author so your discoveries can be integrated into the next release. - -SERIAL PORTS ------------- -Many newer computers don't have built-in RS232 serial ports, only USB -ports. For these computers a USB-Serial adapter is required to connect -the CM11A. Before purchasing a USB-Serial adapter, verify that the driver -for your OS is available, either built-in to the OS, provided with the -adapter on a companion disc, or downloadable from the adapter -manufacturer's website. - -If you have a choice, select an adapter with an FTDI chipset over one -with a Prolific chipset. One dealer who specifies the chipset -and supported operating systems for each adapter model for sale is -ByteRunner (http://ww.byterunner.com). - -Drivers for adapters with a Prolific PL2303 chipset can often be found -at http://www.prolific.com.tw/eng/downloads.asp?ID=31 - -For Linux, the serial device name for a USB-Serial adapter will normally -be /dev/ttyUSBx, where x = 0 for the first adapter plugged into the -USB port and higher numbers for subsequent adapters. - -Note: The International 230V version of the CM11 sold in Europe and -elsewhere is now usually provided with a USB cable in addition to the -standard RS232 cable. Many Linux users have experienced lockups and -other problem with this USB cable (based on a Prolific chipset) which -disappeared when they switched to a regular USB-Serial adapter. - -OPTIONS -------- -By default, Heyu allocates space for 32 common flags, 32 counters, and -32 user countdown timers. The number of each of these can be increased -at compile time with switches -flags=NN, -counters=NN, and -timers=NN. -The specified NN must be in the range 1-1024 and will be rounded up to -the nearest multiple of 32, e.g., - - sh ./Configure.sh -flags=64 -timers=75 - -will allocate space for 64 flags and 96 timers, the latter because -the specified 75 is rounded up to 96. The number of counters will -remain 32. - -By default, support for the X10 CM17A "Firecracker" device is compiled -into Heyu. As there is no known version of this device available which -transmits at frequencies other than the 310 MHz used for transceivers -in North America, users outside this region may wish to compile without -CM17A support. Since the CM17A is both powered and actuated by the DTR -and RTS serial lines, support for this device might as well also be -omitted if your serial port hardware does not support these lines. -To do so, run the Configure.sh step mentioned above with the '-nocm17a' -switch, i.e., - - sh ./Configure.sh -nocm17a - -By default, support for Extended Type 0 (Shutter and Shade) commands -is compiled into Heyu. As there is only one module known to support -these commands (the 230V, 50Hz Marmitek SW10 Shutter Motor Controller -sold in Europe), this support may be omitted by using Configure.sh with -the '-noext0' switch, i.e., - - sh ./Configure.sh -noext0 - -By default, support for RFXSensors is compiled into Heyu. RFXSensors -require a WGL W800RF32 or RFXCOM X10 RF receiver as well as a RFXSensor -transmitter. This support may be omitted by including the '-norfxs' -switch with Configure.sh, i.e., - - sh ./Configure.sh -norfxs - -By default, support for RFXMeters is compiled into Heyu. RFXMeters -requires a 433.92 MHz RFXCOM X10 RF receiver as well as the RFXMeter -transmitter. This support may be omitted by including the '-norfxm' switch -with Configure.sh, i.e., - - sh ./Configure.sh -norfxm - -By default, support for the Digimax 210 remote thermostat is compiled -into Heyu. The Digimax requires a 433.92 MHz RFXCOM X10 RF receiver as -well as the Digimax transmitter. This support may be omitted by -including the '-nodmx' switch with Configure.sh, i.e., - - sh ./Configure.sh -nodmx - -By default, support for Oregon RF sensors is compilied into Heyu. -Oregon sensor support requires a 433.92 MHz RFXCOM X10 RF receiver -as well as a supported model of Oregon sensor. This support may be -omitted by including the '-noore' switch with Configure.sh, i.e., - - sh ./Configure.sh -noore - -By default, support for signals received from KaKu and HomeEasy -transmitters is compiled into Heyu. KaKu/HomeEasy support requires a -433.92 MHz RFXCOM X10 RF receiver. This support may be omitted -by including the '-nokaku' switch with Configure.sh, i.e., - - sh ./Configure.sh -nokaku - -By default, support for RFXLAN RF receiver (network version of RFXCOM) -is compiled into Heyu. This support may be omitted by including the -'-norfxlan' switch with Configure.sh, i.e., - - sh ./Configure.sh -norfxlan - - -Notes for Mac OS X: -------------------- -The heyu executable is installed in directory /usr/local/bin, which -is not on the Mac's default PATH. You will have to add this directory -to your $PATH. Similarly you may have to add the man page directory -/usr/local/man to your $MANPATH (or the /usr/share/misc/man.conf file -for newer versions of OS X which have deprecated $MANPATH). - -Newer Macs don't have an actual RS232 serial port, only a USB port, -and a USB/Serial adapter is required. The manufacturer's adapter -driver will usually add two or more different devices in /dev -(and often with "usbserial" as part of the name). You'll have -to experiment to see which one works with Heyu by trying the -different names in the TTY directive in the heyu configuration -file. The device name which also includes "cu" rather than "tty" -has been found to work on the (few) Macs tested thusfar. - - -Notes for AT&T SysV r4: ----------------------- -The function uname(1) used to determine the system type for -Configure.sh does not distinguish this OS from other sysv systems. -Supply the system type parameter "attsvr4" to Configure.sh, i.e., -run 'sh ./Configure.sh attsvr4'. - -Notes for OpenSolaris: ---------------------- -The directories in which the Heyu binary executable and man pages -are installed are set per the OpenSolaris system conventions to: - BIN = /opt/heyu/bin - MAN = /opt/heyu/man/man1 - MAN5 = /opt/heyu/man/man5 -However for a virgin OS installation, none of these directories -are on the system's PATH/MANPATH and the user is responsible -for adding them to the PATH/MANPATH in order to have full use of -Heyu. - -The user may alternatively rerun Configure.sh for "OpenSolaris_BSD", -i.e., 'sh ./Configure.sh opensolaris_bsd', -which will set the directories using the BSD convention under -the /usr/local tree, which however may be deleted when OpenSolaris -is upgraded. - -Some older versions of OpenSolaris, in particular SXCE (Solaris -Express Community Edition), may encounter an error when running -'make install' like "test: argument expected". If this occurs, -change the first line of file install.sh to read "#!/bin/ksh". - - - diff --git a/README1 b/README1 new file mode 100644 index 0000000..5025ed7 --- /dev/null +++ b/README1 @@ -0,0 +1,61 @@ + HEYU (version 1) Program overview + +This program operates an X10 module via a CM11A computer interface. It is +based on the program X10 by Larry Cambell as modified by Paul Fox. All but a +few functions have been changed enough that they no longer interwork with +the original. I think this justifies issuing the program as 'heyu' instead +of 'x10'. + +The program name comes from the old joke about having a 3rd person in the +house. Ida No was the one frequently blamed when things went wrong. In my +house it was the frequently heard yells of "Heyu! Turn off the lights!" +A poor joke, but I like it. + +The program is strictly command line driven, and works well with crontab. +Crontab can be used to schedule events. You can also upload timers and +macros to the CM11's memory. + +The program comes complete with source code, sample config files, MAN pages +an executable binary. The program has options to allow you to: + + * Get the date and time from the interface + * Get information about current settings and module states + * Turn an X10 module on or off + * Dim or brighten an X10 module + * Monitor all data sent to or from the CM11A + * Get the status of intelligent X10 modules (rr501 for instance) + * Set the X10 clock from the computer's clock (time and date) + * Zero out the macro and event memory of the X10 + * Upload macros and timers + * preset the dim level of advanced two way devices + +As of version 1.27, Heyu has the ability to send a schedule of events to the +CM11A. This enables timers and macros. + +The people at X10 have informed me that there is no way to download (to the +computer) the events stored in the CM11A. That being the case, I wrote +programs that will load the events and macros from local data files. This +will erase whatever has been stored there, but I guess that's the way it has +to be. + +This should compile on any Linux system. It should also compile on any other +BSDish or SYSV system. Just edit the #define in the make file. Make install +will try to install the man page and the program. The makefile has defines +for these locations. + +See the original README in Larry Campbell's program for some nice info on +the cp290 and the history of the program. See the original for some really +niffty uses using scheduling and macros. + +There are two demo programs included with heyu, monit and x10biff. + + * The monit program will turn off your monitor based on idle time. It's + the ultimate screen saver. + * The x10biff program will flash a light to let you know that you have + E-mail. + +Daniel B. Suthers, CCP, CSP +12-31-1996 +Updated 12-12-1999 +E-mail: dbs@tanj.com +uucp: pacbell!daver!dansst!dbs diff --git a/heyu.1 b/heyu.1 index 92ce89d..6e3a7b8 100644 --- a/heyu.1 +++ b/heyu.1 @@ -60,7 +60,7 @@ As far as can be determined there is no version of the CM17A which transmits at an RF frequency other than the 310 MHz used for X10 transceivers in North America. A compile option is provided to compile Heyu without CM17A support for users outside North America or those -who simply have no interest in this device. (See the file "INSTALL" included +who simply have no interest in this device. (See the file "README" included in the Heyu distribution directory.) .PP Heyu depends on a configuration file to tell it on what serial port diff --git a/x10cm17a.5 b/x10cm17a.5 index fc447f9..fb40d9f 100644 --- a/x10cm17a.5 +++ b/x10cm17a.5 @@ -24,7 +24,7 @@ As far as can be determined there is no version of the CM17A which transmits at an RF frequency other than the 310 MHz used for X10 transceivers in North America. Therefore an option is provided to compile Heyu without CM17A support for users outside North America or -simply those who have no interest in this device. (See the file "INSTALL" +simply those who have no interest in this device. (See the file "README" included in the Heyu distribution directory.) .SH CM17A COMMANDS diff --git a/x10digimax.5 b/x10digimax.5 index ccbbcff..180aa1f 100644 --- a/x10digimax.5 +++ b/x10digimax.5 @@ -19,7 +19,7 @@ and Heyu version 2.3 or greater. .SH COMPILER OPTION Support for DigiMax is compiled into Heyu by default. A compiler -option can be used to omit this support. See the file INSTALL +option can be used to omit this support. See the file README included in the Heyu distribution source directory for details. .SH CONFIGURATION diff --git a/x10kaku.5 b/x10kaku.5 index 476c436..b8a4c47 100644 --- a/x10kaku.5 +++ b/x10kaku.5 @@ -19,7 +19,7 @@ RF receiver and Heyu version 2.8 or greater. .SH COMPILER OPTION Support for KaKu/HomeEasy remotes is compiled into Heyu by default. A compiler option can be used to omit this support. See the file -INSTALL included in the Heyu distribution source directory for details. +README included in the Heyu distribution source directory for details. .SH CONFIGURATION It is assumed that a working installation of Heyu version 2.8 or diff --git a/x10oregon.5 b/x10oregon.5 index a4a57ca..6acca5f 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -24,7 +24,7 @@ RFXCOM receiver. .SH COMPILER OPTION Support for Oregon sensors is compiled into Heyu by default. A compiler -option can be used to omit this support. See the file INSTALL +option can be used to omit this support. See the file README included in the Heyu distribution source directory for details. .SH CONFIGURATION diff --git a/x10rfxmeters.5 b/x10rfxmeters.5 index 03595bb..0941419 100644 --- a/x10rfxmeters.5 +++ b/x10rfxmeters.5 @@ -20,7 +20,7 @@ receiver and Heyu version 2.2 or greater. .SH COMPILER OPTION Support for RFXMeters is compiled into Heyu by default. A compiler -option can be used to omit this support. See the file INSTALL +option can be used to omit this support. See the file README included in the Heyu distribution source directory for details. .SH HEYU CONFIGURATION diff --git a/x10rfxsensors.5 b/x10rfxsensors.5 index 1b8bccf..0903a83 100644 --- a/x10rfxsensors.5 +++ b/x10rfxsensors.5 @@ -20,7 +20,7 @@ transmitter and Heyu version 2.2 or greater. .SH COMPILER OPTION Support for RFXSensors is compiled into Heyu by default. A compiler -option can be used to omit this support. See the file INSTALL +option can be used to omit this support. See the file README included in the Heyu distribution source directory for details. .SH CONFIGURATION From 7440ce784374e8b473e726a221e09d8c05f08bc4 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 2 Jan 2012 21:58:21 +0100 Subject: [PATCH 42/56] Add autoreconf generated and installed files To allow for configuring and building Heyu without Autoconf and Automake packages installed, provide all required files, both generated automatically from configure.ac and Makefile.am, as well as copies of those distributed and installed with automake. Add AC_PROG_INSTALL to configure.ac checks for programs, as suggested by autoscan, re-run after autoreconf. Signed-off-by: Janusz Krzysztofik --- Makefile.in | 1103 ++++++-- aclocal.m4 | 1058 +++++++ config.guess | 1523 ++++++++++ config.h.in | 296 ++ config.sub | 1757 ++++++++++++ configure | 7572 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + depcomp | 630 +++++ install-sh | 520 ++++ missing | 376 +++ 10 files changed, 14580 insertions(+), 256 deletions(-) create mode 100644 aclocal.m4 create mode 100755 config.guess create mode 100644 config.h.in create mode 100755 config.sub create mode 100755 configure create mode 100755 depcomp create mode 100755 install-sh create mode 100755 missing diff --git a/Makefile.in b/Makefile.in index 9c0c387..bfb3886 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,289 +1,876 @@ -## Makefile template for Heyu, a program to control an X10 CM11A computer -## interface. The Makefile is expanded from Makefile.in by the Autoconf -## generated configure script, called in turn, with locally selected options, -## by the Configure.sh program - -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## -## - +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am - Automake source file for Heyu +# +# Copyright (C) 2011 Janusz Krzysztofik +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ bin_PROGRAMS = heyu$(EXEEXT) - +subdir = . +DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ + $(dist_man_MANS) $(dist_pkgsysconf_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING INSTALL config.guess \ + config.sub depcomp install-sh missing +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" \ + "$(DESTDIR)$(pkgsysconfdir)" +PROGRAMS = $(bin_PROGRAMS) +am_heyu_OBJECTS = date.$(OBJEXT) erase.$(OBJEXT) info.$(OBJEXT) \ + message.$(OBJEXT) relay.$(OBJEXT) monitor.$(OBJEXT) \ + reset.$(OBJEXT) setclock.$(OBJEXT) stop.$(OBJEXT) \ + tty.$(OBJEXT) x10.$(OBJEXT) xread.$(OBJEXT) xwrite.$(OBJEXT) \ + status.$(OBJEXT) cm11a.$(OBJEXT) eeprom.$(OBJEXT) \ + process.$(OBJEXT) sun.$(OBJEXT) cmd.$(OBJEXT) config.$(OBJEXT) \ + x10state.$(OBJEXT) poll.$(OBJEXT) modules.$(OBJEXT) \ + cm17a.$(OBJEXT) xsync.$(OBJEXT) timing.$(OBJEXT) \ + cm10a.$(OBJEXT) tty_aux.$(OBJEXT) relay_aux.$(OBJEXT) \ + x10aux.$(OBJEXT) rfxcom.$(OBJEXT) digimax.$(OBJEXT) \ + oregon.$(OBJEXT) +heyu_OBJECTS = $(am_heyu_OBJECTS) +heyu_LDADD = $(LDADD) +DEFAULT_INCLUDES = -I.@am__isrc@ +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(heyu_SOURCES) +DIST_SOURCES = $(heyu_SOURCES) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 - +NROFF = nroff +MANS = $(dist_man_MANS) +DATA = $(dist_doc_DATA) $(dist_pkgsysconf_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +COUNTERS = @COUNTERS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FLAGS = @FLAGS@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ - +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ - +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POW_LIB = @POW_LIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TIMERS = @TIMERS@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ pkgsysconfdir = @pkgsysconfdir@ prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ - -CPPFLAGS := $(CPPFLAGS) -DHAVE_CONFIG_H -I. - -BIN = $(bindir) -MAN = $(man1dir) -MAN5 = $(man5dir) - -SRCS = date.c erase.c info.c message.c relay.c \ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +heyu_SOURCES = date.c erase.c info.c message.c relay.c \ monitor.c reset.c setclock.c stop.c \ tty.c x10.c xread.c xwrite.c status.c cm11a.c \ eeprom.c process.c sun.c cmd.c config.c x10state.c \ poll.c modules.c cm17a.c xsync.c timing.c cm10a.c \ - tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c -OBJS = date.o erase.o info.o message.o relay.o \ - monitor.o reset.o setclock.o stop.o \ - tty.o x10.o xread.o xwrite.o status.o cm11a.o \ - eeprom.o process.o sun.o cmd.o config.o x10state.o \ - poll.o modules.o cm17a.o xsync.o timing.o cm10a.o \ - tty_aux.o relay_aux.o x10aux.o rfxcom.o digimax.o oregon.o - -OTHERSRC = README README2 Makefile x10config.sample protocol.txt eeprom.h \ - README1 x10.sched.sample heyu.1 x10.h x10config.5 x10cm17a.5 \ - history.txt version.h heyufaq.txt x10sched.5 process.h sun.h \ - x10scripts.5 Configure.sh Makefile.in post-install.sh AUTHORS COPYING INSTALL \ - README.cm10a x10aux.5 x10state.h rfxcom.h digimax.h oregon.h x10rfxsensors.5\ - x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 README.webhook - -EVERYTHING = $(OTHERSRC) $(SRCS) + tty_aux.c relay_aux.c x10aux.c rfxcom.c digimax.c oregon.c \ + x10.h eeprom.h process.h sun.h x10state.h \ + rfxcom.h digimax.h oregon.h + +dist_man_MANS = heyu.1 x10config.5 x10sched.5 x10scripts.5 x10cm17a.5 x10aux.5 \ + x10rfxsensors.5 x10rfxmeters.5 x10digimax.5 x10oregon.5 x10kaku.5 + +dist_doc_DATA = README README1 README2 protocol.txt history.txt heyufaq.txt \ + AUTHORS COPYING INSTALL README.cm10a README.webhook release_notes.txt + +dist_pkgsysconf_DATA = x10config.sample x10.sched.sample +EXTRA_DIST = Configure.sh post-install.sh +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + $(am__cd) $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +heyu$(EXEEXT): $(heyu_OBJECTS) $(heyu_DEPENDENCIES) + @rm -f heyu$(EXEEXT) + $(LINK) $(heyu_OBJECTS) $(heyu_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cm10a.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cm11a.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cm17a.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/date.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digimax.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eeprom.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/erase.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/message.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modules.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oregon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/poll.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relay.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relay_aux.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reset.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rfxcom.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setclock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stop.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sun.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty_aux.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x10.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x10aux.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x10state.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xread.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsync.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwrite.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +install-man1: $(dist_man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" + @list=''; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } +install-man5: $(dist_man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" + @list=''; test -n "$(man5dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.5[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \ + done; } + +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man5dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.5[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } +install-dist_docDATA: $(dist_doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ + done +uninstall-dist_docDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(docdir)" && rm -f $$files +install-dist_pkgsysconfDATA: $(dist_pkgsysconf_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)" + @list='$(dist_pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \ + done + +uninstall-dist_pkgsysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgsysconfdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgsysconfdir)" && rm -f $$files + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @list='$(MANS)'; if test -n "$$list"; then \ + list=`for p in $$list; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ + if test -n "$$list" && \ + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ + echo " typically \`make maintainer-clean' will remove them" >&2; \ + exit 1; \ + else :; fi; \ + else :; fi + $(am__remove_distdir) + test -d "$(distdir)" || mkdir "$(distdir)" + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @$(am__cd) '$(distuninstallcheck_dir)' \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-am @POSTINST_FALSE@all-local: -all: heyu all-local - -heyu: $(OBJS) version.h - $(CC) $(LDFLAGS) -o heyu $(OBJS) $(LIBS) - -$(OBJS): config.h x10.h process.h sun.h Makefile - -eeprom.o: eeprom.h -info.o: version.h -x10state.o: x10state.c x10state.h rfxcom.h digimax.h oregon.h version.h -rfxcom.o: rfxcom.c x10state.h rfxcom.h -digimax.o: digimax.c x10state.h digimax.h -oregon.o: oregon.c x10state.h oregon.h -modules.o: modules.c oregon.h -poll.o: poll.c oregon.h x10state.h -cmd.o: cmd.c x10state.h -config.o: config.c x10state.h - -install: $(BIN)/heyu $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ - $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ - $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 $(MAN5)/x10digimax.5 \ - $(MAN5)/x10oregon.5 $(MAN5)/x10kaku.5 +all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h all-local +installdirs: + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgsysconfdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." @POSTINST_FALSE@install-exec-hook: +clean: clean-am -maninstall: $(MAN)/heyu.1 $(MAN5)/x10config.5 $(MAN5)/x10sched.5 \ - $(MAN5)/x10scripts.5 $(MAN5)/x10cm17a.5 $(MAN5)/x10aux.5 \ - $(MAN5)/x10rfxsensors.5 $(MAN5)/x10rfxmeters.5 \ - $(MAN5)/x10digimax.5 $(MAN5)/x10oregon.5 $(MAN5)/x10kaku.5 - -uninstall: - rm -f $(BIN)/heyu - rm -f $(MAN)/heyu.1 - rm -f $(MAN5)/x10config.5 - rm -f $(MAN5)/x10sched.5 - rm -f $(MAN5)/x10scripts.5 - rm -f $(MAN5)/x10cm17a.5 - rm -f $(MAN5)/x10aux.5 - rm -f $(MAN5)/x10rfxsensors.5 - rm -f $(MAN5)/x10rfxmeters.5 - rm -f $(MAN5)/x10digimax.5 - rm -f $(MAN5)/x10oregon.5 - rm -f $(MAN5)/x10kaku.5 - -$(BIN)/heyu: heyu - mkdir -p -m 755 $(BIN) - cp heyu $(BIN) - chmod 755 $(BIN)/heyu - $(MAKE) install-exec-hook - -$(MAN)/heyu.1: heyu.1 - mkdir -p -m 755 $(MAN) - cp heyu.1 $(MAN) - chmod 644 $(MAN)/heyu.1 - -$(MAN5)/x10config.5: x10config.5 - mkdir -p -m 755 $(MAN5) - cp x10config.5 $(MAN5) - chmod 644 $(MAN5)/x10config.5 - -$(MAN5)/x10sched.5: x10sched.5 - mkdir -p -m 755 $(MAN5) - cp x10sched.5 $(MAN5) - chmod 644 $(MAN5)/x10sched.5 - -$(MAN5)/x10scripts.5: x10scripts.5 - mkdir -p -m 755 $(MAN5) - cp x10scripts.5 $(MAN5) - chmod 644 $(MAN5)/x10scripts.5 - -$(MAN5)/x10cm17a.5: x10cm17a.5 - mkdir -p -m 755 $(MAN5) - cp x10cm17a.5 $(MAN5) - chmod 644 $(MAN5)/x10cm17a.5 - -$(MAN5)/x10aux.5: x10aux.5 - mkdir -p -m 755 $(MAN5) - cp x10aux.5 $(MAN5) - chmod 644 $(MAN5)/x10aux.5 - -$(MAN5)/x10rfxsensors.5: x10rfxsensors.5 - mkdir -p -m 755 $(MAN5) - cp x10rfxsensors.5 $(MAN5) - chmod 644 $(MAN5)/x10rfxsensors.5 - -$(MAN5)/x10rfxmeters.5: x10rfxmeters.5 - mkdir -p -m 755 $(MAN5) - cp x10rfxmeters.5 $(MAN5) - chmod 644 $(MAN5)/x10rfxmeters.5 - -$(MAN5)/x10digimax.5: x10digimax.5 - mkdir -p -m 755 $(MAN5) - cp x10digimax.5 $(MAN5) - chmod 644 $(MAN5)/x10digimax.5 - -$(MAN5)/x10oregon.5: x10oregon.5 - mkdir -p -m 755 $(MAN5) - cp x10oregon.5 $(MAN5) - chmod 644 $(MAN5)/x10oregon.5 - -$(MAN5)/x10kaku.5: x10kaku.5 - mkdir -p -m 755 $(MAN5) - cp x10kaku.5 $(MAN5) - chmod 644 $(MAN5)/x10kaku.5 - -lint: - lint $(DFLAGS) $(SRCS) - -shar: x10_heyu.shar.1 x10_heyu.shar.2 - -x10.o: x10.c version.h -process.o: process.c version.h -xread.o: xread.c - -ci: $(SRCS) index.html Makefile - @ for FL in $+ ; do \ - if test -w $$FL ; then \ - ci -l $$FL ;\ - fi ;\ - done +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-hdr distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-dist_docDATA install-dist_pkgsysconfDATA \ + install-man + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-binPROGRAMS + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: install-man1 install-man5 + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \ + uninstall-dist_pkgsysconfDATA uninstall-man + +uninstall-man: uninstall-man1 uninstall-man5 + +.MAKE: all install-am install-exec-am install-strip + +.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ + clean clean-binPROGRAMS clean-generic ctags dist dist-all \ + dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_docDATA \ + install-dist_pkgsysconfDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-man5 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-dist_docDATA \ + uninstall-dist_pkgsysconfDATA uninstall-man uninstall-man1 \ + uninstall-man5 -x10_heyu.shar.1: - shar $(OTHERSRC) >x10_heyu.shar.1 - -x10_heyu.shar.2: - shar $(SRCS) > x10_heyu.shar.2 - -bigshar: - shar $(EVERYTHING) > x10_heyu.shar - -tar: x10_heyu.tgz - -x10_heyu.tgz: $(EVERYTHING) - rm -fr heyu.dir - mkdir heyu.dir - cp -p $(EVERYTHING) heyu.dir - cp Makefile.dist heyu.dir/Makefile - tar -czvf x10_heyu.tgz heyu.dir - -heyudistro: $(EVERYTHING) - rm -rf distro.dir - mkdir distro.dir - cp -p $(EVERYTHING) distro.dir - cp -p release_notes.txt distro.dir - cp -p INSTALL distro.dir/README.INSTALL - rm distro.dir/Makefile - -man2html: - man2html heyu.1 >./html/heyu.1.html - man2html x10config.5 >./html/x10config.5.html - man2html x10scripts.5 > ./html/x10scripts.5.html - man2html x10sched.5 > ./html/x10sched.5.html - man2html x10aux.5 > ./html/x10aux.5.html - man2html x10cm17a.5 > ./html/x10cm17a.5.html - man2html x10rfxsensors.5 > ./html/x10rfxsensors.5.html - man2html x10rfxmeters.5 > ./html/x10rfxmeters.5.html - man2html x10digimax.5 > ./html/x10digimax.5.html - man2html x10oregon.5 > ./html/x10oregon.5.html - man2html x10kaku.5 > ./html/x10kaku.5.html - -beta: x10_beta.tgz - -x10_beta.tgz: $(EVERYTHING) - rm -fr heyu.beta - mkdir heyu.beta - cp -p $(EVERYTHING) heyu.beta - cp Makefile.dist heyu.dir/Makefile - tar -czvf x10_beta.tgz heyu.beta - -zip: x10_heyu.zip - -x10_heyu.zip: $(EVERYTHING) - rm -f x10_heyu.zip - zip -kl x10_heyu.zip $(EVERYTHING) - -touch: - touch $(OTHERSRC) - touch $(SRCS) - -clean: - rm -f *.o - -clobber: clean - rm -f heyu - -upload: heyu index.html x10_heyu.tgz x10_heyu.zip - /bin/sh -c ./upload.sh - -rcsdiffrw: - @-for x in `$(MAKE) rw` ;\ - do \ - echo ;\ - echo $$x ;\ - echo ========= ;\ - rcsdiff $$x ;\ - done 2>&1 ;\ - echo ;\ - echo all done - -list: - @ls $(EVERYTHING) | more - -rw: - @ls -l $(EVERYTHING) | \ - egrep '^[^l].w' | \ - sed 's;.* ;;' # strip to last space - -populate: $(EVERYTHING) - -$(EVERYTHING): -## co -r$(revision) $@ @MAN1DIR@ @MAN5DIR@ +*.o: Makefile + @POSTINST_TRUE@all-local: usergroup.tmp userhome.tmp @POSTINST_TRUE@usergroup.tmp userhome.tmp: $(bin_PROGRAMS) @@ -296,3 +883,7 @@ $(EVERYTHING): @POSTINST_TRUE@install-exec-hook: @POSTINST_TRUE@ @$(POST_INSTALL) @POSTINST_TRUE@ @POSTINST@ + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000..77e471b --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,1058 @@ +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +# longlong.m4 serial 14 +dnl Copyright (C) 1999-2007, 2009-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Paul Eggert. + +# Define HAVE_LONG_LONG_INT if 'long long int' works. +# This fixes a bug in Autoconf 2.61, but can be removed once we +# assume 2.62 everywhere. + +# Note: If the type 'long long int' exists but is only 32 bits large +# (as on some very old compilers), HAVE_LONG_LONG_INT will not be +# defined. In this case you can treat 'long long int' like 'long int'. + +AC_DEFUN([AC_TYPE_LONG_LONG_INT], +[ + AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], + [AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. + dnl If cross compiling, assume the bug isn't important, since + dnl nobody cross compiles for this platform as far as we know. + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[@%:@include + @%:@ifndef LLONG_MAX + @%:@ define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + @%:@ define LLONG_MAX (HALF - 1 + HALF) + @%:@endif]], + [[long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0;]])], + [ac_cv_type_long_long_int=yes], + [ac_cv_type_long_long_int=no], + [ac_cv_type_long_long_int=yes])], + [ac_cv_type_long_long_int=no])]) + if test $ac_cv_type_long_long_int = yes; then + AC_DEFINE([HAVE_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `long long int'.]) + fi +]) + +# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. +# This fixes a bug in Autoconf 2.61, but can be removed once we +# assume 2.62 everywhere. + +# Note: If the type 'unsigned long long int' exists but is only 32 bits +# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT +# will not be defined. In this case you can treat 'unsigned long long int' +# like 'unsigned long int'. + +AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], +[ + AC_CACHE_CHECK([for unsigned long long int], + [ac_cv_type_unsigned_long_long_int], + [AC_LINK_IFELSE( + [_AC_TYPE_LONG_LONG_SNIPPET], + [ac_cv_type_unsigned_long_long_int=yes], + [ac_cv_type_unsigned_long_long_int=no])]) + if test $ac_cv_type_unsigned_long_long_int = yes; then + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], + [Define to 1 if the system has the type `unsigned long long int'.]) + fi +]) + +# Expands to a C program that can be used to test for simultaneous support +# of 'long long' and 'unsigned long long'. We don't want to say that +# 'long long' is available if 'unsigned long long' is not, or vice versa, +# because too many programs rely on the symmetry between signed and unsigned +# integer types (excluding 'bool'). +AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET], +[ + AC_LANG_PROGRAM( + [[/* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63;]], + [[/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull));]]) +]) + +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 10 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +#serial 5 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 16 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) + +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 6 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff --git a/config.guess b/config.guess new file mode 100755 index 0000000..e1f34b5 --- /dev/null +++ b/config.guess @@ -0,0 +1,1523 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. + +timestamp='2010-09-24' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' HUP INT TERM + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU/*) + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #ifdef __UCLIBC__ + # ifdef __UCLIBC_CONFIG_VERSION__ + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ + # else + LIBC=uclibc + # endif + #else + # ifdef __dietlibc__ + LIBC=dietlibc + # else + LIBC=gnu + # endif + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..6a57f1f --- /dev/null +++ b/config.h.in @@ -0,0 +1,296 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#undef GETGROUPS_T + +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + +/* Define to 1 if you have the header file. */ +#undef HAVE_ASM_IOCTLS_H + +/* Define to 1 if you have the declaration of `timezone', and to 0 if you + don't. */ +#undef HAVE_DECL_TIMEZONE + +/* Define to 1 if you have the header file. */ +#undef HAVE_ERRNO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define if you have the CM17A Firecracker device */ +#undef HAVE_FEATURE_CM17A + +/* Define if you have Digimax thermostats */ +#undef HAVE_FEATURE_DMX + +/* Define if you have extended type 0 shutter controllers */ +#undef HAVE_FEATURE_EXT0 + +/* Define if you have KaKu/HomeEasy devices */ +#undef HAVE_FEATURE_KAKU + +/* Define if you have Oregon sensors */ +#undef HAVE_FEATURE_ORE + +/* Define if you have RFXLAN receiver */ +#undef HAVE_FEATURE_RFXLAN + +/* Define if you have RFXMeters */ +#undef HAVE_FEATURE_RFXM + +/* Define if you have RFXSensors */ +#undef HAVE_FEATURE_RFXS + +/* Define to 1 if you have the `floor' function. */ +#undef HAVE_FLOOR + +/* Define to 1 if you have the `fork' function. */ +#undef HAVE_FORK + +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + +/* Define to 1 if your system has a working `getgroups' function. */ +#undef HAVE_GETGROUPS + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_SERIAL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LINUX_SERIAL_REG_H + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the `nanosleep' function. */ +#undef HAVE_NANOSLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the `nsleep' function. */ +#undef HAVE_NSLEEP + +/* Define to 1 if you have the header file. */ +#undef HAVE_PTY_H + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `setitimer' function. */ +#undef HAVE_SETITIMER + +/* Define to 1 if you have the header file. */ +#undef HAVE_SGTTY_H + +/* Define to 1 if you have the `sigaction' function. */ +#undef HAVE_SIGACTION + +/* Define to 1 if you have the `siginterrupt' function. */ +#undef HAVE_SIGINTERRUPT + +/* Define to 1 if you have the `socket' function. */ +#undef HAVE_SOCKET + +/* Define to 1 if you have the `sqrt' function. */ +#undef HAVE_SQRT + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `strchr' function. */ +#undef HAVE_STRCHR + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* Define to 1 if you have the `strtol' function. */ +#undef HAVE_STRTOL + +/* Define to 1 if the system has the type `struct termio'. */ +#undef HAVE_STRUCT_TERMIO + +/* Define to 1 if the system has the type `struct termios'. */ +#undef HAVE_STRUCT_TERMIOS + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_ERRNO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILSYS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TERMIOS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TERMIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIOS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIO_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if the system has the type `unsigned long long int'. */ +#undef HAVE_UNSIGNED_LONG_LONG_INT + +/* Define to 1 if you have the `vfork' function. */ +#undef HAVE_VFORK + +/* Define to 1 if you have the header file. */ +#undef HAVE_VFORK_H + +/* Define to 1 if the system has the type `void'. */ +#undef HAVE_VOID + +/* Define to 1 if `fork' works. */ +#undef HAVE_WORKING_FORK + +/* Define to 1 if `vfork' works. */ +#undef HAVE_WORKING_VFORK + +/* Define if you need more than 1 bank of 32 user counters each */ +#undef NUM_COUNTER_BANKS + +/* Define if you need more than 1 bank of 32 user flags each */ +#undef NUM_FLAG_BANKS + +/* Define if you need more than 1 bank of 32 user timers each */ +#undef NUM_TIMER_BANKS + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Release date of package */ +#undef RELEASE_DATE + +/* required for correct termio handling */ +#undef SCO + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Version number of package */ +#undef VERSION + +/* Define to `int' if doesn't define. */ +#undef gid_t + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to `int' if does not define. */ +#undef mode_t + +/* Define to `long int' if does not define. */ +#undef off_t + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* Define to `unsigned int' if does not define. */ +#undef size_t + +/* Define to `int' if doesn't define. */ +#undef uid_t + +/* Define as `fork' if `vfork' does not work. */ +#undef vfork diff --git a/config.sub b/config.sub new file mode 100755 index 0000000..216604d --- /dev/null +++ b/config.sub @@ -0,0 +1,1757 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. + +timestamp='2010-09-11' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Please send patches to . Submit a context +# diff and a properly formatted GNU ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx | dvp \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze) + basic_machine=microblaze-xilinx + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/configure b/configure new file mode 100755 index 0000000..fdff308 --- /dev/null +++ b/configure @@ -0,0 +1,7572 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.68 for Heyu 2.10+autotools. +# +# Report bugs to . +# +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +# +# Heyu specific bits: +# Copyright (C) 2011 Janusz Krzysztofik +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: heyu@tickets.assembla.com about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='Heyu' +PACKAGE_TARNAME='heyu' +PACKAGE_VERSION='2.10+autotools' +PACKAGE_STRING='Heyu 2.10+autotools' +PACKAGE_BUGREPORT='heyu@tickets.assembla.com' +PACKAGE_URL='http://heyu.org' + +ac_unique_file="relay.c" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_header_list= +ac_func_list= +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +POW_LIB +LIBOBJS +EGREP +GREP +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +POSTINST_FALSE +POSTINST_TRUE +POSTINST +MAN5DIR +MAN1DIR +pkgsysconfdir +PACKAGE +TIMERS +COUNTERS +FLAGS +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_cm17a +enable_ext0 +enable_rfxs +enable_rfxm +enable_dmx +enable_ore +enable_kaku +enable_postinst +enable_dependency_tracking +enable_rfxlan +' + ac_precious_vars='build_alias +host_alias +target_alias +FLAGS +COUNTERS +TIMERS +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures Heyu 2.10+autotools to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/heyu] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of Heyu 2.10+autotools:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-cm17a omit support for optional CM17A Firecracker device + --disable-ext0 omit support for extended type 0 shutter controllers + --disable-rfxs omit support for RFXSensors + --disable-rfxm omit support for RFXMeters + --disable-dmx omit support for the Digimax thermostat + --disable-ore omit support for Oregon sensors + --disable-kaku omit support for KaKu/HomeEasy signals + --enable-postinst enable custom make rules, used for calling Heyu + custom post-install script + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --disable-rfxlan omit support for RFXLAN receiver + +Some influential environment variables: + FLAGS set number of user flags (1 < n < 1024) [32] + COUNTERS set number of user counters (1 < n < 1024) [32] + TIMERS set number of user timers (1 < n < 1024) [32] + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +Heyu home page: . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +Heyu configure 2.10+autotools +generated by GNU Autoconf 2.68 + +Copyright (C) 2010 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. + +Heyu specific bits: +Copyright (C) 2011 Janusz Krzysztofik +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ---------------------------------------- ## +## Report this to heyu@tickets.assembla.com ## +## ---------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type + +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_decl + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by Heyu $as_me 2.10+autotools, which was +generated by GNU Autoconf 2.68. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +as_fn_append ac_header_list " sys/time.h" +as_fn_append ac_header_list " unistd.h" +as_fn_append ac_func_list " alarm" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +$as_echo "#define RELEASE_DATE \"20111227\"" >>confdefs.h + + + +ac_config_headers="$ac_config_headers config.h" + + +# Optional Features +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable CM17A Firecracker support" >&5 +$as_echo_n "checking whether to enable CM17A Firecracker support... " >&6; } + # Check whether --enable-cm17a was given. +if test "${enable_cm17a+set}" = set; then : + enableval=$enable_cm17a; +else + enable_cm17a=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cm17a" >&5 +$as_echo "$enable_cm17a" >&6; } + if test "x$enable_cm17a" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_CM17A 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable extended type 0 shutter controllers support" >&5 +$as_echo_n "checking whether to enable extended type 0 shutter controllers support... " >&6; } + # Check whether --enable-ext0 was given. +if test "${enable_ext0+set}" = set; then : + enableval=$enable_ext0; +else + enable_ext0=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ext0" >&5 +$as_echo "$enable_ext0" >&6; } + if test "x$enable_ext0" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_EXT0 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RFXSensors support" >&5 +$as_echo_n "checking whether to enable RFXSensors support... " >&6; } + # Check whether --enable-rfxs was given. +if test "${enable_rfxs+set}" = set; then : + enableval=$enable_rfxs; +else + enable_rfxs=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rfxs" >&5 +$as_echo "$enable_rfxs" >&6; } + if test "x$enable_rfxs" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_RFXS 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RFXMeters support" >&5 +$as_echo_n "checking whether to enable RFXMeters support... " >&6; } + # Check whether --enable-rfxm was given. +if test "${enable_rfxm+set}" = set; then : + enableval=$enable_rfxm; +else + enable_rfxm=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rfxm" >&5 +$as_echo "$enable_rfxm" >&6; } + if test "x$enable_rfxm" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_RFXM 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Digimax thermostat support" >&5 +$as_echo_n "checking whether to enable Digimax thermostat support... " >&6; } + # Check whether --enable-dmx was given. +if test "${enable_dmx+set}" = set; then : + enableval=$enable_dmx; +else + enable_dmx=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dmx" >&5 +$as_echo "$enable_dmx" >&6; } + if test "x$enable_dmx" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_DMX 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Oregon sensors support" >&5 +$as_echo_n "checking whether to enable Oregon sensors support... " >&6; } + # Check whether --enable-ore was given. +if test "${enable_ore+set}" = set; then : + enableval=$enable_ore; +else + enable_ore=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ore" >&5 +$as_echo "$enable_ore" >&6; } + if test "x$enable_ore" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_ORE 1" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable support for KaKu/HomeEasy signals" >&5 +$as_echo_n "checking whether to enable support for KaKu/HomeEasy signals... " >&6; } + # Check whether --enable-kaku was given. +if test "${enable_kaku+set}" = set; then : + enableval=$enable_kaku; +else + enable_kaku=yes +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_kaku" >&5 +$as_echo "$enable_kaku" >&6; } + if test "x$enable_kaku" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_KAKU 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of user flags" >&5 +$as_echo_n "checking for number of user flags... " >&6; } + + if test "x$FLAGS" = "x"; then : + FLAGS=32 +else + if test $FLAGS -ge 1 && test $FLAGS -le 1024; then : + FLAGS=`expr \( $FLAGS + 31 \) / 32 \* 32` + +cat >>confdefs.h <<_ACEOF +#define NUM_FLAG_BANKS `expr $FLAGS / 32` +_ACEOF + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "wrong FLAGS value \"$FLAGS\" (shoud be 1 < n < 1024) +See \`config.log' for more details" "$LINENO" 5; } +fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLAGS" >&5 +$as_echo "$FLAGS" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of user counters" >&5 +$as_echo_n "checking for number of user counters... " >&6; } + + if test "x$COUNTERS" = "x"; then : + COUNTERS=32 +else + if test $COUNTERS -ge 1 && test $COUNTERS -le 1024; then : + COUNTERS=`expr \( $COUNTERS + 31 \) / 32 \* 32` + +cat >>confdefs.h <<_ACEOF +#define NUM_COUNTER_BANKS `expr $COUNTERS / 32` +_ACEOF + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "wrong COUNTERS value \"$COUNTERS\" (shoud be 1 < n < 1024) +See \`config.log' for more details" "$LINENO" 5; } +fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COUNTERS" >&5 +$as_echo "$COUNTERS" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of user timers" >&5 +$as_echo_n "checking for number of user timers... " >&6; } + + if test "x$TIMERS" = "x"; then : + TIMERS=32 +else + if test $TIMERS -ge 1 && test $TIMERS -le 1024; then : + TIMERS=`expr \( $TIMERS + 31 \) / 32 \* 32` + +cat >>confdefs.h <<_ACEOF +#define NUM_TIMER_BANKS `expr $TIMERS / 32` +_ACEOF + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "wrong TIMERS value \"$TIMERS\" (shoud be 1 < n < 1024) +See \`config.log' for more details" "$LINENO" 5; } +fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIMERS" >&5 +$as_echo "$TIMERS" >&6; } + +PACKAGE=$PACKAGE_TARNAME + +case $sysconfdir in #( + *$PACKAGE*) : + pkgsysconfdir='$(sysconfdir)' ;; #( + \$\(prefix\)*|\$\{prefix\}*) : + case $prefix in #( + *$PACKAGE*) : + pkgsysconfdir='$(sysconfdir)' ;; #( + *) : + pkgsysconfdir='$(sysconfdir)/$(PACKAGE)' ;; +esac ;; #( + *) : + pkgsysconfdir='$(sysconfdir)/$(PACKAGE)' ;; +esac + +case $CPPFLAGS in #( + *-DSYSBASEDIR=*) : + ;; #( + *) : + CPPFLAGS=$CPPFLAGS' -DSYSBASEDIR=\"$(pkgsysconfdir)\"' ;; +esac +case $CPPFLAGS in #( + *-DLOCKDIR=*) : + ;; #( + *) : + CPPFLAGS=$CPPFLAGS' -DLOCKDIR=\"$(localstatedir)/lock\"' ;; +esac +case $CPPFLAGS in #( + *-DSPOOLDIR=*) : + ;; #( + *) : + CPPFLAGS=$CPPFLAGS' -DSPOOLDIR=\"$(localstatedir)/tmp/$(PACKAGE)\"' ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom man1dir" >&5 +$as_echo_n "checking for a custom man1dir... " >&6; } + if test "x$man1dir" != "x"; then : + + MAN1DIR=man1dir=$man1dir + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $man1dir" >&5 +$as_echo "$man1dir" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom man5dir" >&5 +$as_echo_n "checking for a custom man5dir... " >&6; } + if test "x$man5dir" != "x"; then : + + MAN5DIR=man5dir=$man5dir + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $man5dir" >&5 +$as_echo "$man5dir" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom post-install script" >&5 +$as_echo_n "checking for a custom post-install script... " >&6; } + # Check whether --enable-postinst was given. +if test "${enable_postinst+set}" = set; then : + enableval=$enable_postinst; case $enable_postinst in #( + no) : + enable_postinst= ;; #( + yes) : + enable_postinst='$(srcdir)/post-install.sh' ;; #( + *) : + ;; +esac +fi + + if test "x$enable_postinst" != "x"; then : + + POSTINST=$enable_postinst + +fi + if test "x$enable_postinst" != "x"; then + POSTINST_TRUE= + POSTINST_FALSE='#' +else + POSTINST_TRUE='#' + POSTINST_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_postinst" >&5 +$as_echo "$enable_postinst" >&6; } + +am__api_version='1.11' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='heyu' + VERSION='2.10+autotools' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + + + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +case $host_os in #( + sco*) : + +$as_echo "#define SCO 1" >>confdefs.h + ;; #( + *) : + ;; +esac + +# Checks for programs. +if test "x$CFLAGS" = "x"; then : + no_CFLAGS="yes" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +if test "x$no_CFLAGS" = "xyes" && test "x$GCC" = "xyes"; then : + CFLAGS="$CFLAGS -Wall" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + + +# Checks for libraries. + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 +$as_echo_n "checking for library containing sqrt... " >&6; } +if ${ac_cv_search_sqrt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqrt (); +int +main () +{ +return sqrt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqrt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_sqrt+:} false; then : + break +fi +done +if ${ac_cv_search_sqrt+:} false; then : + +else + ac_cv_search_sqrt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 +$as_echo "$ac_cv_search_sqrt" >&6; } +ac_res=$ac_cv_search_sqrt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5 +$as_echo_n "checking for library containing nanosleep... " >&6; } +if ${ac_cv_search_nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nanosleep (); +int +main () +{ +return nanosleep (); + ; + return 0; +} +_ACEOF +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_nanosleep=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_nanosleep+:} false; then : + break +fi +done +if ${ac_cv_search_nanosleep+:} false; then : + +else + ac_cv_search_nanosleep=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5 +$as_echo "$ac_cv_search_nanosleep" >&6; } +ac_res=$ac_cv_search_nanosleep +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing syslog" >&5 +$as_echo_n "checking for library containing syslog... " >&6; } +if ${ac_cv_search_syslog+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char syslog (); +int +main () +{ +return syslog (); + ; + return 0; +} +_ACEOF +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_syslog=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_syslog+:} false; then : + break +fi +done +if ${ac_cv_search_syslog+:} false; then : + +else + ac_cv_search_syslog=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_syslog" >&5 +$as_echo "$ac_cv_search_syslog" >&6; } +ac_res=$ac_cv_search_syslog +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tcgetattr" >&5 +$as_echo_n "checking for library containing tcgetattr... " >&6; } +if ${ac_cv_search_tcgetattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tcgetattr (); +int +main () +{ +return tcgetattr (); + ; + return 0; +} +_ACEOF +for ac_lib in '' posix; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_tcgetattr=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_tcgetattr+:} false; then : + break +fi +done +if ${ac_cv_search_tcgetattr+:} false; then : + +else + ac_cv_search_tcgetattr=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tcgetattr" >&5 +$as_echo "$ac_cv_search_tcgetattr" >&6; } +ac_res=$ac_cv_search_tcgetattr +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + +# Checks for header files. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h strings.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in sys/filsys.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in syslog.h termio.h termios.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in asm/ioctls.h errno.h linux/serial.h linux/serial_reg.h pty.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in sys/errno.h sys/resource.h sys/termio.h sys/termios.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if ${ac_cv_header_sys_wait_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#ifndef WEXITSTATUS +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) +#endif +#ifndef WIFEXITED +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +#endif + +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_sys_wait_h=yes +else + ac_cv_header_sys_wait_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +$as_echo "$ac_cv_header_sys_wait_h" >&6; } +if test $ac_cv_header_sys_wait_h = yes; then + +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if ${ac_cv_header_time+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes +else + ac_cv_header_time=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then + +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + +fi + + +# Checks for typedefs, structures, and compiler characteristics. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +$as_echo_n "checking for uid_t in sys/types.h... " >&6; } +if ${ac_cv_type_uid_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then : + ac_cv_type_uid_t=yes +else + ac_cv_type_uid_t=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then + +$as_echo "#define uid_t int" >>confdefs.h + + +$as_echo "#define gid_t int" >>confdefs.h + +fi + +ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" +if test "x$ac_cv_type_mode_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define mode_t int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF + +fi + +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +$as_echo_n "checking for unsigned long long int... " >&6; } +if ${ac_cv_type_unsigned_long_long_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_type_unsigned_long_long_int=yes +else + ac_cv_type_unsigned_long_long_int=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } + if test $ac_cv_type_unsigned_long_long_int = yes; then + +$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h + + fi + +ac_fn_c_check_type "$LINENO" "void" "ac_cv_type_void" "$ac_includes_default" +if test "x$ac_cv_type_void" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_VOID 1 +_ACEOF + + +fi + +ac_fn_c_check_type "$LINENO" "struct termios" "ac_cv_type_struct_termios" " +#ifdef HAVE_SYS_TERMIOS_H +# include +#endif +#ifdef HAVE_TERMIOS_H +# include +#endif + +" +if test "x$ac_cv_type_struct_termios" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TERMIOS 1 +_ACEOF + + +fi + +ac_fn_c_check_type "$LINENO" "struct termio" "ac_cv_type_struct_termio" " +#ifdef HAVE_SYS_TERMIO_H +# include +#endif +#ifdef HAVE_TERMIO_H +# include +#endif + +" +if test "x$ac_cv_type_struct_termio" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_TERMIO 1 +_ACEOF + + +fi + + +# Checks for declarations. +ac_fn_c_check_decl "$LINENO" "timezone" "ac_cv_have_decl_timezone" " +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +" +if test "x$ac_cv_have_decl_timezone" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TIMEZONE $ac_have_decl +_ACEOF + + +# Checks for library functions. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if ${ac_cv_lib_error_at_line+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +error_at_line (0, 0, "", 0, "an error occurred"); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_error_at_line=yes +else + ac_cv_lib_error_at_line=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } +if test $ac_cv_lib_error_at_line = no; then + case " $LIBOBJS " in + *" error.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS error.$ac_objext" + ;; +esac + +fi + +for ac_header in vfork.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VFORK_H 1 +_ACEOF + +fi + +done + +for ac_func in fork vfork +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +if test "x$ac_cv_func_fork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +$as_echo_n "checking for working fork... " >&6; } +if ${ac_cv_func_fork_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_fork_works=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* By Ruediger Kuhlmann. */ + return fork () < 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_fork_works=yes +else + ac_cv_func_fork_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +$as_echo "$ac_cv_func_fork_works" >&6; } + +else + ac_cv_func_fork_works=$ac_cv_func_fork +fi +if test "x$ac_cv_func_fork_works" = xcross; then + case $host in + *-*-amigaos* | *-*-msdosdjgpp*) + # Override, as these systems have only a dummy fork() stub + ac_cv_func_fork_works=no + ;; + *) + ac_cv_func_fork_works=yes + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} +fi +ac_cv_func_vfork_works=$ac_cv_func_vfork +if test "x$ac_cv_func_vfork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +$as_echo_n "checking for working vfork... " >&6; } +if ${ac_cv_func_vfork_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_vfork_works=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Thanks to Paul Eggert for this test. */ +$ac_includes_default +#include +#ifdef HAVE_VFORK_H +# include +#endif +/* On some sparc systems, changes by the child to local and incoming + argument registers are propagated back to the parent. The compiler + is told about this with #include , but some compilers + (e.g. gcc -O) don't grok . Test for this by using a + static variable whose address is put into a register that is + clobbered by the vfork. */ +static void +#ifdef __cplusplus +sparc_address_test (int arg) +# else +sparc_address_test (arg) int arg; +#endif +{ + static pid_t child; + if (!child) { + child = vfork (); + if (child < 0) { + perror ("vfork"); + _exit(2); + } + if (!child) { + arg = getpid(); + write(-1, "", 0); + _exit (arg); + } + } +} + +int +main () +{ + pid_t parent = getpid (); + pid_t child; + + sparc_address_test (0); + + child = vfork (); + + if (child == 0) { + /* Here is another test for sparc vfork register problems. This + test uses lots of local variables, at least as many local + variables as main has allocated so far including compiler + temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris + 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should + reuse the register of parent for one of the local variables, + since it will think that parent can't possibly be used any more + in this routine. Assigning to the local variable will thus + munge parent in the parent process. */ + pid_t + p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), + p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); + /* Convince the compiler that p..p7 are live; otherwise, it might + use the same hardware register for all 8 local variables. */ + if (p != p1 || p != p2 || p != p3 || p != p4 + || p != p5 || p != p6 || p != p7) + _exit(1); + + /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent + from child file descriptors. If the child closes a descriptor + before it execs or exits, this munges the parent's descriptor + as well. Test for this by closing stdout in the child. */ + _exit(close(fileno(stdout)) != 0); + } else { + int status; + struct stat st; + + while (wait(&status) != child) + ; + return ( + /* Was there some problem with vforking? */ + child < 0 + + /* Did the child fail? (This shouldn't happen.) */ + || status + + /* Did the vfork/compiler bug occur? */ + || parent != getpid() + + /* Did the file descriptor bug occur? */ + || fstat(fileno(stdout), &st) != 0 + ); + } +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_vfork_works=yes +else + ac_cv_func_vfork_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +$as_echo "$ac_cv_func_vfork_works" >&6; } + +fi; +if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=$ac_cv_func_vfork + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} +fi + +if test "x$ac_cv_func_vfork_works" = xyes; then + +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h + +else + +$as_echo "#define vfork fork" >>confdefs.h + +fi +if test "x$ac_cv_func_fork_works" = xyes; then + +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5 +$as_echo_n "checking type of array argument to getgroups... " >&6; } +if ${ac_cv_type_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_type_getgroups=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Thanks to Mike Rendell for this test. */ +$ac_includes_default +#define NGID 256 +#undef MAX +#define MAX(x, y) ((x) > (y) ? (x) : (y)) + +int +main () +{ + gid_t gidset[NGID]; + int i, n; + union { gid_t gval; long int lval; } val; + + val.lval = -1; + for (i = 0; i < NGID; i++) + gidset[i] = val.gval; + n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, + gidset); + /* Exit non-zero if getgroups seems to require an array of ints. This + happens when gid_t is short int but getgroups modifies an array + of ints. */ + return n > 0 && gidset[n] != val.gval; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_getgroups=gid_t +else + ac_cv_type_getgroups=int +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if test $ac_cv_type_getgroups = cross; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then : + ac_cv_type_getgroups=gid_t +else + ac_cv_type_getgroups=int +fi +rm -f conftest* + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5 +$as_echo "$ac_cv_type_getgroups" >&6; } + +cat >>confdefs.h <<_ACEOF +#define GETGROUPS_T $ac_cv_type_getgroups +_ACEOF + + +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + +ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" +if test "x$ac_cv_func_getgroups" = xyes; then : + +fi + + +# If we don't yet have getgroups, see if it's in -lbsd. +# This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. +ac_save_LIBS=$LIBS +if test $ac_cv_func_getgroups = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 +$as_echo_n "checking for getgroups in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getgroups (); +int +main () +{ +return getgroups (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_getgroups=yes +else + ac_cv_lib_bsd_getgroups=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_getgroups" >&5 +$as_echo "$ac_cv_lib_bsd_getgroups" >&6; } +if test "x$ac_cv_lib_bsd_getgroups" = xyes; then : + GETGROUPS_LIB=-lbsd +fi + +fi + +# Run the program to test the functionality of the system-supplied +# getgroups function only if there is such a function. +if test $ac_cv_func_getgroups = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5 +$as_echo_n "checking for working getgroups... " >&6; } +if ${ac_cv_func_getgroups_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_getgroups_works=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + return getgroups (0, 0) == -1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_getgroups_works=yes +else + ac_cv_func_getgroups_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getgroups_works" >&5 +$as_echo "$ac_cv_func_getgroups_works" >&6; } +else + ac_cv_func_getgroups_works=no +fi +if test $ac_cv_func_getgroups_works = yes; then + +$as_echo "#define HAVE_GETGROUPS 1" >>confdefs.h + +fi +LIBS=$ac_save_LIBS + +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_malloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *malloc (); +#endif + +int +main () +{ +return ! malloc (0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_malloc_0_nonnull=yes +else + ac_cv_func_malloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" + ;; +esac + + +$as_echo "#define malloc rpl_malloc" >>confdefs.h + +fi + + + + + + for ac_header in $ac_header_list +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + + + + + for ac_func in $ac_func_list +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +$as_echo_n "checking for working mktime... " >&6; } +if ${ac_cv_func_working_mktime+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_working_mktime=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Test program from Paul Eggert and Tony Leneis. */ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +#include +#include + +#ifdef HAVE_UNISTD_H +# include +#endif + +#ifndef HAVE_ALARM +# define alarm(X) /* empty */ +#endif + +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv + +static time_t time_t_max; +static time_t time_t_min; + +/* Values we'll use to set the TZ environment variable. */ +static const char *tz_strings[] = { + (const char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static int +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); + + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + return mktime (&tm) != (time_t) -1; +} + +static int +mktime_test1 (time_t now) +{ + struct tm *lt; + return ! (lt = localtime (&now)) || mktime (lt) == now; +} + +static int +mktime_test (time_t now) +{ + return (mktime_test1 (now) + && mktime_test1 ((time_t) (time_t_max - now)) + && mktime_test1 ((time_t) (time_t_min + now))); +} + +static int +irix_6_4_bug () +{ + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + return tm.tm_mon == 2 && tm.tm_mday == 31; +} + +static int +bigtime_test (int j) +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + return 0; + } + return 1; +} + +static int +year_2050_test () +{ + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ + unsigned long int answer = 2527315200UL; + + struct tm tm; + time_t t; + tm.tm_year = 2050 - 1900; + tm.tm_mon = 2 - 1; + tm.tm_mday = 1; + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + tm.tm_isdst = -1; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); + + t = mktime (&tm); + + /* Check that the result is either a failure, or close enough + to the correct answer that we can assume the discrepancy is + due to leap seconds. */ + return (t == (time_t) -1 + || (0 < t && answer - 120 <= t && t <= answer + 120)); +} + +int +main () +{ + time_t t, delta; + int i, j; + + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + alarm (60); + + for (;;) + { + t = (time_t_max << 1) + 1; + if (t <= time_t_max) + break; + time_t_max = t; + } + time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv ((char*) tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) + if (! mktime_test (t)) + return 1; + if (! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) + return 1; + + for (j = 1; ; j <<= 1) + if (! bigtime_test (j)) + return 1; + else if (INT_MAX / 2 < j) + break; + if (! bigtime_test (INT_MAX)) + return 1; + } + return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_working_mktime=yes +else + ac_cv_func_working_mktime=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 +$as_echo "$ac_cv_func_working_mktime" >&6; } +if test $ac_cv_func_working_mktime = no; then + case " $LIBOBJS " in + *" mktime.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS mktime.$ac_objext" + ;; +esac + +fi + +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 +$as_echo_n "checking for GNU libc compatible realloc... " >&6; } +if ${ac_cv_func_realloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_realloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include +#else +char *realloc (); +#endif + +int +main () +{ +return ! realloc (0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_realloc_0_nonnull=yes +else + ac_cv_func_realloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } +if test $ac_cv_func_realloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" + ;; +esac + + +$as_echo "#define realloc rpl_realloc" >>confdefs.h + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 +$as_echo_n "checking for working strtod... " >&6; } +if ${ac_cv_func_strtod+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_strtod=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +$ac_includes_default +#ifndef strtod +double strtod (); +#endif +int +main() +{ + { + /* Some versions of Linux strtod mis-parse strings with leading '+'. */ + char *string = " +69"; + char *term; + double value; + value = strtod (string, &term); + if (value != 69 || term != (string + 4)) + return 1; + } + + { + /* Under Solaris 2.4, strtod returns the wrong value for the + terminating character under some conditions. */ + char *string = "NaN"; + char *term; + strtod (string, &term); + if (term != string && *(term - 1) == 0) + return 1; + } + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strtod=yes +else + ac_cv_func_strtod=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 +$as_echo "$ac_cv_func_strtod" >&6; } +if test $ac_cv_func_strtod = no; then + case " $LIBOBJS " in + *" strtod.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtod.$ac_objext" + ;; +esac + +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = xyes; then : + +fi + +if test $ac_cv_func_pow = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if ${ac_cv_lib_m_pow+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pow (); +int +main () +{ +return pow (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_pow=yes +else + ac_cv_lib_m_pow=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = xyes; then : + POW_LIB=-lm +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} +fi + +fi + +fi + +for ac_func in alarm floor ftruncate gettimeofday memmove memset putenv +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +for ac_func in socket sqrt strchr strdup strerror strrchr strstr strtol +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +for ac_func in nanosleep nsleep setitimer sigaction siginterrupt +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RFXLAN receiver support" >&5 +$as_echo_n "checking whether to enable RFXLAN receiver support... " >&6; } + # Check whether --enable-rfxlan was given. +if test "${enable_rfxlan+set}" = set; then : + enableval=$enable_rfxlan; +else + enable_rfxlan=yes +fi + + if test "x$enable_rfxlan" != "xno" && + test "x$ac_cv_header_netdb_h" != "xyes" \ + -o "x$ac_cv_func_memset" != "xyes" \ + -o "x$ac_cv_func_socket" != "xyes"; then : + enable_rfxlan=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rfxlan" >&5 +$as_echo "$enable_rfxlan" >&6; } + if test "x$enable_rfxlan" != "xno"; then : + +$as_echo "#define HAVE_FEATURE_RFXLAN 1" >>confdefs.h + +fi + +ac_config_files="$ac_config_files Makefile" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +if test -z "${POSTINST_TRUE}" && test -z "${POSTINST_FALSE}"; then + as_fn_error $? "conditional \"POSTINST\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -p' + fi +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by Heyu $as_me 2.10+autotools, which was +generated by GNU Autoconf 2.68. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to . +Heyu home page: ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +Heyu config.status 2.10+autotools +configured by $0, generated by GNU Autoconf 2.68, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2010 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + diff --git a/configure.ac b/configure.ac index 5b25271..752d66e 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,7 @@ AS_IF([test "x$CFLAGS" = "x"], [no_CFLAGS="yes"], []) AC_PROG_CC AS_IF([test "x$no_CFLAGS" = "xyes" && test "x$GCC" = "xyes"], [CFLAGS="$CFLAGS -Wall"], []) +AC_PROG_INSTALL AC_PROG_MAKE_SET # Checks for libraries. diff --git a/depcomp b/depcomp new file mode 100755 index 0000000..df8eea7 --- /dev/null +++ b/depcomp @@ -0,0 +1,630 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by `PROGRAMS ARGS'. + object Object file output by `PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputing dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz +## The second -e expression handles DOS-style file names with drive letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the `deleted header file' problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. + tr ' ' ' +' < "$tmpdepfile" | +## Some versions of gcc put a space before the `:'. On the theory +## that the space means something, we add a space to the output as +## well. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like `#:fec' to the end of the + # dependency line. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ + tr ' +' ' ' >> "$depfile" + echo >> "$depfile" + + # The second pass generates a dummy entry for each header file. + tr ' ' ' +' < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts `$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + # Each line is of the form `foo.o: dependent.h'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + # The sourcefile does not contain any dependencies, so just + # store a dummy comment line, to avoid errors with the Makefile + # "include basename.Plo" scheme. + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +icc) + # Intel's C compiler understands `-MD -MF file'. However on + # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # ICC 7.0 will fill foo.d with something like + # foo.o: sub/foo.c + # foo.o: sub/foo.h + # which is wrong. We want: + # sub/foo.o: sub/foo.c + # sub/foo.o: sub/foo.h + # sub/foo.c: + # sub/foo.h: + # ICC 7.1 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using \ : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | + sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + + if test "$libtool" = yes; then + # With Tru64 cc, shared objects can also be used to make a + # static library. This mechanism is used in libtool 1.4 series to + # handle both shared and static libraries in a single compilation. + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. + # + # With libtool 1.5 this exception was removed, and libtool now + # generates 2 separate objects for the 2 libraries. These two + # compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 + tmpdepfile2=$dir$base.o.d # libtool 1.5 + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.o.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + tmpdepfile4=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for `:' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + "$@" $dashmflag | + sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +' < "$tmpdepfile" | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no eat=no + for arg + do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + if test $eat = yes; then + eat=no + continue + fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + sed '1,2d' "$tmpdepfile" | tr ' ' ' +' | \ +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove `-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + IFS=" " + for arg + do + case "$arg" in + -o) + shift + ;; + $object) + shift + ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/install-sh b/install-sh new file mode 100755 index 0000000..6781b98 --- /dev/null +++ b/install-sh @@ -0,0 +1,520 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2009-04-28.21; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +no_target_directory= + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dst_arg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac + + eval "$initialize_posix_glob" + + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir + shift + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/missing b/missing new file mode 100755 index 0000000..28055d2 --- /dev/null +++ b/missing @@ -0,0 +1,376 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2009-04-28.21; # UTC + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). This is about non-GNU programs, so use $1 not +# $program. +case $1 in + lex*|yacc*) + # Not GNU programs, they don't have --version. + ;; + + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $program in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te*) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison*|yacc*) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex*|flex*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit $? + fi + ;; + + makeinfo*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: From d74a9ec85a7bce1369b05be73dc8ef865ae8abdf Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 22 Aug 2011 10:30:15 +0200 Subject: [PATCH 43/56] Drop no longer required call to autoreconf from Configure.sh After we have introduced all files required to configure and build Heyu with no Autoconf nor Automake packages installed, these is no longer any need for checking for their existence and calling autoreconf from Configure.sh. Drop it. BTW, the resulting Makefile can now take care of re-calling Autoconf or Automake tools in case of configure.ac or Makefile.am local changes. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/Configure.sh b/Configure.sh index 88a2c3f..2db28a2 100755 --- a/Configure.sh +++ b/Configure.sh @@ -94,34 +94,6 @@ EoF shift done -test -x config.guess && test -x config.sub && \ -test -x install-sh && test -x missing && test -x depcomp && \ -test -s aclocal.m4 && test aclocal.m4 -nt configure.ac && \ -test -s Makefile.in && test Makefile.in -nt configure.ac && \ - test Makefile.in -nt Makefile.am && \ -test -x configure && test configure -nt configure.ac && \ -test -s config.h.in && test config.h.in -nt configure.ac || { - type autoreconf >/dev/null && \ - type autoconf >/dev/null && type autoheader >/dev/null || { - echo "Please install autoconf package and re-run ./Configure.sh" - rm -f Makefile - exit - } - type aclocal >/dev/null && type automake >/dev/null || { - echo "Please install automake package and re-run ./Configure.sh" - rm -f Makefile - exit - } - if - test -x config.guess && test -x config.sub && \ - test -x install-sh && test -x missing && test -x depcomp - then - autoreconf --verbose - else - autoreconf --verbose --install --symlink - fi -} - cat < Date: Mon, 22 Aug 2011 10:33:07 +0200 Subject: [PATCH 44/56] Provide advanced installation instructions For those who no longer wish to use the Heyu traditional Configure.sh script, advanced information is provided on how to configure and install the package using standard Autoconf options passed to ./configure. Signed-off-by: Janusz Krzysztofik --- README | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/README b/README index cc5292e..120ad50 100644 --- a/README +++ b/README @@ -25,6 +25,9 @@ Quickstart: Ubuntu Linux users should execute 'sudo make install' rather than the three commands 'su', 'make install', and 'exit'. +Advanced users and package maintainers may also wish to refer to a +dedicated section at the bottom of this file. + *** Kindly report any compile errors or warnings to the author.*** It can take 5-8 seconds to set up the heyu_relay daemon and initialize @@ -200,4 +203,53 @@ Express Community Edition), may encounter an error when running change the first line of file install.sh to read "#!/bin/ksh". - +Notes for advanced users and (binary) package maintainers: +---------------------------------------------------------- + +From now on, you can use standard Autotools methods to build your +package instead of dealing with the old Configure.sh, Makefile.in and +install.sh. See INSTALL for generic instructions. + +Default runtime directories passed through ./configure to make: + +SYSBASEDIR SYSCONFDIR/heyu, or just SYSCONFDIR if already + containing 'heyu' in its path; for example, if you + specify --prefix=/opt/heyu, then SYSCONFDIR will be set + to /opt/heyu/etc, and SYSBASEDIR will end up as + SYSCONFDIR; override with CPPFLAGS='... + -DSYSBASEDIR=\"path\" ...' + +LOCKDIR LOCALSTATEDIR/lock; override with CPPFLAGS='... + -DLOCKDIR=\"path\" ...' + +SPOOLDIR LOCALSTATEDIR/tmp/heyu; override with CPPFLAGS='... + -DSPOOLDIR=\"path\" ...' + + +Default installation directories passed through ./configure to 'make +install': + +heyu binary BINDIR + +heyu.1 man page MANDIR/man1; override with 'man1dir=' (for + example, SCO used to install in /usr/local/man/man.1) + +*.5 man pages MANDIR/man5; override with 'man1dir=' (SCO case) + +README, etc. DOCDIR + +x10*.sample SYSBASEDIR + +To install individual components selectively instead of all at once, +use 'make install-exe', 'make install-man1', 'make install-man5' (or +'make install-man' for both man sets), 'make install-dist_docDATA' and +'make install-dist_pkgsysconfDATA' (or just 'make install-data' for +non-exe parts all together) respectively. + +Heyu custom post-install.sh (formerly install.sh) script is no longer +run by 'make install' unless instructed with --enable-postinst[=]. + +Other than that, you are free to select your own preferred or system +dependent values for CC, CPP, CFLAGS, CPPFLAGS, LDFLAGS and LIBS, as +well as your preferred --enable/--disable options and FLAGS / COUNTERS / +TIMERS values (see ./configure --help for details). From a016a2d795eae03979f39a0a23a8244cc27a28c7 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 5 Sep 2011 00:01:12 +0200 Subject: [PATCH 45/56] Use separate queues for RFXCOM receiver modules Without this feature, multiple bursts of two signals received with both modules simultaneously (on different carrier frequencies - 310MHz vs. 433.92 MHz) tend to be reported by the Heyu AUX relay more than once, regardless of the AUX_REPCOUNTS x10config directive and settings, which are intended to prevent from such unwanted signal repetitions. This feature had been implemented still by Charles, but the new code path was never activated due to problems with older RFXCOM firmware versions that exhibited themselves with this change and prevented it from being tested successfully. Since I've upgraded my RFXCOM modules recently, I've been finally able to verify that the new code works correctly, at least for me. For now, the feature can be activated with a new option to ./Configure, "--enable-rfxdual". If there are no bug reports against it, it will be enabled by default, and the old code path probably removed from future Heyu releases. Then, only the ./Configure help is updated, with INSTALL and README.INSTALL left unchanged. Signed-off-by: Janusz Krzysztofik --- Configure.sh | 4 ++++ config.h.in | 4 ++++ configure | 21 +++++++++++++++++++++ configure.ac | 10 ++++++++++ x10aux.c | 2 -- 5 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Configure.sh b/Configure.sh index 2db28a2..3c9bf14 100755 --- a/Configure.sh +++ b/Configure.sh @@ -38,6 +38,7 @@ while [ $# -ge 1 ] ; do echo " Switch -noore omits support for Oregon sensors." echo " Switch -nokaku omits support for KaKu/HomeEasy signals" echo " Switch -norfxlan omits support for RFXLAN receiver" + echo " Switch -rfxdual enables experimental split processing of RFXCOM master/slave" echo " Switch -flags=n sets the number of user flags (32 min, 1024 max)" echo " Switch -counters=n sets the number of counters (32 min, 1024 max)" echo " Switch -timers=n sets the number of timers (32 min, 1024 max)" @@ -69,6 +70,9 @@ while [ $# -ge 1 ] ; do norfxlan|-norfxlan|NORFXLAN|-NORFXLAN|--disable-rfxlan) OPTIONS="$OPTIONS --disable-rfxlan" ;; + rfxdual|-rfxdual|RFXDUAL|-RFXDUAL|--enable-rfxdual) + OPTIONS="$OPTIONS --enable-rfxdual" + ;; flags=*|-flags=*|FLAGS=*|-FLAGS=*) IFS="${IFS}=" read keyword FLAGS <>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable split processing of RFXCOM master/slave" >&5 +$as_echo_n "checking whether to enable split processing of RFXCOM master/slave... " >&6; } + # Check whether --enable-rfxdual was given. +if test "${enable_rfxdual+set}" = set; then : + enableval=$enable_rfxdual; +else + enable_rfxdual=no +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rfxdual" >&5 +$as_echo "$enable_rfxdual" >&6; } + if test "x$enable_rfxdual" == "xyes"; then : + +$as_echo "#define RFXCOM_DUAL 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for number of user flags" >&5 $as_echo_n "checking for number of user flags... " >&6; } diff --git a/configure.ac b/configure.ac index 752d66e..54ff019 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,16 @@ AC_MSG_CHECKING([whether to enable support for KaKu/HomeEasy signals]) AS_IF([test "x$enable_kaku" != "xno"], [AC_DEFINE([HAVE_FEATURE_KAKU], [1], [Define if you have KaKu/HomeEasy devices])], []) +AC_MSG_CHECKING([whether to enable split processing of RFXCOM master/slave]) + AC_ARG_ENABLE([rfxdual], [AS_HELP_STRING([--enable-rfxdual], + [enable independent processing of RF streams in RFXCOM dual (master/slave) receiver configurations (EXPERIMENTAL)] + )], [], [enable_rfxdual=no]) + AC_MSG_RESULT([$enable_rfxdual]) + AS_IF([test "x$enable_rfxdual" == "xyes"], [AC_DEFINE([RFXCOM_DUAL], + [1], + [Define if you have a dual RFXCOM receiver and want to try an experimetal feature of independent master/slave processing] + )], []) + AC_MSG_CHECKING([for number of user flags]) AC_ARG_VAR([FLAGS], [set number of user flags (1 < n < 1024) [32]]) AS_IF([test "x$FLAGS" = "x"], [FLAGS=32], diff --git a/x10aux.c b/x10aux.c index b0d7ecf..cb8c0ca 100644 --- a/x10aux.c +++ b/x10aux.c @@ -75,8 +75,6 @@ #define PID_T long #endif -//#define RFXCOM_DUAL - #define W800_LEN 4 #define PACKET_LEN 4 #define BSIZE (100 * PACKET_LEN) From ce2d6d104a09281a8ecf0052384de57753c19b75 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Mon, 29 Aug 2011 00:00:19 +0200 Subject: [PATCH 46/56] Enable detection of Oregon RTGR328N radio clock signals Very basic support, which would allow Heyu to recognise signals from Oregon RTGR328N sensors' integrated radio clocks, existed already in the code, but hadn't been activated. Mark the model as being supported and move its description out of unsupported sensors list. With this patch applied, both Heyu engine and monitor should report date/time signals as RFdata coming from ORE_DT1, and not RFnoise as before. Signed-off-by: Janusz Krzysztofik --- oregon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oregon.c b/oregon.c index 25881c7..600dd85 100644 --- a/oregon.c +++ b/oregon.c @@ -430,13 +430,13 @@ static struct oregon_st { {108, 11, 0xff, 0x00, 0x1a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x2a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x3a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, + {96, 12, 0xff, 0xff, 0x8a, 0xec, 2, CM2, BM2, 0, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {88, 11, 0xff, 0xff, 0xf0, 0xf0, 1, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_TEMU", OreTemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 2, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THEMU", OreTHemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 3, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THBEMU", OreTHBemu, csFail}, /* Dummy */ /* Unsupported Oregon sensors */ - {96, 12, 0xff, 0xff, 0x8a, 0xec, 2, CM2, BM2, 0, 0, 0, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {64, 8, 0x0f, 0x00, 0x03, 0x00, 2, CM0, BM0, 0, 0, 0, 0xf0, 2, "ORE_WGT2", OreWeight2, csNull}, /* OreGR101 */ }; From 9f30571f4c0029cdb4a0b4153662ac4fec4e361d Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 28 Aug 2011 13:36:07 +0200 Subject: [PATCH 47/56] Fix ID code handling of ORE_DT1 type sensors Both functions of the Oregon RTGR238N device, i.e. temperature/humidity sensor and radio clock, send independent signals, but share the same RF transmitter, resulting in both signal types carrying the same device ID code. This makes it not compatible with Heyu basic sensor model, which is expected to either send all device data in single transmissions, or use distinct ID codes for separate (sub)devices. Fortunately, support for sharing an Oregon transmitter ID code by more than one subdevice has already been implemented for the WTGR800 weather sensor. Alter the ORE_DT1 definition to also use this feature. With this patch applied, ORE_DT1 type signals should now be recognised as carrying the transmitter ID code incremented by 1. Signed-off-by: Janusz Krzysztofik --- oregon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oregon.c b/oregon.c index 600dd85..b9901d3 100644 --- a/oregon.c +++ b/oregon.c @@ -430,7 +430,7 @@ static struct oregon_st { {108, 11, 0xff, 0x00, 0x1a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x2a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x3a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, - {96, 12, 0xff, 0xff, 0x8a, 0xec, 2, CM2, BM2, 0, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, + {96, 12, 0xff, 0xff, 0x8a, 0xec, 2, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {88, 11, 0xff, 0xff, 0xf0, 0xf0, 1, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_TEMU", OreTemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 2, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THEMU", OreTHemu, csFail}, /* Dummy */ From 6584775b9d2b1c2b5287139fbfbd627376d3ee5c Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 22:43:17 +0100 Subject: [PATCH 48/56] Add support for decoding ORE_DT1 signals With this patch applied, users should be able to declare an ALIAS for the radio clock part of their RTGR328N sensors. Then, signals so far appearing as ORE_DT1 RFdata should be now reported as oreDT, with date and time values, as well as battery status, decoded from the signal contents. Decoding algorithm is based on information kindly provided by RFXCOM. The ORE_DT1 model has been implemented as providing only one function, date and time, not two, as the device description record found in oregon.c might suggest. The corresponding record field has been fixed. Common Oregon sensor handling code (battery status, etc.) has been copy-pasted from other Oregon sensors code. Model specific bits have been moved to separate functions for easier maintenance. Signed-off-by: Janusz Krzysztofik --- cmd.c | 4 +-- modules.c | 22 ++++++++++++- oregon.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++- process.h | 3 +- x10oregon.5 | 26 ++++++++++++++-- 5 files changed, 137 insertions(+), 7 deletions(-) diff --git a/cmd.c b/cmd.c index 9cf71b8..781fa41 100644 --- a/cmd.c +++ b/cmd.c @@ -744,7 +744,7 @@ int nx10cmds = sizeof(x10command)/sizeof(struct cmd_list); /* Function labels for monitor display (must align with enum in process.h) */ /* (with fake add-on function "AllOn") */ -char *funclabel[76] = { +char *funclabel[77] = { "AllOff", "LightsOn", "On", "Off", "Dim", "Bright", "LightsOff", "Extended", "Hail", "HailAck", "Preset", "Preset", "DataXfer", "StatusOn", "StatusOff", "StatusReq", "AllOn", @@ -758,7 +758,7 @@ char *funclabel[76] = { "oreWindSp", "oreWindAvSp", "oreWindDir", "oreRainRate", "oreRainTot", "elsCurr", "oreUV", "kOff", "kOn", "kGrpOff", "kGrpOn", "kUnkFunc", "kPreset", "kGrpPreset", "kUnkPresetFunc", - "owlPower", "owlEnergy", "Inactive", + "owlPower", "owlEnergy", "Inactive", "oreDT", "_Invalid_", }; diff --git a/modules.c b/modules.c index ca434c0..bd2aee2 100644 --- a/modules.c +++ b/modules.c @@ -217,7 +217,8 @@ opt_bmb_sd18(), opt_secignore(), opt_visonic(), opt_oreWind1(), opt_oreWind2(), opt_oreWind3(), opt_oreRain1(), opt_oreRain2(), opt_oreRain3(), -opt_oreUV1(), opt_oreUV2(), opt_kaku(), opt_owlElec2(), opt_owlElec2new(), opt_owlElec2rev(); +opt_oreUV1(), opt_oreUV2(), opt_kaku(), opt_owlElec2(), opt_owlElec2new(), opt_owlElec2rev(), +opt_oreDT1(); /* Decoder functions for modules */ int fn_ds10a(), fn_ds90(), fn_ms10a(), fn_sh624(), fn_kr10a(), fn_ur81a(), @@ -385,6 +386,7 @@ struct modules_st { {"ORE_TH3", MXLV, VORE, VIRTUAL, 0, opt_oreTH3, NULL}, {"RTGN318", MXLV, VORE, VIRTUAL, 0, opt_oreTH3, NULL}, {"RTGR328N", MXLV, VORE, VIRTUAL, 0, opt_oreTH3, NULL}, + {"RTGR328N_TH", MXLV, VORE, VIRTUAL, 0, opt_oreTH3, NULL}, {"ORE_TH4", MXLV, VORE, VIRTUAL, 0, opt_oreTH4, NULL}, {"ORE_TH5", MXLV, VORE, VIRTUAL, 0, opt_oreTH5, NULL}, {"ORE_TH6", MXLV, VORE, VIRTUAL, 0, opt_oreTH6, NULL}, @@ -403,6 +405,8 @@ struct modules_st { {"BTHR918N", MXLV, VORE, VIRTUAL, 0, opt_oreTHB2, NULL}, {"ORE_WGT1", MXLV, VORE, VIRTUAL, 0, opt_oreWeight1, NULL}, {"BWR102", MXLV, VORE, VIRTUAL, 0, opt_oreWeight1, NULL}, + {"ORE_DT1", MXLV, VORE, VIRTUAL, 0, opt_oreDT1, NULL}, + {"RTGR328N_DT", MXLV, VORE, VIRTUAL, 0, opt_oreDT1, NULL}, {"ORE_TEMU", MXLV, VORE, VIRTUAL, 0, opt_oreTemu, NULL}, /* Dummy */ {"ORE_THEMU", MXLV, VORE, VIRTUAL, 0, opt_oreTHemu, NULL}, /* Dummy */ {"ORE_THBEMU", MXLV, VORE, VIRTUAL, 0, opt_oreTHBemu, NULL}, /* Dummy */ @@ -1917,6 +1921,22 @@ int opt_oreTHB2 ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) return 0; } +/*---------------------------------------------------------------------+ + | Options for Oregon DT1 Date and Time Radio Clocks + +---------------------------------------------------------------------*/ +int opt_oreDT1 ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) +{ + if ( opt_oregon(aliasp, aliasindex, tokens, ntokens) != 0 ) + return 1; + + aliasp[aliasindex].subtype = OreDT1; + aliasp[aliasindex].nvar = 1; + aliasp[aliasindex].storage_units = 1; + aliasp[aliasindex].funclist[0] = OreDTFunc; + + return 0; +} + /*---------------------------------------------------------------------+ | Options for Oregon Wind1 sensors | +---------------------------------------------------------------------*/ diff --git a/oregon.c b/oregon.c index b9901d3..af532a0 100644 --- a/oregon.c +++ b/oregon.c @@ -430,7 +430,7 @@ static struct oregon_st { {108, 11, 0xff, 0x00, 0x1a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x2a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x3a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, - {96, 12, 0xff, 0xff, 0x8a, 0xec, 2, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, + {96, 12, 0xff, 0xff, 0x8a, 0xec, 1, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {88, 11, 0xff, 0xff, 0xf0, 0xf0, 1, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_TEMU", OreTemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 2, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THEMU", OreTHemu, csFail}, /* Dummy */ @@ -553,6 +553,54 @@ unsigned char oretype ( unsigned char *xbuf, unsigned char *subindx, unsigned ch } +#ifdef HAVE_FEATURE_ORE +static void tm_to_dtstring(struct tm *tm, char *buf, unsigned len) +{ + char *s = NULL; + int result; + + if (tm) + s = asctime(tm); + if (!s) + s = "----"; + + result = snprintf(buf, len, "DT %s", s); + if (result > 0) { + s = strchr(buf, '\n'); + if (s) + *s = '\0'; + } +} + +static void oredt1_to_tm(unsigned char *vdatap, struct tm *tm) +{ + tm->tm_sec = (vdatap[4] >> 4) + 10 * (vdatap[ 5] & 0xf); + tm->tm_min = (vdatap[5] >> 4) + 10 * (vdatap[ 6] & 0xf); + tm->tm_hour = (vdatap[6] >> 4) + 10 * (vdatap[ 7] & 0xf); + tm->tm_mday = (vdatap[7] >> 4) + 10 * (vdatap[ 8] & 0xf); + tm->tm_mon = (vdatap[8] >> 4) - 1; + tm->tm_wday = (vdatap[ 9] & 0x7); + tm->tm_year = (vdatap[9] >> 4) + 10 * (vdatap[10] & 0xf) + 100; +} + +static void translate_oredt(unsigned char *vdatap, unsigned char subtype, + char *buf, unsigned len) +{ + struct tm tm = { + .tm_isdst = -1, + }; + + switch(subtype) { + case OreDT1: + oredt1_to_tm(vdatap, &tm); + break; + } + + tm_to_dtstring(&tm, buf, len); +} +#endif + + /*----------------------------------------------------------------------------+ | Translate Oregon RF data | | Buffer reference: ST_COMMAND, ST_GENLONG, plus: | @@ -1284,6 +1332,45 @@ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *laun break; + case OreDT1 : + /* Process radio clock data */ + vflags_mask = SEC_LOBAT; + loc = aliasp[index].storage_index; + status = 0; + + longvdata = (unsigned long)(channel & 0x0fu) << ORE_CHANSHFT; + + status = ORE_VALID | batstatus; + longvdata |= status | ((unsigned long)blevel << ORE_BATSHFT); + + prevvalp = &x10global.data_storage[loc]; + + batchange = (batstatus ^ (unsigned char)(*prevvalp)) & ORE_LOBAT; + + func = aliasp[index].funclist[0]; + vflags |= (status & ORE_LOBAT) ? SEC_LOBAT : 0; + + create_flagslist (vtype, vflags, flagslist); + + translate_oredt(vdatap, subtype, minibuf, sizeof(minibuf)); + + sprintf(outbuf, "func %12s : hu %c%-2d %s%s%s %s%s(%s)", + funclabel[func], hc, unit, chstr, minibuf, rawstring, batstr, + flagslist, aliasp[index].label); + + x10global.longvdata = longvdata; + + x10global.data_storage[loc] = longvdata; + x10state[hcode].longdata = longvdata; + + if ( unchanged == 0 ) + changestate |= bitmap; + else + changestate &= ~bitmap; + + break; + + case OreTH1 : case OreTH2 : case OreTH3 : diff --git a/process.h b/process.h index e18d8a1..fad4eff 100644 --- a/process.h +++ b/process.h @@ -1029,7 +1029,8 @@ enum { OreRainRateFunc, OreRainTotFunc, ElsCurrFunc, OreUVFunc, KakuOffFunc, KakuOnFunc, KakuGrpOffFunc, KakuGrpOnFunc, KakuUnkFunc, KakuPreFunc, KakuGrpPreFunc, KakuUnkPreFunc, - OwlPowerFunc, OwlEnergyFunc, InactiveFunc, InvalidFunc + OwlPowerFunc, OwlEnergyFunc, InactiveFunc, OreDTFunc, + InvalidFunc }; #if 0 diff --git a/x10oregon.5 b/x10oregon.5 index 6acca5f..0303890 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -9,7 +9,8 @@ See man page \fIheyu\fP(1) for usage information. .PP .I Oregon sensors transmit encoded RF signals for Temperature, Relative -Humidity, Barometric Pressure, Wind speed, Rainfall, and other variables. +Humidity, Barometric Pressure, Date and Time, Wind speed, Rainfall, +and other variables. When equipped with a compatible RF receiver, Heyu can receive and decode this information. Also included in the same category are two miscellaneous sensors, the Electrisave CM113 and the OWL CM119, which @@ -187,6 +188,10 @@ Weight sensors .br ORE_WGT1 : BWR101 BWR102 .PP +Radio clocks +.br + ORE_DT1 : RTGR328N +.PP Wind sensors .br ORE_WIND1 : WTGR800 @@ -429,6 +434,20 @@ hectoPascals for BP) or in the scaled units defined by directives ORE_TSCALE and ORE_BPSCALE. This also applies to TMIN and TMAX setpoint temperatures when the entered temperature does not have a temperature scale suffix. +.SH RADIO CLOCKS +The only model supported so far is RTGR328N, ie. combined Temperature/ +Humidity and Radio clock device. The clock part transmits its own +signals, independent of Temerature/Humidity reports, hence it has been +implemented as a separate module type and should be configured with a +separate ALIAS directive, consuming one extra Hu address. Since both +subdevices share the same transmitter with the same ID, an artificial +ID, incremented by 1, is presented and used internally for the clock +part. +.PP +As one might expect, the date/time value, in a human readable form +(English, local timezone dependent), is reported to the Heyu engine log +or monitor output on every clock signal received. + .SH CURRENT SENSORS Heyu supports decoding of signals from the Electrisave CM113 and the newer OWL CM119 current sensors when received by an RFXCOM receiver @@ -973,7 +992,10 @@ expand this table.) BTHR968 THB2 38 .br BTHR918N THB2 38 - +.PP +Radio clocks: +.br + RTGR328N DT1 318 354 366 402 426 (samples, to be verified) .PP Rebranded Units: .br From 3893916dd6d13507fda0f5ed01d82793c73108df Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Tue, 29 Nov 2011 02:20:52 +0100 Subject: [PATCH 49/56] Fix ORE_DT1 double burst transmissions reported twice Date/time signals from Oregon RTGR328N radio clocks are transmitted as two consecutive bursts. Since the precision used is high, they differ by a small amount of time. If both are received, this results in both detected as carrying different data, and reported twice as two separate signals. Suppress reporting of the second one received in a row. Signed-off-by: Janusz Krzysztofik --- oregon.c | 2 +- x10aux.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oregon.c b/oregon.c index af532a0..f581c3c 100644 --- a/oregon.c +++ b/oregon.c @@ -430,7 +430,7 @@ static struct oregon_st { {108, 11, 0xff, 0x00, 0x1a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x2a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x3a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, - {96, 12, 0xff, 0xff, 0x8a, 0xec, 1, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, + {96, 11, 0xff, 0xff, 0x8a, 0xec, 1, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {88, 11, 0xff, 0xff, 0xf0, 0xf0, 1, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_TEMU", OreTemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 2, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THEMU", OreTHemu, csFail}, /* Dummy */ diff --git a/x10aux.c b/x10aux.c index cb8c0ca..371ddfb 100644 --- a/x10aux.c +++ b/x10aux.c @@ -1674,7 +1674,9 @@ int aux_rfxcomvl ( void ) send_virtual_aux_data(0, buff[0], *type, buff[1], 0, buff[2], buff[3]); } } - else if ((*bufflen == *lastlen || + else if (((*type == RF_OREGON && subtype == OreDT1 && + *lastlen >= *trulen - 1 && (*lastlen = *trulen - 1)) || + *bufflen == *lastlen || (*type == RF_STD && (*lastlen == 4 || (*lastlen = *bufflen) == 4)) ) && memcmp(buff, lastbuff, *lastlen) == 0 ) { /* Repeat of previous burst */ @@ -2128,7 +2130,9 @@ int aux_rfxcomvl ( void ) send_virtual_aux_data(0, buff[0], type, buff[1], 0, buff[2], buff[3]); } } - else if ((bufflen == lastlen || + else if (((type == RF_OREGON && subtype == OreDT1 && + lastlen >= trulen - 1 && (lastlen = trulen - 1)) || + bufflen == lastlen || (type == RF_STD && (lastlen == 4 || (lastlen = bufflen) == 4)) ) && memcmp(buff, lastbuff, lastlen) == 0) { /* Repeat of previous burst */ From f28f355355723be2f90b53db3ca7839fff20e380 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 21:17:50 +0100 Subject: [PATCH 50/56] Fix ORE_DT1 battery status mode From what Heyu monitor and engine report about ORE_DT1 signals, it looks like an initial guess about a battery status reporting mode of this module type was wrong. Try using the same battery mode as used by the ORE_TH3 module, which represents the RTGR32N Temperature/Humidity sensor part. Signed-off-by: Janusz Krzysztofik --- oregon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oregon.c b/oregon.c index f581c3c..ac67234 100644 --- a/oregon.c +++ b/oregon.c @@ -430,7 +430,7 @@ static struct oregon_st { {108, 11, 0xff, 0x00, 0x1a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x2a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, {108, 11, 0xff, 0x00, 0x3a, 0x00, 2, CM3, BM0, 0, 0, 1, 0xff, 3, "OWL_ELEC2", OreElec2, cs12 }, - {96, 11, 0xff, 0xff, 0x8a, 0xec, 1, CM2, BM2, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, + {96, 11, 0xff, 0xff, 0x8a, 0xec, 1, CM2, BM1, 1, 0, 1, 0xff, 4, "ORE_DT1", OreDT1, cs11 }, {88, 11, 0xff, 0xff, 0xf0, 0xf0, 1, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_TEMU", OreTemu, csFail}, /* Dummy */ {88, 11, 0xff, 0xff, 0xf0, 0xf0, 2, CM0, BM0, 0, 0, 2, 0xff, 4, "ORE_THEMU", OreTHemu, csFail}, /* Dummy */ From 4ec5d0984c029e08595d9ef32924f5688b433187 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 21:52:56 +0100 Subject: [PATCH 51/56] Pass date/time data from Oregon DT sensors to Heyu scripts Convert date/time data just received from a sensor to UNIX time format and pass it to Heyu script(s) with matching launch condition over a new X10_oreDT environment variable. As there is no oreDT signal specific function implemented yet to be used in launch conditions, a script supposed to examine the new environment variable must be launched with a 'HU anyfunc' launcher for now. The date/time data is not stored for future use, as it gets outdated immediately and seems useless except for when just received. Signed-off-by: Janusz Krzysztofik --- config.h.in | 6 ++++++ configure | 46 +++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +++ oregon.c | 19 ++++++++----------- oregon.h | 8 ++++++++ x10oregon.5 | 14 +++++++++++--- x10state.c | 4 ++++ 7 files changed, 85 insertions(+), 15 deletions(-) diff --git a/config.h.in b/config.h.in index 3b20e54..10bc874 100644 --- a/config.h.in +++ b/config.h.in @@ -275,6 +275,12 @@ /* Define to `int' if doesn't define. */ #undef gid_t +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc diff --git a/configure b/configure index b2a304b..616c699 100755 --- a/configure +++ b/configure @@ -4172,8 +4172,52 @@ $as_echo "no" >&6; } fi -# Checks for libraries. +# Checks for compiler characteristics + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac + +# Checks for libraries. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 $as_echo_n "checking for library containing sqrt... " >&6; } if ${ac_cv_search_sqrt+:} false; then : diff --git a/configure.ac b/configure.ac index 54ff019..32496ef 100644 --- a/configure.ac +++ b/configure.ac @@ -179,6 +179,9 @@ AS_IF([test "x$no_CFLAGS" = "xyes" && test "x$GCC" = "xyes"], AC_PROG_INSTALL AC_PROG_MAKE_SET +# Checks for compiler characteristics +AC_C_INLINE + # Checks for libraries. AC_SEARCH_LIBS([sqrt], [m]) AC_SEARCH_LIBS([nanosleep], [rt]) diff --git a/oregon.c b/oregon.c index ac67234..7d77d8b 100644 --- a/oregon.c +++ b/oregon.c @@ -584,11 +584,12 @@ static void oredt1_to_tm(unsigned char *vdatap, struct tm *tm) } static void translate_oredt(unsigned char *vdatap, unsigned char subtype, - char *buf, unsigned len) + unsigned long *data_storage, char *buf, unsigned len) { struct tm tm = { .tm_isdst = -1, }; + time_t *valp = (time_t *)(data_storage + 1); switch(subtype) { case OreDT1: @@ -596,6 +597,7 @@ static void translate_oredt(unsigned char *vdatap, unsigned char subtype, break; } + *valp = mktime(&tm); tm_to_dtstring(&tm, buf, len); } #endif @@ -1352,21 +1354,16 @@ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *laun create_flagslist (vtype, vflags, flagslist); - translate_oredt(vdatap, subtype, minibuf, sizeof(minibuf)); + x10global.longvdata = longvdata; + + translate_oredt(vdatap, subtype, &x10global.longvdata, + minibuf, sizeof(minibuf)); sprintf(outbuf, "func %12s : hu %c%-2d %s%s%s %s%s(%s)", funclabel[func], hc, unit, chstr, minibuf, rawstring, batstr, flagslist, aliasp[index].label); - x10global.longvdata = longvdata; - - x10global.data_storage[loc] = longvdata; - x10state[hcode].longdata = longvdata; - - if ( unchanged == 0 ) - changestate |= bitmap; - else - changestate &= ~bitmap; + x10state[hcode].longdata = x10global.longvdata; break; diff --git a/oregon.h b/oregon.h index 4612adb..a891083 100644 --- a/oregon.h +++ b/oregon.h @@ -32,6 +32,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include +#endif + /* Formats for Oregon data */ #define FMT_ORET "%.1f" /* Temperature */ #define FMT_OREBP "%.4g" /* Barometric Pressure */ @@ -81,3 +85,7 @@ char *translate_gen_longdata ( unsigned char *, unsigned char *, int * ); char *translate_ore_emu ( unsigned char *, unsigned char *, int * ); char *translate_oregon( unsigned char *, unsigned char *, int * ); int is_ore_ignored ( unsigned int ); +static inline long long c_oredt(unsigned long *data_storage) +{ + return *(time_t *)(data_storage + 1); +} diff --git a/x10oregon.5 b/x10oregon.5 index 0303890..b819032 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -361,12 +361,12 @@ For sensor models which transmit this information: .br X10_Hu_oreForecast x10__oreForecast .PP -If a Heyu script is launched by one of the functions "oretemp", -"orerh", "orebp", "orewgt", "orewindsp", "orewindavsp", "orewinddir", +If a Heyu script is launched by one of the signals "oretemp", "orerh", +"orebp", "orewgt", "oredt", "orewindsp", "orewindavsp", "orewinddir", "orerainrate", "oreraintot", "elscurr", "owlpower", or "owlenergy", the environment will additionally include variables for values and flags without the "Hu" identification, e.g., X10_oreTemp, -X10_oreWgt, X10_elsCurr. +X10_oreWgt, X10_oreDT, X10_elsCurr. .PP No variable is created for data which is invalid or "not ready". @@ -444,6 +444,14 @@ subdevices share the same transmitter with the same ID, an artificial ID, incremented by 1, is presented and used internally for the clock part. .PP +The last received time value in the UNIX time format, i.e. as a number +of seconds since 1970-01-01 00:00:00 +0000 (the UNIX Epoch), is made +available to Heyu scripts through X10_oreDT environment variable +('oredt' signal only). +This number can be further processed by user scripts, possibly with the +\'date -d @ +' command, which can be used to convert it +to other formats. +.PP As one might expect, the date/time value, in a human readable form (English, local timezone dependent), is reported to the Heyu engine log or monitor output on every clock signal received. diff --git a/x10state.c b/x10state.c index a224300..006fb4d 100644 --- a/x10state.c +++ b/x10state.c @@ -7485,6 +7485,10 @@ static struct { sprintf(minibuf, "X10_oreWgt="FMT_OREWGT, weight); *ep++ = add_envptr(minibuf); } + else if ( actfunc == OreDTFunc ) { + sprintf(minibuf, "X10_oreDT=%lld", c_oredt(&x10global.longvdata)); + *ep++ = add_envptr(minibuf); + } else if ( actfunc == ElsCurrFunc ) { longvdata = x10global.longvdata; deciamps = (int)((longvdata & ORE_DATAMSK) >> ORE_DATASHFT); From c9649115132464b6f603df65f548c9e945f84d14 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 21:56:37 +0100 Subject: [PATCH 52/56] Implement oredt function to be used in launch conditions To avoid launching scripts unintentionally on random X10 signals carrying the same Hu as an Oregon Date/Time sensor uses, provide a new function to be used in launch conditions in place of 'anyfunc' for exact matching of date/time signals. Signed-off-by: Janusz Krzysztofik --- process.h | 3 ++- x10scripts.5 | 6 +++--- x10state.c | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/process.h b/process.h index fad4eff..aa6914d 100644 --- a/process.h +++ b/process.h @@ -1001,7 +1001,8 @@ enum { OreTempTrig, OreHumidTrig, OreBaroTrig, OreWeightTrig, OreWindSpTrig, OreWindAvSpTrig, OreWindDirTrig, OreRainRateTrig, OreRainTotTrig, ElsCurrTrig, OreUVTrig, - OwlPowerTrig, OwlEnergyTrig, NumOreTriggers + OwlPowerTrig, OwlEnergyTrig, OreDTTrig, + NumOreTriggers }; /* KaKu trigger types */ diff --git a/x10scripts.5 b/x10scripts.5 index 8d391d5..350e3fe 100644 --- a/x10scripts.5 +++ b/x10scripts.5 @@ -415,10 +415,10 @@ rfxgas, rfxpulse, and rfxcount. The general functions .br For more details see man page x10rfxmeters(5). .PP -RF signals from Oregon sensors which can be used in launch conditions are: -oretemp, orerh, orebp, and orewgt. +RF signals from Oregon sensors which can be used in launch conditions are, +among others: oretemp, orerh, orebp, orewgt, oredt. .br -For more details see man page x10oregon(5). +For a complete list and more details see man page x10oregon(5). .PP RF signals from DigiMax 210 Thermostats which can be used in launch diff --git a/x10state.c b/x10state.c index 006fb4d..f090180 100644 --- a/x10state.c +++ b/x10state.c @@ -250,6 +250,7 @@ static struct trig_type_st ore_trig_type[] = { {"orerh", SpecOre, OreHumidTrig}, {"orebp", SpecOre, OreBaroTrig}, {"orewgt", SpecOre, OreWeightTrig}, + {"oredt", SpecOre, OreDTTrig}, {"elscurr", SpecOre, ElsCurrTrig}, {"orewindsp", SpecOre, OreWindSpTrig}, {"orewindavsp", SpecOre, OreWindAvSpTrig}, @@ -5163,6 +5164,7 @@ void show_launcher ( unsigned char hcode ) if ( ofuncmap & (1 << OreHumidTrig) ) printf("%s ", "orerh"); if ( ofuncmap & (1 << OreBaroTrig) ) printf("%s ", "orebp"); if ( ofuncmap & (1 << OreWeightTrig) ) printf("%s ", "orewgt"); + if ( ofuncmap & (1 << OreDTTrig) ) printf("%s ", "oredt"); if ( ofuncmap & (1 << OreWindSpTrig) ) printf("%s ", "orewindsp"); if ( ofuncmap & (1 << OreWindAvSpTrig) ) printf("%s ", "orewindavsp"); if ( ofuncmap & (1 << OreWindSpTrig) ) printf("%s ", "orewindsp"); From 4e7af48cefac26525b1e5a4be24d392c90730b02 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 22:02:49 +0100 Subject: [PATCH 53/56] Implement 'not changed' condition for oreDT signals The 'changed' launch flag is calculated based on stored dated/time value captured from the last signal considered 'changed', and an arbitrary precision, configured with an x10config directive. Signed-off-by: Janusz Krzysztofik --- config.c | 14 +++++++++++++- modules.c | 7 ++++++- oregon.c | 30 +++++++++++++++++++++++++----- process.h | 2 ++ x10oregon.5 | 6 ++++++ 5 files changed, 52 insertions(+), 7 deletions(-) diff --git a/config.c b/config.c index 133f3ff..0e76a66 100644 --- a/config.c +++ b/config.c @@ -123,7 +123,8 @@ enum { RfxPowerScale, RfxWaterScale, RfxGasScale, RfxPulseScale, RfxComEnable, RfxComDisable, LockupCheck, TailPath, RfxJam, DispDmxTemp, SecID16, SecIDPar, LogDateYr, DmxTscale, OreTscale, OreBPscale, OreWgtscale, OreLowBatt, DispOreAll, - OreChgBitsT, OreChgBitsRH, OreChgBitsBP, OreChgBitsWgt, OreDataEntry, OreDispChan, OreID16, + OreChgBitsT, OreChgBitsRH, OreChgBitsBP, OreChgBitsWgt, OreChgBitsDT, + OreDataEntry, OreDispChan, OreID16, OreDispFcast, LogDateUnix, InactiveTimeoutOre, DispSensorIntv, DateFormat, LockTimeout, CM11QueryDelay, ElsNumber, ElsVoltage, ElsChgBitsCurr, OreWindscale, OreWindSensorDir, OreRainRatescale, OreRainTotscale, OreDispBatLvl, OreWindDirMode, OreDispCount, @@ -288,6 +289,7 @@ static struct conf { {"ORE_CHGBITS_RH", 2, 2, 0, 0, 0, OreChgBitsRH}, {"ORE_CHGBITS_BP", 2, 2, 0, 0, 0, OreChgBitsBP}, {"ORE_CHGBITS_WGT", 2, 2, 0, 0, 0, OreChgBitsWgt}, + {"ORE_CHGBITS_DT", 2, 2, 0, 0, 0, OreChgBitsDT}, {"ORE_CHGBITS_WSP", 2, 2, 0, 0, CIGN, Ignored}, {"ORE_CHGBITS_WINDSP", 2, 2, 0, 0, 0, OreChgBitsWsp}, {"ORE_CHGBITS_WAVSP", 2, 2, 0, 0, CIGN, Ignored}, @@ -589,6 +591,7 @@ void initialize_config ( void ) configp->ore_chgbits_rh = DEF_ORE_CHGBITS_RH; configp->ore_chgbits_bp = DEF_ORE_CHGBITS_BP; configp->ore_chgbits_wgt = DEF_ORE_CHGBITS_WGT; + configp->ore_chgbits_dt = DEF_ORE_CHGBITS_DT; configp->ore_chgbits_wsp = DEF_ORE_CHGBITS_WSP; configp->ore_chgbits_wavsp = DEF_ORE_CHGBITS_WAVSP; configp->ore_chgbits_wdir = DEF_ORE_CHGBITS_WDIR; @@ -2917,6 +2920,15 @@ int parse_config_tail ( char *buffer, unsigned char source ) configp->ore_chgbits_wgt = (unsigned char)value; break; + case OreChgBitsDT : + longvalue = strtol(tokv[0], &sp, 10); + if ( !strchr(" \t\n\r", *sp) || longvalue < 1 || longvalue > 255 ) { + store_error_message("ORE_CHGBITS_DT must be 1 though 65535"); + errors++; + } + configp->ore_chgbits_dt = (unsigned int)longvalue; + break; + case OreChgBitsWsp : longvalue = strtol(tokv[0], &sp, 10); if ( !strchr(" \t\n\r", *sp) || longvalue < 1 || longvalue > 65535 ) { diff --git a/modules.c b/modules.c index bd2aee2..bedeae8 100644 --- a/modules.c +++ b/modules.c @@ -1926,12 +1926,17 @@ int opt_oreTHB2 ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) +---------------------------------------------------------------------*/ int opt_oreDT1 ( ALIAS *aliasp, int aliasindex, char **tokens, int *ntokens ) { + int units; + if ( opt_oregon(aliasp, aliasindex, tokens, ntokens) != 0 ) return 1; aliasp[aliasindex].subtype = OreDT1; aliasp[aliasindex].nvar = 1; - aliasp[aliasindex].storage_units = 1; + /* Need extra storage locations for current and last changed time_t data */ + units = sizeof(time_t) > sizeof(unsigned long) ? + sizeof(time_t) / sizeof(unsigned long) : 1; + aliasp[aliasindex].storage_units = 1 + 2 * units * aliasp[aliasindex].nvar; aliasp[aliasindex].funclist[0] = OreDTFunc; return 0; diff --git a/oregon.c b/oregon.c index 7d77d8b..5d1c912 100644 --- a/oregon.c +++ b/oregon.c @@ -583,13 +583,15 @@ static void oredt1_to_tm(unsigned char *vdatap, struct tm *tm) tm->tm_year = (vdatap[9] >> 4) + 10 * (vdatap[10] & 0xf) + 100; } -static void translate_oredt(unsigned char *vdatap, unsigned char subtype, +static int translate_oredt(unsigned char *vdatap, unsigned char subtype, unsigned long *data_storage, char *buf, unsigned len) { struct tm tm = { .tm_isdst = -1, }; - time_t *valp = (time_t *)(data_storage + 1); + time_t *valp = (time_t *)(data_storage + 1), *lastchvalp = valp + 1; + time_t delta; + int unchanged; switch(subtype) { case OreDT1: @@ -599,6 +601,14 @@ static void translate_oredt(unsigned char *vdatap, unsigned char subtype, *valp = mktime(&tm); tm_to_dtstring(&tm, buf, len); + + delta = abs(*valp - *lastchvalp); + unchanged = delta / 60 < configp->ore_chgbits_dt ? 1 : 0; + + if (!unchanged) + *lastchvalp = *valp; + + return unchanged; } #endif @@ -1350,20 +1360,30 @@ char *translate_oregon( unsigned char *buf, unsigned char *sunchanged, int *laun batchange = (batstatus ^ (unsigned char)(*prevvalp)) & ORE_LOBAT; func = aliasp[index].funclist[0]; + trig = OreDTTrig; vflags |= (status & ORE_LOBAT) ? SEC_LOBAT : 0; create_flagslist (vtype, vflags, flagslist); - x10global.longvdata = longvdata; + *prevvalp = longvdata; - translate_oredt(vdatap, subtype, &x10global.longvdata, + unchanged = translate_oredt(vdatap, subtype, prevvalp, minibuf, sizeof(minibuf)); sprintf(outbuf, "func %12s : hu %c%-2d %s%s%s %s%s(%s)", funclabel[func], hc, unit, chstr, minibuf, rawstring, batstr, flagslist, aliasp[index].label); - x10state[hcode].longdata = x10global.longvdata; + x10state[hcode].longdata = *prevvalp; + + x10global.longvdata = *prevvalp; + x10global.longvdata2 = *(++prevvalp); + x10global.longvdata3 = *(++prevvalp); + + if ( unchanged == 0 ) + changestate |= bitmap; + else + changestate &= ~bitmap; break; diff --git a/process.h b/process.h index aa6914d..c50e691 100644 --- a/process.h +++ b/process.h @@ -529,6 +529,7 @@ enum {ArmLogicStrict, ArmLogicMedium, ArmLogicLoose}; #define DEF_ORE_CHGBITS_RH 1 #define DEF_ORE_CHGBITS_BP 1 #define DEF_ORE_CHGBITS_WGT 1 +#define DEF_ORE_CHGBITS_DT 1 #define DEF_ORE_CHGBITS_WSP 1 #define DEF_ORE_CHGBITS_WAVSP 1 #define DEF_ORE_CHGBITS_WDIR 1 @@ -1369,6 +1370,7 @@ typedef struct { unsigned char ore_chgbits_rh; /* Change in least bits for humidity changed state */ unsigned char ore_chgbits_bp; /* Change in least bits for baro pressure changed state */ unsigned char ore_chgbits_wgt; /* Change in least bits for weight changed state */ + unsigned int ore_chgbits_dt; /* Change in least bits for date/time changed state */ unsigned int ore_chgbits_wsp; /* Change in least bits for wind speed changed state */ unsigned int ore_chgbits_wavsp; /* Change in least bits for wind avg speed changed state */ unsigned int ore_chgbits_wdir; /* Change in least bits for wind direction changed state */ diff --git a/x10oregon.5 b/x10oregon.5 index b819032..47f70f4 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -394,6 +394,8 @@ data in question, which correspond to: ORE_CHGBITS_BP Barometric Pressure 1hPa .br ORE_CHGBITS_WGT Weight 0.1kg +.br + ORE_CHGBITS_DT Date and time 1min .br ORE_CHGBITS_WINDSP Wind Speed 0.1meters/second .br @@ -455,6 +457,10 @@ to other formats. As one might expect, the date/time value, in a human readable form (English, local timezone dependent), is reported to the Heyu engine log or monitor output on every clock signal received. +.PP +Using the 'changed' launch flag, combined with a tuned ORE_CHGBITS_DT +value, a user can implement a single cron like (though not very +accurate) job, actually using a Heyu script, not a cron entry, for this. .SH CURRENT SENSORS Heyu supports decoding of signals from the Electrisave CM113 and the From c57db26b74359480e58f53efe38a16e12121ad23 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 22:06:51 +0100 Subject: [PATCH 54/56] Pass stored date/time values to Heyu scripts Useful or not, pass already stored date/time sensor data to Heyu scripts over environment variables named after usual Heyu conventions. Signed-off-by: Janusz Krzysztofik --- x10oregon.5 | 5 ++++- x10state.c | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/x10oregon.5 b/x10oregon.5 index 47f70f4..0b198c5 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -336,6 +336,8 @@ alias (note lower case x10_) mapped to each Oregon unit. X10_Hu_oreLoBat x10__oreLoBat (1 = Low, 0 = OK); .br X10_Hu_oreWgt x10__oreWgt +.br + X10_Hu_oreDT x10__oreDT .br X10_Hu_oreWindSp x10__oreWindSp .br @@ -449,7 +451,8 @@ part. The last received time value in the UNIX time format, i.e. as a number of seconds since 1970-01-01 00:00:00 +0000 (the UNIX Epoch), is made available to Heyu scripts through X10_oreDT environment variable -('oredt' signal only). +('oredt' signal only), as well as stored and then made available to any +script over X10_Hu_oreDT and x10__oreDT variables. This number can be further processed by user scripts, possibly with the \'date -d @ +' command, which can be used to convert it to other formats. diff --git a/x10state.c b/x10state.c index f090180..fbfa379 100644 --- a/x10state.c +++ b/x10state.c @@ -8202,6 +8202,15 @@ static struct { *ep++ = add_envptr(minibuf); break; + case OreDTFunc : + sprintf(minibuf, "X10_%c%d_oreDT=%lld", hc, unit, + c_oredt(&x10global.data_storage[loc])); + *ep++ = add_envptr(minibuf); + sprintf(minibuf, "%s_%s_oreDT=%lld", configp->env_alias_prefix, + aliaslabel, c_oredt(&x10global.data_storage[loc])); + *ep++ = add_envptr(minibuf); + break; + case ElsCurrFunc : if ( (channel = (int)((longvdata & ORE_CHANMSK) >> ORE_CHANSHFT)) > 0 ) { sprintf(minibuf, "X10_%c%d_elsCh=%d", hc, unit, channel); From 5fe373b2d2f99a0975b71a5d194df4b86573a794 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 22:09:54 +0100 Subject: [PATCH 55/56] Include stored date/time data in 'show oregon' output This is probably of minor usability, but once already stored, show this data as well. Signed-off-by: Janusz Krzysztofik --- oregon.c | 20 ++++++++++++++++++++ x10oregon.5 | 2 ++ 2 files changed, 22 insertions(+) diff --git a/oregon.c b/oregon.c index 5d1c912..e738f97 100644 --- a/oregon.c +++ b/oregon.c @@ -572,6 +572,22 @@ static void tm_to_dtstring(struct tm *tm, char *buf, unsigned len) } } +static char *show_oredt(unsigned long *data_storage) +{ + time_t time; + struct tm *tm = NULL; + static char buf[32]; + + if (*data_storage & ORE_VALID) { + time = c_oredt(data_storage); + tm = localtime(&time); + } + + tm_to_dtstring(tm, buf, sizeof(buf)); + + return buf; +} + static void oredt1_to_tm(unsigned char *vdatap, struct tm *tm) { tm->tm_sec = (vdatap[4] >> 4) + 10 * (vdatap[ 5] & 0xf); @@ -2702,6 +2718,10 @@ int show_oregon ( void ) break; + case OreDTFunc : + printf("%s ", show_oredt(&x10global.data_storage[loc])); + break; + case OwlPowerFunc : longvdata = x10global.data_storage[loc + statusoffset]; status = longvdata & 0xff; diff --git a/x10oregon.5 b/x10oregon.5 index 0b198c5..2b9ce68 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -460,6 +460,8 @@ to other formats. As one might expect, the date/time value, in a human readable form (English, local timezone dependent), is reported to the Heyu engine log or monitor output on every clock signal received. +The same format is used when reporting by means of 'heyu show oregon' +command. .PP Using the 'changed' launch flag, combined with a tuned ORE_CHGBITS_DT value, a user can implement a single cron like (though not very From 92aa0d67ad4abcf6aea3ceaa164fd1a55a18ddde Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 27 Nov 2011 22:13:21 +0100 Subject: [PATCH 56/56] Add new state function for examining stored date/time data For those who may wish to examine those values, in native UNIX date/time format, from an external application. Signed-off-by: Janusz Krzysztofik --- cmd.c | 1 + heyu.1 | 6 ++++-- oregon.c | 5 +++++ x10.c | 1 + x10oregon.5 | 4 ++++ 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cmd.c b/cmd.c index 781fa41..f3a395d 100644 --- a/cmd.c +++ b/cmd.c @@ -314,6 +314,7 @@ static char *helporegon[][3] = { {"oretemp","Hu","Oregon sensor Temperature"}, {"orerh","Hu","Oregon sensor Relative Humidity"}, {"orebp","Hu","Oregon sensor Barometric Pressure"}, + {"oredt","Hu","Oregon radio clock Date and Time"}, {"orewindavsp","Hu","Oregon sensor Wind Average Speed"}, {"orewindsp","Hu","Oregon sensor Wind Instantaneous Speed"}, {"orewinddir","Hu","Oregon sensor Wind Direction"}, diff --git a/heyu.1 b/heyu.1 index 6e3a7b8..42f9113 100644 --- a/heyu.1 +++ b/heyu.1 @@ -869,14 +869,16 @@ DigiMax 210 Thermostat. See man page x10digimax(5) for details. .PP The following state commands retrieve data received from Oregon -Temperature/Relative Humidity/Barometric Pressure sensors or from -Wind or Rain sensors. See man page x10oregon(5) for details. +Temperature/Relative Humidity/Barometric Pressure sensors, Wind or Rain +sensors, or Radio Clocks. See man page x10oregon(5) for details. .PP oretemp Hu Stored temperature reading. .br orerh Hu Stored Relative Humidity. .br orebp Hu Stored Barometric Pressure. +.br + oredt Hu Stored Date and Time. .br orewindavsp Hu Stored Wind Average Speed. .br diff --git a/oregon.c b/oregon.c index e738f97..aecac61 100644 --- a/oregon.c +++ b/oregon.c @@ -2798,6 +2798,7 @@ int c_orecmds ( int argc, char *argv[] ) {"orerh", OreHumidFunc }, {"orebp", OreBaroFunc }, {"orewgt", OreWeightFunc }, + {"oredt", OreDTFunc }, {"elscurr", ElsCurrFunc }, {"orewindsp", OreWindSpFunc }, {"orewindavsp", OreWindAvSpFunc }, @@ -2929,6 +2930,10 @@ int c_orecmds ( int argc, char *argv[] ) printf(FMT_ORERTOT"\n", (double)rain / 1000.0 * configp->ore_raintotscale); break; + case OreDTFunc : + printf("%llu\n", c_oredt(&x10global.data_storage[loc])); + break; + case OreUVFunc : uvfactor = (longvdata & ORE_DATAMSK) >> ORE_DATASHFT; printf("%d\n", uvfactor); diff --git a/x10.c b/x10.c index 4003366..769429f 100644 --- a/x10.c +++ b/x10.c @@ -272,6 +272,7 @@ struct cmdentry { {"orerh", c_orecmds, 1, 1}, {"orebp", c_orecmds, 1, 1}, {"orewgt", c_orecmds, 1, 1}, + {"oredt", c_orecmds, 1, 1}, {"elscurr", c_orecmds, 1, 1}, {"orewindsp", c_orecmds, 1, 1}, {"orewindavsp", c_orecmds, 1, 1}, diff --git a/x10oregon.5 b/x10oregon.5 index 2b9ce68..c4cd62e 100644 --- a/x10oregon.5 +++ b/x10oregon.5 @@ -96,6 +96,8 @@ Examples: heyu orerh Hu - Relative Humidity .br heyu orebp Hu - Barometric Pressure +.br + heyu oredt Hu - Date and Time .PP The command \'heyu show oregon\' will display stored data @@ -463,6 +465,8 @@ or monitor output on every clock signal received. The same format is used when reporting by means of 'heyu show oregon' command. .PP +A more interesting option than examinig the last received time value +could be launching scripts on time reports received. Using the 'changed' launch flag, combined with a tuned ORE_CHGBITS_DT value, a user can implement a single cron like (though not very accurate) job, actually using a Heyu script, not a cron entry, for this.