From 40f62209133dade73192a35722b9a785dec863a8 Mon Sep 17 00:00:00 2001 From: Michael 'Ghandi' Herold Date: Thu, 18 Jun 1998 12:38:29 +0000 Subject: [PATCH] - 2nd part of the automake/autoconf implementation (now compiles again). --- vbox3/AUTHORS | 4 + vbox3/COPYING | 339 +++++++++++++++++++ vbox3/INSTALL | 16 + vbox3/acinclude.m4 | 118 +++++++ vbox3/config.h.in | 42 +++ vbox3/configure.in | 73 +++- vbox3/install-sh | 24 +- vbox3/missing | 18 +- vbox3/mkinstalldirs | 18 +- vbox3/vboxgetty/Makefile.am | 45 ++- vbox3/vboxgetty/examples/Makefile.am | 14 +- vbox3/vboxgetty/examples/scripts/Makefile.am | 2 +- vbox3/vboxgetty/tclscript.c | 6 +- vbox3/vboxgetty/vboxgetty.c | 28 +- 14 files changed, 693 insertions(+), 54 deletions(-) create mode 100644 vbox3/acinclude.m4 diff --git a/vbox3/AUTHORS b/vbox3/AUTHORS index e69de29b..1ae2f25e 100644 --- a/vbox3/AUTHORS +++ b/vbox3/AUTHORS @@ -0,0 +1,4 @@ + +Look in the subdirs to get infos about the authors. + +The package is maintained by Michael Herold diff --git a/vbox3/COPYING b/vbox3/COPYING index e69de29b..a43ea212 100644 --- a/vbox3/COPYING +++ b/vbox3/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + 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 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., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/vbox3/INSTALL b/vbox3/INSTALL index e69de29b..5e0185a9 100644 --- a/vbox3/INSTALL +++ b/vbox3/INSTALL @@ -0,0 +1,16 @@ + + + + --prefix=PREFIX install architecture-independent files in PREFIX + [/usr/local] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + + + + --without-regex use GNU rx in lieu of gawk's regex for matching diff --git a/vbox3/acinclude.m4 b/vbox3/acinclude.m4 new file mode 100644 index 00000000..191fa80d --- /dev/null +++ b/vbox3/acinclude.m4 @@ -0,0 +1,118 @@ +dnl #------------------------------------------------------------------------# +dnl # Test if all needed libraries for vboxgetty are installed. We will end # +dnl # the configure script if one is missing! # +dnl #------------------------------------------------------------------------# + +AC_DEFUN(VBOX_PACKAGE_TCL, + [ + HAVE_TCL_LIBS="n" + HAVE_TCL_INCL="n" + HAVE_TCL_PACK="n" + LINK_TCL_LIBS="" + LINK_TCL_INCL="" + + gnd_use_tcl_lib="" + gnd_use_tcl_dir="" + + AC_ARG_WITH(tcllib, + [ --with-tcllib=LIB use tcl library LIB to link [tcl]], + gnd_use_tcl_lib="${withval}", + gnd_use_tcl_lib="`eval echo ${VBOX_TCL:-""}`" + ) + + AC_ARG_WITH(tcldir, + [ --with-tcldir=DIR tcl base directory []], + gnd_use_tcl_dir="${withval}" + ) + + gnd_tcl_inc_dir="" + gnd_tcl_lib_dir="" + + if (test "${gnd_use_tcl_dir}" != "") + then + gnd_tcl_inc_dir="-I${gnd_use_tcl_dir}/include" + gnd_tcl_lib_dir="-L${gnd_use_tcl_dir}/lib" + fi + + if (test "${gnd_use_tcl_lib}" = "") + then + gnd_1st_tcl_lib_test="tcl8.1" + gnd_2nd_tcl_lib_test="tcl8.0" + gnd_3rd_tcl_lib_test="tcl" + else + gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}" + gnd_2nd_tcl_lib_test="tcl8.0" + gnd_3rd_tcl_lib_test="tcl" + fi + + AC_CHECK_LIB(m, + cos, + AC_CHECK_LIB(dl, + dlerror, + AC_CHECK_LIB(${gnd_1st_tcl_lib_test}, + Tcl_CreateInterp, + LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl", + AC_CHECK_LIB(${gnd_2nd_tcl_lib_test}, + Tcl_CreateInterp, + LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl", + AC_CHECK_LIB(${gnd_3rd_tcl_lib_test}, + Tcl_CreateInterp, + LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl", + , + ${gnd_tcl_lib_dir} -lm -ldl + ), + ${gnd_tcl_lib_dir} -lm -ldl + ), + ${gnd_tcl_lib_dir} -lm -ldl + ), + ), + ) + + if (test "${LINK_TCL_LIBS}" != "") + then + HAVE_TCL_LIBS="y" + fi + + dnl #-------------------------------------------# + dnl # Check if the compiler find the tcl header # + dnl #-------------------------------------------# + + AC_CHECK_HEADER(tcl.h, HAVE_TCL_INCL="y") + + if (test "${HAVE_TCL_INCL}" = "n") + then + if (test "${gnd_use_tcl_dir}" != "") + then + AC_MSG_CHECKING("for tcl header in ${gnd_use_tcl_dir}/include") + + if (test -e "${gnd_use_tcl_dir}/include/tcl.h") + then + AC_MSG_RESULT("yes") + + HAVE_TCL_INCL="y" + LINK_TCL_INCL="${gnd_tcl_inc_dir}" + else + AC_MSG_RESULT("no") + fi + fi + fi + + if (test "${HAVE_TCL_LIBS}" = "y") + then + if (test "${HAVE_TCL_INCL}" = "y") + then + HAVE_TCL_PACK="y" + fi + fi + + if (test "${HAVE_TCL_PACK}" = "n") + then + AC_MSG_WARN("**") + AC_MSG_WARN("** vboxgetty will not compile without TCL installed!") + AC_MSG_WARN("**") + fi + + AC_SUBST(LINK_TCL_LIBS) + AC_SUBST(LINK_TCL_INCL) + ] +) diff --git a/vbox3/config.h.in b/vbox3/config.h.in index e69de29b..59eff9df 100644 --- a/vbox3/config.h.in +++ b/vbox3/config.h.in @@ -0,0 +1,42 @@ + +#ifndef _VBOX_CONFIG_H +#define _VBOX_CONFIG_H 1 + +/* + * Define if you have the ANSI C header files: + */ + +#undef STDC_HEADERS + +/* + * Define if you can safely include both and : + */ + +#undef TIME_WITH_SYS_TIME + +/* + * Define if you have the header file: + */ + +#undef HAVE_SYS_TIME_H + +/* + * Define if libncurses has a resizeterm() function: + */ + +#undef HAVE_RESIZETERM + +/* + * Define if you have a siginterrupt() function: + */ + +#undef HAVE_SIGINTERRUPT + +/* + * No need to change anything below this line! + */ + +#undef VERSION +#undef PACKAGE + +#endif /* _VBOX_CONFIG_H */ diff --git a/vbox3/configure.in b/vbox3/configure.in index 47c0b462..cc26ea8f 100644 --- a/vbox3/configure.in +++ b/vbox3/configure.in @@ -1,15 +1,76 @@ AC_INIT(vboxgetty/vboxgetty.c) AM_INIT_AUTOMAKE(vbox, 2.1.1) - -AC_PROG_CC - AM_CONFIG_HEADER(config.h) - -AM_WITH_REGEX +AC_PROG_CC AC_PROG_RANLIB AM_PROG_INSTALL +AC_HEADER_STDC +AC_HEADER_TIME +AC_CHECK_HEADERS(sys/time.h) -AC_OUTPUT(Makefile vboxgetty/Makefile) +AC_CHECK_LIB(c, siginterrupt, AC_DEFINE(HAVE_SIGINTERRUPT)) + +##AM_WITH_REGEX + + +dnl #------------------------------------------------------------------------# +dnl # Checks for needed external packages: # +dnl #------------------------------------------------------------------------# + +VBOX_PACKAGE_TCL + + + + + + + + +dnl #---------------------------------------------------------------------# +dnl # The place where log's should be stored # +dnl #---------------------------------------------------------------------# + +packagelogdir="`eval echo ${packagelogdir:-"/var/log"}`" + +AC_ARG_WITH(packagelogdir, + [ --with-logdir=DIR where logs should be stored [/var/log]], + packagelogdir=${withval} +) + +AC_SUBST(packagelogdir) + +dnl #---------------------------------------------------------------------# +dnl # The place where lock's should be stored # +dnl #---------------------------------------------------------------------# + +packagelockdir="`eval echo ${packagelockdir:-"/var/lock"}`" + +AC_ARG_WITH(packagelockdir, + [ --with-lockdir=DIR where locks should be stored [/var/lock]], + packagelockdir=${withval} +) + +AC_SUBST(packagelockdir) + +dnl #---------------------------------------------------------------------# +dnl # The place where pid's should be stored # +dnl #---------------------------------------------------------------------# + +packagepiddir="`eval echo ${packagepiddir:-"/var/run"}`" + +AC_ARG_WITH(packagepiddir, + [ --with-piddir=DIR where PID's should be stored [/var/run]], + packagepiddir=${withval} +) + +AC_SUBST(packagepiddir) + + + + + + +AC_OUTPUT(Makefile vboxgetty/Makefile vboxgetty/examples/Makefile vboxgetty/examples/scripts/Makefile) diff --git a/vbox3/install-sh b/vbox3/install-sh index 67c94290..e8436696 100755 --- a/vbox3/install-sh +++ b/vbox3/install-sh @@ -1,15 +1,27 @@ -#! /bin/sh +#!/bin/sh # # install - install a program, script, or datafile -# This comes from X11R5. +# This comes from X11R5 (mit/util/scripts/install.sh). +# +# Copyright 1991 by the Massachusetts Institute of Technology +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of M.I.T. not be used in advertising or +# publicity pertaining to distribution of the software without specific, +# written prior permission. M.I.T. makes no representations about the +# suitability of this software for any purpose. It is provided "as is" +# without express or implied warranty. # # 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. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. # set DOITPROG to echo to test this script @@ -115,7 +127,7 @@ else # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. - if [ -f "$src" -o -d "$src" ] + if [ -f $src -o -d $src ] then true else @@ -212,7 +224,7 @@ else # Move or copy the file name to the temp name - $doit $instcmd "$src" $dsttmp && + $doit $instcmd $src $dsttmp && trap "rm -f ${dsttmp}" 0 && diff --git a/vbox3/missing b/vbox3/missing index e4b838ca..a6abd069 100755 --- a/vbox3/missing +++ b/vbox3/missing @@ -58,7 +58,7 @@ Supported PROGRAM values: aclocal) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if +WARNING: \`$1' is missing on your system. You should only need it if you modified \`acinclude.m4' or \`configure.in'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -67,7 +67,7 @@ WARNING: \`$1' is missing on your system. It should be needed only if autoconf) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if +WARNING: \`$1' is missing on your system. You should only need it if you modified \`configure.in'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -76,7 +76,7 @@ WARNING: \`$1' is missing on your system. It should be needed only if autoheader) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if +WARNING: \`$1' is missing on your system. You should only need it if you modified \`acconfig.h' or \`configure.in'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." @@ -85,7 +85,7 @@ WARNING: \`$1' is missing on your system. It should be needed only if automake) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if +WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." @@ -96,16 +96,16 @@ WARNING: \`$1' is missing on your system. It should be needed only if bison|yacc) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if - your modified any \`.y' file. For being effective, your - modifications might require the \`Bison' package. Grab it from - any GNU archive site." +WARNING: \`$1' is missing on your system. 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." touch y.tab.c ;; makeinfo) echo 1>&2 "\ -WARNING: \`$1' is missing on your system. It should be needed only if +WARNING: \`$1' is missing on your system. 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, diff --git a/vbox3/mkinstalldirs b/vbox3/mkinstalldirs index cc8783ed..d0fd194f 100755 --- a/vbox3/mkinstalldirs +++ b/vbox3/mkinstalldirs @@ -2,17 +2,20 @@ # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman # Created: 1993-05-16 -# Last modified: 1994-03-25 # Public domain +# $Id$ + errstatus=0 -for file in ${1+"$@"} ; do +for file +do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift pathcomp= - for d in ${1+"$@"} ; do + for d + do pathcomp="$pathcomp$d" case "$pathcomp" in -* ) pathcomp=./$pathcomp ;; @@ -20,11 +23,12 @@ for file in ${1+"$@"} ; do if test ! -d "$pathcomp"; then echo "mkdir $pathcomp" 1>&2 - mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$? - fi - if test ! -d "$pathcomp"; then - errstatus=$lasterr + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + fi fi pathcomp="$pathcomp/" diff --git a/vbox3/vboxgetty/Makefile.am b/vbox3/vboxgetty/Makefile.am index 058dca74..4767b317 100644 --- a/vbox3/vboxgetty/Makefile.am +++ b/vbox3/vboxgetty/Makefile.am @@ -1,27 +1,46 @@ +## +## vboxgetty/Makefile.am - (C) 1997-1998 Michael Herold +## -CLEANFILES = *~ -MAINTAINERCLEANFILES = Makefile.in +## system admin executables to install #################################### +sbin_PROGRAMS = vboxgetty +########################################################################### +packagelogdir = @packagelogdir@ +packagelockdir = @packagelockdir@ +packagepiddir = @packagepiddir@ -INCLUDES = $(all_includes) +tclpackagelibs = @LINK_TCL_LIBS@ +tclpackageinclude = @LINK_TCL_INCL@ + +DEFS += -DSYSCONFDIR='"$(sysconfdir)"' -DDATADIR='"$(datadir)"' -DLOGDIR='"$(packagelogdir)"' -DLOCKDIR='"$(packagelockdir)"' -DPIDDIR='"$(packagepiddir)"' +INCLUDES = $(all_includes) $(tclpackageinclude) + +## vbox low level modem library ########################################### noinst_LIBRARIES = libvboxmodem.a libvboxmodem_a_SOURCES = libvboxmodem.c libvboxmodem.h +## vboxgetty ############################################################## +vboxgetty_LDADD = $(tclpackagelibs) -L. -lvboxmodem +vboxgetty_SOURCES = log.c log.h \ + modem.c modem.h \ + rc.c rc.h \ + stringutils.c stringutils.h \ + tclscript.c tclscript.h \ + vboxgetty.c vboxgetty.h \ + voice.c voice.h +## other directories to process ########################################### -##vboxgetty_LDFLAGS = $(all_libraries) -##vboxgetty_LDADD = -L. -lvboxmodem -## -##vboxgetty_SOURCE = log.c log.h \ -## modem.c modem.h \ -## rc.c rc.h \ -## stringutils.c stringutils.h \ -## tclscript.c tclscript.h \ -## vboxgetty.c vboxgetty.h \ -## voice.c voice.h +SUBDIRS = examples + +## cleanup ################################################################ + +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in diff --git a/vbox3/vboxgetty/examples/Makefile.am b/vbox3/vboxgetty/examples/Makefile.am index eb15d6e3..f0f33582 100644 --- a/vbox3/vboxgetty/examples/Makefile.am +++ b/vbox3/vboxgetty/examples/Makefile.am @@ -1,2 +1,12 @@ -## vboxgetty/examples/Makefile.am -## Copyright 1998 Michael Herold +## +## vboxgetty/examples/Makefile.am - (C) 1997-1998 Michael Herold +## + +SUBDIRS = scripts + +CLEANFILES = *~ +MAINTAINERCLEANFILES = Makefile.in + +## Configuration files to install + +sysconf_DATA = vboxgetty.conf vboxgetty.user diff --git a/vbox3/vboxgetty/examples/scripts/Makefile.am b/vbox3/vboxgetty/examples/scripts/Makefile.am index 3b58800a..c9f150c5 100644 --- a/vbox3/vboxgetty/examples/scripts/Makefile.am +++ b/vbox3/vboxgetty/examples/scripts/Makefile.am @@ -7,4 +7,4 @@ MAINTAINERCLEANFILES = Makefile.in ## The tcl scripts to install -pkglib_DATA = initmodem.tcl +pkgdata_DATA = initmodem.tcl diff --git a/vbox3/vboxgetty/tclscript.c b/vbox3/vboxgetty/tclscript.c index 957770e1..4346ffa7 100644 --- a/vbox3/vboxgetty/tclscript.c +++ b/vbox3/vboxgetty/tclscript.c @@ -4,6 +4,10 @@ ** Copyright 1997-1998 by Michael Herold ** ** $Log$ +** Revision 1.2 1998/06/17 17:01:24 michael +** - First part of the automake/autoconf implementation. Currently vbox will +** *not* compile! +** */ #include @@ -97,7 +101,7 @@ int scr_execute(char *name, char *user) if (!canrun) { - printstring(temppathname, "%s/vboxgetty/%s", VBOX_LIBDIR, name); + printstring(temppathname, "%s/%s/%s", DATADIR, PACKAGE, name); if (access(temppathname, F_OK|R_OK) == 0) canrun = 1; } diff --git a/vbox3/vboxgetty/vboxgetty.c b/vbox3/vboxgetty/vboxgetty.c index 4da64bbe..e2464330 100644 --- a/vbox3/vboxgetty/vboxgetty.c +++ b/vbox3/vboxgetty/vboxgetty.c @@ -4,6 +4,10 @@ ** Copyright 1997-1998 by Michael Herold ** ** $Log$ +** Revision 1.2 1998/06/17 17:01:24 michael +** - First part of the automake/autoconf implementation. Currently vbox will +** *not* compile! +** */ #include @@ -14,7 +18,8 @@ #include #include -#include "config.h" +#include "../config.h" + #include "log.h" #include "tcl.h" #include "modem.h" @@ -62,7 +67,7 @@ static int parse_getty_rc(unsigned char *); static void show_usage(int, int); static int process_incoming_call(void); static int run_modem_init(void); -static int parse_user_rc(struct vboxincomingcall *); +static int parse_user_rc(struct vboxuser *); /*************************************************************************/ @@ -185,7 +190,7 @@ void main(int argc, char **argv) /* Now its time to open the log. The name of the current tty will */ /* be appended to the name. */ - printstring(temppathname, "%s/vboxgetty-%s.log", VBOX_LOGDIR, isdnttyname); + printstring(temppathname, "%s/vboxgetty-%s.log", LOGDIR, isdnttyname); log_open(temppathname); @@ -466,14 +471,14 @@ static int process_incoming_call(void) { if ((strncmp(line, "CALLER NUMBER: ", 15) == 0) && (!havesetup)) { - xstrncpy(vboxuser.incomingid, &line[15], VBOX_CALL_ID); - xstrncpy(vboxuser.localphone, "9317840513", VBOX_CALL_NUMBER); + xstrncpy(vboxuser.incomingid, &line[15] , VBOXUSER_CALLID); + xstrncpy(vboxuser.localphone, "9317840513", VBOXUSER_NUMBER); if (parse_user_rc(&vboxuser) == 0) { if ((vboxuser.uid == 0) || (vboxuser.gid == 0)) { - log_line(LOG_W, "No user for ID %s found - call will be ignored!\n", vboxcall.callerid); + log_line(LOG_W, "No user for ID %s found - call will be ignored!\n", vboxuser.incomingid); @@ -495,7 +500,7 @@ static int process_incoming_call(void) haverings++; if (havesetup) - log_line(LOG_A, "RING #%03d (%s)...\n", haverings, incomingid); + log_line(LOG_A, "RING #%03d (%s)...\n", haverings, vboxuser.incomingid); else log_line(LOG_A, "RING #%03d...\n", haverings); } @@ -519,17 +524,22 @@ static int parse_user_rc(struct vboxuser *vboxuser) char line[VBOX_RCLINE_SIZE + 1]; FILE *rc; char *stop; + char *pattern; + char *group; + char *name; + char *space; + char *mask; int linenr; log_line(LOG_D, "Searching local user for ID %s...\n", vboxuser->incomingid); vboxuser->uid = 0; vboxuser->gid = 0; - vboxuser->home[0] = 0 + vboxuser->home[0] = 0; vboxuser->umask = -1; vboxuser->space = -1; - printstring(temppathname, "%s/vboxgetty.user", VBOX_ETCDIR); + printstring(temppathname, "%s/vboxgetty.user", SYSCONFDIR); if ((rc = fopen(temppathname, "r"))) {