* configure.ac: Rename from configure.in.

* configure.in: Delete.
* libgetopt++/configure.ac: Rename from configure.in.
* libgetopt++/configure.in: Delete.
* Makefile.am: Remove ill-advised iniparse.hh change.
* libgetopt++/Makefile.am: Use "modern" AM_CPPFLAGS rather than INCLUDES.
* inilex.ll: Add autodep token recognition.
* iniparse.yy: Handle autodep.
* IniDBBuilder.h (autodep): Define for base class.
* IniDBBuilderPackage.cc (IniDBBuilderPackage::autodep): Define.
* IniDBBuilderPackage.h (IniDBBuilderPackage::autodep): Declare.

diff --git a/ChangeLog b/ChangeLog
index b033185c0ab5b5ef3549d1dd0d8a82d1556881ce..8d5adda3edbee8d0a7e8dc4471262a6bc5664107 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2013-02-17  Christopher Faylor  <me.cygwin2013@cgf.cx>
+
+       * configure.ac: Rename from configure.in.
+       * configure.in: Delete.
+       * libgetopt++/configure.ac: Rename from configure.in.
+       * libgetopt++/configure.in: Delete.
+       * Makefile.am: Remove ill-advised iniparse.hh change.
+       * libgetopt++/Makefile.am: Use "modern" AM_CPPFLAGS rather than INCLUDES.
+       * inilex.ll: Add autodep token recognition.
+       * iniparse.yy: Handle autodep.
+       * IniDBBuilder.h (autodep): Define for base class.
+        * IniDBBuilderPackage.cc (IniDBBuilderPackage::autodep): Define.
+        * IniDBBuilderPackage.h (IniDBBuilderPackage::autodep): Declare.
+
 2013-02-17  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
        * Makefile.am: Add regex.c to list of sources.

diff --git a/IniDBBuilder.h b/IniDBBuilder.h
index d9996299820d902d647e1f4337a47fdcbd290815..cea5304be4fc4525479acb6b7a08608c419bf519 100644 (file)
--- a/IniDBBuilder.h
+++ b/IniDBBuilder.h
@@ -58,6 +58,7 @@ public:
   virtual void buildPackageListOperator (PackageSpecification::_operators const &) = 0;
   virtual void buildPackageListOperatorVersion (const std::string& ) = 0;
   virtual void buildMessage (const std::string&, const std::string&) = 0;
+  virtual void autodep (const std::string&, const std::string&) = 0;
 
   unsigned int timestamp;
   std::string version;

diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc
index 44a5eeaad45957ecc6657f7b5cb20d303f02e3b5..4c37fa14c829801652a4a8b2f2819e257f125782 100644 (file)
--- a/IniDBBuilderPackage.cc
+++ b/IniDBBuilderPackage.cc
@@ -597,3 +597,9 @@ IniDBBuilderPackage::buildMessage (const std::string& message_id, const std::str
 {
   cp->set_message (message_id, message);
 }
+
+void
+IniDBBuilderPackage::autodep (const std::string& message_id, const std::string& message)
+{
+  cp->set_message (message_id, message);
+}

diff --git a/IniDBBuilderPackage.h b/IniDBBuilderPackage.h
index 3795df7c940f02462852cf0531e8f32b001ca666..77e67468acb04aef5530160a701f91d15cf9e1d5 100644 (file)
--- a/IniDBBuilderPackage.h
+++ b/IniDBBuilderPackage.h
@@ -60,6 +60,7 @@ public:
   virtual void buildBeginBinary ();
   virtual void buildDescription (const std::string&);
   virtual void buildMessage (const std::string&, const std::string&);
+  virtual void autodep (const std::string&, const std::string&);
   virtual void buildSourceName (const std::string& );
   virtual void buildSourceNameVersion (const std::string& );
   virtual void buildPackageListAndNode ();

diff --git a/Makefile.am b/Makefile.am
index 0b38f948c1935a063f54d17a57b3c794fbbf06e6..24711ceb823c6ff2eec2a40d7ea2a104b0a3692b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -281,9 +281,6 @@ setup_SOURCES = \
 # autoload code does not optimize properly with gcc-4.x
 autoload.o: CFLAGS += -O0
 
-iniparse.hh: iniparse.cc
-       @mv -f $(basename $<).h $(basename $<).hh 2>/dev/null || :
-
 VER := $(shell sed -ne 's/^\$$Revi[s]ion: *\([^ ]*\) *$$.*/\1/p' \
                $(srcdir)/ChangeLog)
 

diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index 57af653..0000000
--- a/configure.in
+++ /dev/null
@@ -1,98 +0,0 @@
-dnl Copyright (c) 2000, Red Hat, Inc.
-dnl
-dnl     This program is free software; you can redistribute it and/or modify
-dnl     it under the terms of the GNU General Public License as published by
-dnl     the Free Software Foundation; either version 2 of the License, or
-dnl     (at your option) any later version.
-dnl
-dnl     A copy of the GNU General Public License can be found at
-dnl     http://www.gnu.org/
-dnl
-dnl Written by Christopher Faylor <cgf@redhat.com>
-dnl and Robert Collins  <rbtcollins@hotmail.com>
-dnl
-dnl $Id$
-dnl
-dnl Autoconf configure script for Cygwin utilities.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([setup], [0], [cygwin-apps@cygwin.com])
-AC_PREREQ(2.60)
-AC_CONFIG_AUX_DIR([cfgaux])
-AM_INIT_AUTOMAKE([1.12 subdir-objects foreign no-define -Wall -Wno-portability])
-dnl AM_CONFIG_HEADER(include/autoconf.h)
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES(yes)])
-AC_CONFIG_SRCDIR([Makefile.in])
-AC_REVISION($Revision$)dnl
-
-AC_MSG_CHECKING([Whether to build inilint])
-AC_ARG_ENABLE(inilint,
-           AC_HELP_STRING([--enable-inilint],
-                          [Build the inilint tool]),
-           ac_cv_enable_inilint=$enableval, ac_cv_enable_inilint=no)
-AC_MSG_RESULT([$ac_cv_enable_inilint])
-if test $ac_cv_enable_inilint = yes; then
-  INILINT="inilint\$(EXEEXT)"
-else
-  INILINT=
-fi
-AC_SUBST(INILINT)
-
-AC_LANG_CPLUSPLUS
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AM_PROG_LEX
-AC_PROG_YACC
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_PROG_LIBTOOL
-
-dnl AC_CHECK_TOOL(AR, ar, ar)
-dnl AC_SUBST(AR)
-dnl AC_CHECK_TOOL(AS, as, as)
-dnl AC_SUBST(AS)
-dnl AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-dnl AC_SUBST(RANLIB)
-dnl AC_CHECK_TOOL(LD, ld, ld)
-dnl AC_SUBST(LD)
-dnl AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-dnl AC_SUBST(DLLTOOL)
-AC_CHECK_TOOL(WINDRES, windres, windres)
-AC_SUBST(WINDRES)
-dnl AC_CHECK_TOOL(OBJCOPY, objcopy, objcopy)
-dnl AC_SUBST(OBJCOPY)
-
-AC_CHECK_LIB(mingw32,main)
-
-AC_CHECK_HEADERS(alloca.h \
-                errno.h \
-                string \
-                string.h )
-
-AC_CHECK_HEADER(zlib.h, , missing_deps="$missing_deps zlib")
-AC_CHECK_HEADER(bzlib.h, , missing_deps="$missing_deps libbz2")
-AC_CHECK_HEADER(lzma.h, , missing_deps="$missing_deps liblzma")
-AC_CHECK_HEADER(gcrypt.h, , missing_deps="$missing_deps libgcrypt")
-
-if test -n "$missing_deps"; then
-       AC_MSG_ERROR([missing prerequisites: $missing_deps])
-fi
-
-prefix=`pwd`/inst; mkdir -p "$prefix"
-exec_prefix=$prefix
-ac_configure_args="$ac_configure_args --disable-shared"
-AC_CONFIG_SUBDIRS(libgetopt++)
-
-dnl add portability sources to inilint
-case "$host_os" in
-mingw32)
-  AM_CONDITIONAL(MINGWTARGET, true)
-  ;;
-*)
-  AM_CONDITIONAL(MINGWTARGET, false)
-  ;;
-esac
-
-AC_CONFIG_FILES([Makefile tests/Makefile])
-AC_OUTPUT

diff --git a/inilex.ll b/inilex.ll
index a70b5b5d6aaf1a3b808a5109f376a0890326243c..cc0723d9fc4d831aae3c68f03937865b06303873 100644 (file)
--- a/inilex.ll
+++ b/inilex.ll
@@ -77,6 +77,7 @@ STR   [!a-zA-Z0-9_./:\+~-]+
 "sdesc:"               return SDESC;
 "ldesc:"               return LDESC;
 "message:"             return MESSAGE;
+"autodep:"             return AUTODEP;
 "Description:"         BEGIN (descriptionstate); return DESCTAG;
 "Size:"                        return FILESIZE;
 "MD5sum:"              return MD5LINE;

diff --git a/iniparse.yy b/iniparse.yy
index 684fc47da7e57270c67fb001c2e75f2cc46c1270..6e921bbe5c9a0aa215f90a2d82523bb12058849e 100644 (file)
--- a/iniparse.yy
+++ b/iniparse.yy
@@ -50,7 +50,7 @@ void add_correct_version();
 %token OPENBRACE CLOSEBRACE EQUAL GT LT GTEQUAL LTEQUAL 
 %token OPENSQUARE CLOSESQUARE
 %token BINARYPACKAGE BUILDDEPENDS STANDARDSVERSION FORMAT DIRECTORY FILES
-%token MESSAGE
+%token MESSAGE AUTODEP
 
 %%
 
@@ -120,6 +120,7 @@ singleitem /* non-empty */
  | BUILDDEPENDS { iniBuilder->buildBeginBuildDepends(); } versionedpackagelist NL
  | FILES NL SourceFilesList
  | MESSAGE STRING STRING NL    { iniBuilder->buildMessage ($2, $3); }
+ | AUTODEP STRING STRING NL    { iniBuilder->autodep ($2, $3); }
  | DESCTAG mlinedesc
  | error                       { yyerror (std::string("unrecognized line ") 
                                          + stringify(yylineno)

diff --git a/libgetopt++/Makefile.am b/libgetopt++/Makefile.am
index fbb9298d33348c0ad0123539ecf8c3b165f90903..f820d719800d95696cc5678ff3149581e4e72a55 100644 (file)
--- a/libgetopt++/Makefile.am
+++ b/libgetopt++/Makefile.am
@@ -15,7 +15,7 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 
 getoptincludedir = $(includedir)/getopt++
 

diff --git a/libgetopt++/configure.ac b/libgetopt++/configure.ac
index 5ab0da4d7fb3ab710a2f1fecdc94f7c574199d21..57a72837cfc1b9205f229bbdb6661da768730334 100644 (file)
--- a/libgetopt++/configure.ac
+++ b/libgetopt++/configure.ac
@@ -7,10 +7,10 @@ dnl  $Id$
 dnl
 dnl
 dnl
-AC_INIT(src/GetOption.cc)
+AC_INIT(src/GetOption.cc, 0.0.2-DEVEL)
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(GetOpt++, 0.0.2-DEVEL)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_REVISION($Revision$)dnl
 AC_PREFIX_DEFAULT(/usr/local)

diff --git a/libgetopt++/configure.in b/libgetopt++/configure.in
deleted file mode 100644 (file)
index 5ab0da4..0000000
--- a/libgetopt++/configure.in
+++ /dev/null
@@ -1,48 +0,0 @@
-dnl
-dnl  Configuration input file for GetOpt++
-dnl
-dnl  Robert Collins, rbtcollins@hotmail.com
-dnl
-dnl  $Id$
-dnl
-dnl
-dnl
-AC_INIT(src/GetOption.cc)
-AC_PREREQ(2.60)
-AC_CONFIG_AUX_DIR(cfgaux)
-AM_INIT_AUTOMAKE(GetOpt++, 0.0.2-DEVEL)
-AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision$)dnl
-AC_PREFIX_DEFAULT(/usr/local)
-AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES(yes)])
-
-dnl Check for GNU cc
-AC_LANG_CPLUSPLUS
-dnl AC_API_WIN32
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-AC_PROG_LIBTOOL
-
-AC_CHECK_HEADERS( \
-       unistd.h \
-       string   \
-       string.h
-)
-
-AC_CHECK_HEADER(getopt.h,
-[
-AM_CONDITIONAL(INTERNAL_GETOPT, false)
-],[
-AM_CONDITIONAL(INTERNAL_GETOPT, true)
-])
-
-
-AC_C_CONST
-AC_C_BIGENDIAN
-
-AC_OUTPUT([\
-       Makefile
-])