From 478d7ec1929c99450cfbfa05e02330658a8668bc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 4 Sep 2003 22:06:56 +0000 Subject: autoconf git-svn-id: file:///home/lennart/svn/public/syrep/trunk@30 07ea20a6-d2c5-0310-9e02-9ef735347d72 --- LICENSE | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 38 ++++++ bootstrap.sh | 39 ++++++ configure.ac | 162 +++++++++++++++++++++++++ doc/Makefile.am | 19 +++ doc/README | 1 + doc/todo.txt | 2 +- doc/usage-intro.txt | 10 +- src/Makefile | 17 --- src/Makefile.am | 84 +++++++++++++ src/cache.h | 2 +- src/context.h | 2 +- src/dbstruct.h | 2 +- src/extract.c | 2 +- src/package.c | 2 +- src/package.h | 2 +- src/syrep.c | 11 +- src/util.c | 6 +- src/util.h | 2 +- 19 files changed, 709 insertions(+), 34 deletions(-) create mode 100644 LICENSE create mode 100644 Makefile.am create mode 100755 bootstrap.sh create mode 100644 configure.ac create mode 100644 doc/Makefile.am create mode 100644 doc/README delete mode 100644 src/Makefile create mode 100644 src/Makefile.am diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 + + 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) + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) year 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/Makefile.am b/Makefile.am new file mode 100644 index 0000000..e3b08e4 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,38 @@ +# $Id: Makefile.am 7 2003-08-04 23:05:55Z lennart $ + +# This file is part of syrep. +# +# syrep 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. +# +# syrep 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 syrep; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +EXTRA_DIST=bootstrap.sh README LICENSE +SUBDIRS=src doc # man + +MAINTAINERCLEANFILES = README +noinst_DATA = README + +README: + rm -f README + $(MAKE) -C doc README + ln -s doc/README README + +homepage: + test -d $$HOME/homepage/lennart + mkdir -p $$HOME/homepage/lennart/projects/syrep + cp *.tar.gz $$HOME/homepage/lennart/projects/syrep + cp doc/README.html doc/style.css $$HOME/homepage/lennart/projects/syrep + cp $$HOME/homepage/lennart/projects/syrep/README.html $$HOME/homepage/lennart/projects/syrep/index.html + +distcleancheck: + @: diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..e63defb --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# $Id: bootstrap.sh 3 2003-08-04 22:45:25Z lennart $ + +# This file is part of syrep. +# +# syrep 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. +# +# syrep 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 syrep; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +if [ "x$1" = "xam" ] ; then + set -ex + automake -a -c + ./config.status +else + set -ex + + #make maintainer-clean || true + + rm -rf autom4te.cache + rm -f config.cache + + aclocal + autoheader + automake -a -c + autoconf -Wall + + ./configure "$@" +fi + diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..88f058f --- /dev/null +++ b/configure.ac @@ -0,0 +1,162 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +# $Id: configure.ac 13 2003-08-23 20:33:12Z lennart $ + +# This file is part of syrep. +# +# syrep 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. +# +# syrep 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 syrep; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +AC_PREREQ(2.57) +AC_INIT([syrep], [0.1], [mzflerc (at) 0pointer (dot) de]) +AC_CONFIG_SRCDIR([src/syrep.c]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([foreign -Wall]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_LN_S + +AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/syrep/]) + +if test -d /usr/local/stow ; then + AC_MSG_NOTICE([*** Found /usr/local/stow: installing to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) + AC_PREFIX_DEFAULT([/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}]) +fi + +AC_CHECK_LIB([z], [inflate],, [AC_MSG_ERROR([*** Sorry, you have to install zlib ***])]) +AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([*** Sorry, you have to install the zlib headers ***])]) + +AC_CHECK_HEADER([db.h],, [AC_MSG_ERROR([*** Sorry, you have to install the Berkeley Database Library (libdb) 4.1 or newer ***])]) + +LIBS="$LIBS -ldb" + +# If using GCC specify some additional parameters +if test "x$GCC" = "xyes" ; then + CFLAGS="$CFLAGS -pipe -Wall" +fi + +AC_C_BIGENDIAN + +if test "x$ac_cv_c_bigendian" = "xyes"; then + CFLAGS="$CPPFLAGS -DARCH_IS_BIG_ENDIAN=1" +else + CPPFLAGS="$CPPFLAGS -DARCH_IS_BIG_ENDIAN=0" +fi + +# 64 Bit LFS support +CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64" + +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdlib.h string.h unistd.h]) + +# Checks for header files. +AC_C_CONST +AC_TYPE_MODE_T +AC_TYPE_OFF_T +AC_TYPE_SIZE_T +AC_C_VOLATILE + +# Checks for library functions. +AC_FUNC_CLOSEDIR_VOID +AC_FUNC_MALLOC +AC_FUNC_MEMCMP +AC_FUNC_MMAP +AC_FUNC_STAT +AC_CHECK_FUNCS([atexit ftruncate getcwd gethostname memset mkdir munmap rmdir setenv strchr strdup strerror strrchr strtol]) + +# LYNX documentation generation +AC_ARG_ENABLE(lynx, + AC_HELP_STRING([--disable-lynx], [Turn off lynx usage for documentation generation]), +[case "${enableval}" in + yes) lynx=yes ;; + no) lynx=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; +esac],[lynx=yes]) + +if test x$lynx = xyes ; then + AC_CHECK_PROG(have_lynx, lynx, yes, no) + + if test x$have_lynx = xno ; then + AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***]) + fi +fi + +AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) + +# XMLTOMAN manpage generation +AC_ARG_ENABLE(xmltoman, + AC_HELP_STRING([--disable-xmltoman], [Disable rebuilding of man pages with xmltoman]), +[case "${enableval}" in + yes) xmltoman=yes ;; + no) xmltoman=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;; +esac],[xmltoman=yes]) + +if test x$xmltoman = xyes ; then + AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no) + + if test x$have_xmltoman = xno ; then + AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***]) + xmltoman=no + fi +fi + +AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) + +# gengetopt command line parser generation +AC_ARG_ENABLE(gengetopt, + AC_HELP_STRING([--disable-gengetopt], [Disable rebuilding of command line parser with gengetopt]), +[case "${enableval}" in + yes) gengetopt=yes ;; + no) gengetopt=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-gengetopt]) ;; +esac],[gengetopt=yes]) + +if test x$gengetopt = xyes ; then + AC_CHECK_PROG(have_gengetopt, gengetopt, yes, no) + + if test x$have_gengetopt = xno ; then + AC_MSG_WARN([*** Not rebuilding command line parser as gengetopt is not found ***]) + gengetopt=no + fi +fi + +AM_CONDITIONAL([USE_GENGETOPT], [test "x$gengetopt" = xyes]) + +# subversion release number generation +AC_ARG_ENABLE(subversion, + AC_HELP_STRING([--disable-subversion], [Disable rebuilding of svn-release.h]), +[case "${enableval}" in + yes) subversion=yes ;; + no) subversion=no ;; + *) AC_MSG_ERROR([bad value ${enableval} for --disable-subversion]) ;; +esac],[subversion=yes]) + +if test x$subversion = xyes ; then + AC_CHECK_PROG(have_subversion, svn, yes, no) + + if test x$have_subversion = xno ; then + AC_MSG_WARN([*** Not rebuilding svn-release.h as subversion is not found ***]) + subversion=no + fi +fi + +AM_CONDITIONAL([USE_SUBVERSION], [test "x$subversion" = xyes]) + + +AC_CONFIG_FILES([src/Makefile Makefile doc/Makefile]) # man/Makefile doc/Makefile doc/README.html +AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..023a636 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,19 @@ +# $Id: Makefile.am 7 2003-08-04 23:05:55Z lennart $ + +# This file is part of syrep. +# +# syrep 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. +# +# syrep 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 syrep; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + +EXTRA_DIST = todo.txt package.txt usage-intro.txt diff --git a/doc/README b/doc/README new file mode 100644 index 0000000..1f7ff7e --- /dev/null +++ b/doc/README @@ -0,0 +1 @@ +No README yet diff --git a/doc/todo.txt b/doc/todo.txt index 95ea9b0..1faad6c 100644 --- a/doc/todo.txt +++ b/doc/todo.txt @@ -18,9 +18,9 @@ pre-0.1: - package.c: atomicity DONE - fix makepatch to not include already existing files DONE - better usage info on --help DONE +- autoconf DONE - documentation/man pages -- autoconf - testing post-0.1: diff --git a/doc/usage-intro.txt b/doc/usage-intro.txt index 2cf2096..1ce5c26 100644 --- a/doc/usage-intro.txt +++ b/doc/usage-intro.txt @@ -12,16 +12,18 @@ Complete: extract [-o DIR] PATCH -Partially: - merge [-S SNAP] SNAP DIR -Not yet: merge [-S SNAP] PATCH DIR merge [-S SNAP] DIR DIR - merge [-S SNAP] URL://DIR DIR makepatch [-S SNAP] -O PATCH SNAP DIR makepatch [-S SNAP] SNAP DIR > PATCH + +Not yet: + + merge [-S SNAP] URL://DIR DIR + + $Id$ diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 97994b5..0000000 --- a/src/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -CFLAGS=-Wall -pipe -O0 -g -DARCH_IS_BIG_ENDIAN=0 -D_FILE_OFFSET_BITS=64 -DPACKAGE_VERSION=\"0.1\" -CC=gcc - -all: syrep - -syrep: cache.o update.o util.o syrep.o md5.o md5util.o context.o package.o dbutil.o cmdline.o info.o history.o dump.o list.o diff.o merge.o extract.o makepatch.o cleanup.o - $(CC) -g $^ -o $@ -ldb -lz - -cmdline.c cmdline.h: syrep.ggo Makefile - gengetopt --unamed-opts --no-handle-help --no-handle-version < $< - -update.o: cmdline.h - -clean: - rm -f *.o syrep cmdline.[ch] - -.PHONY: all clean diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..3386f58 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,84 @@ +# $Id: Makefile.am 7 2003-08-04 23:05:55Z lennart $ + +# This file is part of syrep. +# +# syrep 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. +# +# syrep 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 syrep; if not, write to the Free Software Foundation, +# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + + +bin_PROGRAMS = syrep + +syrep_SOURCES = cache.c cache.h \ + update.c update.h \ + util.c util.h \ + syrep.c syrep.h \ + md5.c md5.h \ + md5util.c md5util.h \ + context.c context.h \ + package.c package.h \ + dbutil.c dbutil.h \ + info.c info.h \ + history.c history.h \ + dump.c dump.h \ + list.c list.h \ + diff.c diff.h \ + merge.c merge.h \ + extract.c extract.h \ + makepatch.c makepatch.h \ + cleanup.c cleanup.h \ + cmdline.c cmdline.h \ + svn-revision.h \ + dbstruct.h + +EXTRA_DIST = syrep.ggo +MAINTAINERCLEANFILES = +BUILT_SOURCES = + +if USE_GENGETOPT +MAINTAINERCLEANFILES += cmdline.c cmdline.h +BUILT_SOURCES += cmdline.c cmdline.h +endif + +if USE_SUBVERSION +MAINTAINERCLEANFILES += svn-revision.h +BUILT_SOURCES += svn-revision.h +endif + +syrep.$(OBJEXT): svn-revision.h cmdline.h +update.$(OBJEXT): cmdline.h + +if USE_GENGETOPT + +cmdline.c cmdline.h: syrep.ggo Makefile + gengetopt --unamed-opts --no-handle-help --no-handle-version < $< + +endif + +if USE_SUBVERSION +svn-revision.h: Makefile + if test -d "$(top_srcdir)/.svn" ; then \ + if REV=`svn info "$(top_srcdir)" | grep ^Revision | cut -f2 -d" "` 2> /dev/null ; then \ + echo -e "#ifndef foosvnrevisionhfoo\n#define foosvnrevisionhfoo\n#define SVN_REVISION \"$$REV\"\n#endif" > $@ ; \ + fi \ + fi + +svnkeywords: + rm -f svn-revision.h cmdline.[ch] + svn propset svn:keywords Id *.c *.h Makefile.am + +.PHONY: svnkeywords + +endif + + diff --git a/src/cache.h b/src/cache.h index 27d0421..67ec37d 100644 --- a/src/cache.h +++ b/src/cache.h @@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***/ -#include +#include struct syrep_md_cache; diff --git a/src/context.h b/src/context.h index 0a7aa03..29045cb 100644 --- a/src/context.h +++ b/src/context.h @@ -22,7 +22,7 @@ ***/ #include -#include +#include struct syrep_db_context { struct package *package; diff --git a/src/dbstruct.h b/src/dbstruct.h index b5f0c26..74c6059 100644 --- a/src/dbstruct.h +++ b/src/dbstruct.h @@ -22,7 +22,7 @@ ***/ #include -#include +#include #include diff --git a/src/extract.c b/src/extract.c index 011e108..ec1d8f0 100644 --- a/src/extract.c +++ b/src/extract.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "package.h" diff --git a/src/package.c b/src/package.c index fed5d5c..3d23306 100644 --- a/src/package.c +++ b/src/package.c @@ -19,7 +19,7 @@ ***/ #include -#include +#include #include #include #include diff --git a/src/package.h b/src/package.h index 722ad54..9279659 100644 --- a/src/package.h +++ b/src/package.h @@ -21,7 +21,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***/ -#include +#include #define PACKAGE_FILEID (*((uint32_t*) "SREP")) #define PACKAGE_FILEIDCOMPRESSED (*((uint32_t*) "CREP")) diff --git a/src/syrep.c b/src/syrep.c index 446c2c9..724f08a 100644 --- a/src/syrep.c +++ b/src/syrep.c @@ -18,7 +18,7 @@ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***/ -#include +#include #include #include #include @@ -53,6 +53,12 @@ #include "makepatch.h" #include "cleanup.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "svn-revision.h" + volatile int interrupted = 0; struct gengetopt_args_info args; @@ -533,7 +539,8 @@ static int version(const char *argv0) { "%s "PACKAGE_VERSION"\n" "Compiled with %i Bit off_t.\n" "Compiled with zlib %s, linked to zlib %s.\n" - "Compiled with libdb %i.%i.%i, linked to libdb %i.%i.%i\n", + "Compiled with libdb %i.%i.%i, linked to libdb %i.%i.%i\n" + "SVN Revision "SVN_REVISION"\n", argv0, sizeof(off_t)*8, ZLIB_VERSION, zlibVersion(), diff --git a/src/util.c b/src/util.c index c05b312..18f8fa4 100644 --- a/src/util.c +++ b/src/util.c @@ -224,10 +224,10 @@ int expand_file(int fd, off_t l) { #define BUFSIZE (32*1024) int copy_fd(int sfd, int dfd, off_t l) { - off_t sfo, dfo, msfo, mdfo; + off_t sfo = 0, dfo = 0, msfo = 0, mdfo = 0; + size_t m = 0, sm = 0, dm = 0; void *sp, *dp; - off_t m, sm, dm; - static off_t psize = 0; + static size_t psize = 0; #ifdef USE_SENDFILE if (!copy_fd_sendfile(sfd, dfd, l)) diff --git a/src/util.h b/src/util.h index b7fb571..50e3a95 100644 --- a/src/util.h +++ b/src/util.h @@ -22,7 +22,7 @@ ***/ #include -#include +#include #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) -- cgit