build breakage with gcc-4.7.2

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

build breakage with gcc-4.7.2

Alan Modra-3
Found when attempting to build sid with gcc-4.7

looser throw specifier for ‘some_derived_class destructor‘ overriding
‘parent_class destructor throw ()‘.

‘some_function’ was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
note: declarations in dependent base ‘some_class’ are not found by unqualified lookup
note: use ‘this->some_function’ instead

OK to apply?

sid/component/cgen-cpu/mep/
        * mep.h (mep_cpu_cgen::~mep_cpu_cgen): New.
        * mep_basic.h (mep_basic_cpu::~mep_basic_cpu): New.
        * mep_ext1.h (mep_ext1_cpu::~mep_ext1_cpu): New.
sid/component/cgen-cpu/sh/
        * sh.h (sh_cpu_impl::~sh_cpu_impl): New.
        * sh2a_model.cxx: Specify dependent base class function with 'this->'.
        * sh3_model.cxx: Likewise.
        * sh4.cxx: Likewise.
        * sh64.c: Include sysdep.h first.
sid/component/gloss/
        * angel.h (arm_angel::~arm_angel): New.
        * m32r.h (m32r_libgloss::~m32r_libgloss): New.
        * mips.h (mips32_idt::~mips32_idt): New.
sid/component/mmu/armRemap.cxx
        * armRemap.cxx (operator<<): Avoid redeclaration of "it".

Index: sid/component/cgen-cpu/mep/mep.h
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/mep.h,v
retrieving revision 1.4
diff -u -p -r1.4 mep.h
--- sid/component/cgen-cpu/mep/mep.h 30 Apr 2009 21:18:37 -0000 1.4
+++ sid/component/cgen-cpu/mep/mep.h 20 Sep 2013 08:33:03 -0000
@@ -91,6 +91,9 @@ namespace mep
  : cr64_queuelen(0),
   ccr_queuelen(0)
         { }
+
+      ~mep_cpu_cgen() throw ()
+        { }
     };
 
   class debugger_bus_with_control_bus_vision :
Index: sid/component/cgen-cpu/mep/mep_basic.h
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/mep_basic.h,v
retrieving revision 1.1
diff -u -p -r1.1 mep_basic.h
--- sid/component/cgen-cpu/mep/mep_basic.h 5 Feb 2007 20:28:40 -0000 1.1
+++ sid/component/cgen-cpu/mep/mep_basic.h 20 Sep 2013 08:33:03 -0000
@@ -26,6 +26,7 @@ namespace mep_basic {
  this->insn_options[DSP] = false;
  this->insn_options[UCI] = false;
       }
+    ~mep_basic_cpu () throw () { }
     void core_model_insn_before (bool first_p = true) { my_core_model.model_insn_before (first_p); }
     void core_model_step_latency (sid::host_int_4 cycles = 0) { my_core_model.step_latency (cycles); }
 
Index: sid/component/cgen-cpu/mep/mep_ext1.h
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/mep_ext1.h,v
retrieving revision 1.2
diff -u -p -r1.2 mep_ext1.h
--- sid/component/cgen-cpu/mep/mep_ext1.h 30 Apr 2009 21:18:37 -0000 1.2
+++ sid/component/cgen-cpu/mep/mep_ext1.h 20 Sep 2013 08:33:03 -0000
@@ -36,6 +36,7 @@ namespace mep_ext1 {
       my_cop48_model (this),
       my_cop64_model (this)
     {}
+    ~mep_ext1_cpu() throw() {}
 
     void core_model_insn_before (bool first_p = true) { my_core_model.model_insn_before (first_p); }
     void core_model_step_latency (sid::host_int_4 cycles = 0) { my_core_model.step_latency (cycles); }
Index: sid/component/cgen-cpu/sh/sh.h
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/sh.h,v
retrieving revision 1.2
diff -u -p -r1.2 sh.h
--- sid/component/cgen-cpu/sh/sh.h 13 Aug 2007 14:47:43 -0000 1.2
+++ sid/component/cgen-cpu/sh/sh.h 20 Sep 2013 08:33:05 -0000
@@ -315,6 +315,7 @@ namespace sh
   class sh_cpu_impl: public sh_cpu<CGEN_CPU>
     {
     public:
+      ~sh_cpu_impl() throw() { }
       PCADDR get_fetched_insn_pc () { return this->fetched_insn_pc; }
 
     protected:
Index: sid/component/cgen-cpu/sh/sh2a_model.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/sh2a_model.cxx,v
retrieving revision 1.1
diff -u -p -r1.1 sh2a_model.cxx
--- sid/component/cgen-cpu/sh/sh2a_model.cxx 18 Oct 2006 18:27:27 -0000 1.1
+++ sid/component/cgen-cpu/sh/sh2a_model.cxx 20 Sep 2013 08:33:05 -0000
@@ -120,9 +120,9 @@ sh2a_model<BASE, CPU, IDESC>::model_u_us
       // LDS.L has a longer pipeline and can execute 1 cycle
       // earlier than other insns.
       if (insn_is_ldsl_mac (idesc) && this->multiply_busy >= 2)
- set_current_stall (this->multiply_busy - 2);
+ this->set_current_stall (this->multiply_busy - 2);
       else
- set_current_stall (this->multiply_busy - 1);
+ this->set_current_stall (this->multiply_busy - 1);
     }
 
   return 0;
@@ -134,7 +134,7 @@ sh2a_model<BASE, CPU, IDESC>::model_u_wr
 {
   // Only used by STS and STS.L. Stall until the multiply unit is completely free.
   if (write_back_busy)
-    set_current_stall (this->multiply_busy);
+    this->set_current_stall (this->multiply_busy);
 
   return 0;
 }
Index: sid/component/cgen-cpu/sh/sh3_model.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/sh3_model.cxx,v
retrieving revision 1.1
diff -u -p -r1.1 sh3_model.cxx
--- sid/component/cgen-cpu/sh/sh3_model.cxx 18 Oct 2006 18:27:27 -0000 1.1
+++ sid/component/cgen-cpu/sh/sh3_model.cxx 20 Sep 2013 08:33:05 -0000
@@ -88,7 +88,7 @@ sh3_model<BASE, CPU, IDESC>::model_u_mac
   UINT extra_cycle = this->model_mac_after (cpu, 3);
 
   // Basic execution cycles for this insn.
-  UINT cycles = unit_cycles (idesc, BASE::UNIT_U_MACW);
+  UINT cycles = this->unit_cycles (idesc, BASE::UNIT_U_MACW);
 
   return cycles + extra_cycle;
 }
@@ -101,7 +101,7 @@ sh3_model<BASE, CPU, IDESC>::model_u_mac
   UINT extra_cycle = this->model_mac_after (cpu, 3);
 
   // Basic execution cycles for this insn.
-  UINT cycles = unit_cycles (idesc, BASE::UNIT_U_MACL);
+  UINT cycles = this->unit_cycles (idesc, BASE::UNIT_U_MACL);
 
   return cycles + extra_cycle;
 }
@@ -111,10 +111,10 @@ UINT
 sh3_model<BASE, CPU, IDESC>::model_u_dmul_after (CPU *cpu, const IDESC *idesc, int unit_num, unsigned long long referenced)
 {
   // MAC model with multiply latency of 3.
-  UINT extra_cycle = model_mac_after (cpu, 3);
+  UINT extra_cycle = this->model_mac_after (cpu, 3);
 
   // Basic execution cycles for this insn.
-  UINT cycles = unit_cycles (idesc, BASE::UNIT_U_DMUL);
+  UINT cycles = this->unit_cycles (idesc, BASE::UNIT_U_DMUL);
 
   return cycles + extra_cycle;
 }
@@ -124,10 +124,10 @@ UINT
 sh3_model<BASE, CPU, IDESC>::model_u_mull_after (CPU *cpu, const IDESC *idesc, int unit_num, unsigned long long referenced)
 {
   // MAC model with multiply latency of 3.
-  UINT extra_cycle = model_mac_after (cpu, 3);
+  UINT extra_cycle = this->model_mac_after (cpu, 3);
 
   // Basic execution cycles for this insn.
-  UINT cycles = unit_cycles (idesc, BASE::UNIT_U_MULL);
+  UINT cycles = this->unit_cycles (idesc, BASE::UNIT_U_MULL);
 
   return cycles + extra_cycle;
 }
Index: sid/component/cgen-cpu/sh/sh4.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/sh4.cxx,v
retrieving revision 1.1
diff -u -p -r1.1 sh4.cxx
--- sid/component/cgen-cpu/sh/sh4.cxx 18 Oct 2006 18:27:27 -0000 1.1
+++ sid/component/cgen-cpu/sh/sh4.cxx 20 Sep 2013 08:33:05 -0000
@@ -32,25 +32,25 @@ template <class CPU, class CGEN_CPU, cla
 void
 sh4_cpu_base<CPU,CGEN_CPU,IDESC,SCACHE,MODEL>::sh64_ftrv (unsigned n)
 {
-  SF result = sh64_fmuls (this->h_xf_get (0), this->h_frc_get (n));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (4),  this->h_frc_get (n + 1)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (8),  this->h_frc_get (n + 2)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (12), this->h_frc_get (n + 3)));
+  SF result = this->sh64_fmuls (this->h_xf_get (0), this->h_frc_get (n));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (4),  this->h_frc_get (n + 1)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (8),  this->h_frc_get (n + 2)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (12), this->h_frc_get (n + 3)));
   this->h_frc_set (n, result);
-  result = sh64_fmuls (this->h_xf_get (1), this->h_frc_get (n));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (5),  this->h_frc_get (n + 1)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (9),  this->h_frc_get (n + 2)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (13), this->h_frc_get (n + 3)));
+  result = this->sh64_fmuls (this->h_xf_get (1), this->h_frc_get (n));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (5),  this->h_frc_get (n + 1)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (9),  this->h_frc_get (n + 2)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (13), this->h_frc_get (n + 3)));
   this->h_frc_set (n + 1, result);
-  result = sh64_fmuls (this->h_xf_get (2), this->h_frc_get (n));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (6),  this->h_frc_get (n + 1)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (10), this->h_frc_get (n + 2)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (14), this->h_frc_get (n + 3)));
+  result = this->sh64_fmuls (this->h_xf_get (2), this->h_frc_get (n));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (6),  this->h_frc_get (n + 1)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (10), this->h_frc_get (n + 2)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (14), this->h_frc_get (n + 3)));
   this->h_frc_set (n + 2, result);
-  result = sh64_fmuls (this->h_xf_get (3), this->h_frc_get (n));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (7),  this->h_frc_get (n + 1)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (11), this->h_frc_get (n + 2)));
-  result = sh64_fadds (result, sh64_fmuls (this->h_xf_get (15), this->h_frc_get (n + 3)));
+  result = this->sh64_fmuls (this->h_xf_get (3), this->h_frc_get (n));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (7),  this->h_frc_get (n + 1)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (11), this->h_frc_get (n + 2)));
+  result = this->sh64_fadds (result, this->sh64_fmuls (this->h_xf_get (15), this->h_frc_get (n + 3)));
   this->h_frc_set (n + 3, result);
 }
 
Index: sid/component/cgen-cpu/sh/sh64.c
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/sh64.c,v
retrieving revision 1.1
diff -u -p -r1.1 sh64.c
--- sid/component/cgen-cpu/sh/sh64.c 18 Oct 2006 18:27:28 -0000 1.1
+++ sid/component/cgen-cpu/sh/sh64.c 20 Sep 2013 08:33:05 -0000
@@ -8,8 +8,8 @@
 /* These C functions are not used but needed for static linking.
    We need to refer to the ELF header structure.  */
 
-#include "dis-asm.h"
 #include "sysdep.h"
+#include "dis-asm.h"
 #include "sh64-opc.h"
 #include "libiberty.h"
 #include "elf-bfd.h"
Index: sid/component/gloss/angel.h
===================================================================
RCS file: /cvs/src/src/sid/component/gloss/angel.h,v
retrieving revision 1.2
diff -u -p -r1.2 angel.h
--- sid/component/gloss/angel.h 10 Oct 2001 17:19:16 -0000 1.2
+++ sid/component/gloss/angel.h 20 Sep 2013 08:33:07 -0000
@@ -35,6 +35,7 @@ class arm_angel: public gloss32
 public:
 
   arm_angel();
+  ~arm_angel() throw() { }
 
 private:
 
Index: sid/component/gloss/m32r.h
===================================================================
RCS file: /cvs/src/src/sid/component/gloss/m32r.h,v
retrieving revision 1.2
diff -u -p -r1.2 m32r.h
--- sid/component/gloss/m32r.h 3 Jan 2002 01:42:02 -0000 1.2
+++ sid/component/gloss/m32r.h 20 Sep 2013 08:33:07 -0000
@@ -15,6 +15,7 @@ class m32r_libgloss: public gloss32
 public:
 
   m32r_libgloss();
+  ~m32r_libgloss() throw() { }
 
 private:
 
Index: sid/component/gloss/mips.h
===================================================================
RCS file: /cvs/src/src/sid/component/gloss/mips.h,v
retrieving revision 1.1
diff -u -p -r1.1 mips.h
--- sid/component/gloss/mips.h 7 Dec 2000 19:30:50 -0000 1.1
+++ sid/component/gloss/mips.h 20 Sep 2013 08:33:07 -0000
@@ -18,6 +18,7 @@ class mips32_idt: public gloss32
 public:
 
   mips32_idt();
+  ~mips32_idt() throw() { }
 
 private:
 
Index: sid/component/mmu/armRemap.cxx
===================================================================
RCS file: /cvs/src/src/sid/component/mmu/armRemap.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 armRemap.cxx
--- sid/component/mmu/armRemap.cxx 1 Mar 2006 21:07:01 -0000 1.3
+++ sid/component/mmu/armRemap.cxx 20 Sep 2013 08:33:07 -0000
@@ -392,14 +392,14 @@ ostream& operator<< (ostream& op, const
      << " num-relocs " << static_cast<unsigned int> (obj.num_relocations)
      << " relocs ";
 
-  for (armRemapPause::entry_t::const_iterator it = obj.entries.begin();
-       it != obj.entries.end();
-       it++)
+  for (armRemapPause::entry_t::const_iterator ie = obj.entries.begin();
+       ie != obj.entries.end();
+       ie++)
     {
-      op << make_attribute(it->second.first) << ",";    // start address
-      op << make_attribute(it->second.second) << ",";   // end address
+      op << make_attribute(ie->second.first) << ",";    // start address
+      op << make_attribute(ie->second.second) << ",";   // end address
       
-      host_int_4 start_addr = it->second.first;
+      host_int_4 start_addr = ie->second.first;
       armRemapPause::translation_t::const_iterator it = obj.translations.find(start_addr);
       assert(it != obj.translations.end());
       op << it->second << " ";                          // relocated address

--
Alan Modra
Australia Development Lab, IBM
Reply | Threaded
Open this post in threaded view
|

Re: build breakage with gcc-4.7.2

Alan Modra-3
On Fri, Sep 20, 2013 at 11:20:01PM -0400, Frank Ch. Eigler wrote:
> > OK to apply?
>
> Great, thanks.

Applied.  Now, here's why I was poking at sid..

The motivation for this patch is to pick up support for powerpc64le in
libtool.m4.  To do that I've deleted sid/config files duplicating the
top level files, modified AC_CONFIG_AUX_DIR to specify the src top
level directory rather than sid/config, and modified ACLOCAL_AMFLAGS
to look in both sid/config and the top level dir.  Then regenerated
Makfile.in, aclocal.m4, configure and config.in with automake-1.11.1
and autoconf-2.64.  I chose those versions because they are currently
used by gcc and binutils, and it seemed good to me to reduce the
number of different auto-tools versions we use in src/.

Besides these mechanical changes,
sid/component/cfgroot/libltld/acinclude.m4 is patched with the same
powerpc64le support patch as upstream libtool.  I figure importing the
latest libltld is probably best done at the same time src/ libtool is
updated.

sid/component/families/mep/Makefile.am lacked ACLOCAL_AMFLAGS, so I've
added that.  Note that ACLOCAL_AMFLAGS doesn't need $(srcdir) since
the Makefiles do cd $(srcdir) before invoking aclocal.

Lastly, sid/bsp/pregen/Makefile.am and sid/doc/Makefile.am defined
ACLOCAL_AMFLAGS needlessly, so they've been removed.

I built sid for x86_64-linux and powerpc-linux to verify these changes
don't break the build.  OK to apply?

sid/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/config/
        * libtool.m4, ltconfig, ltdl.m4, ltmain.sh: Delete.
        * config.sub, config.guess, install-sh: Delete.
        * missing, mkinstalldirs, depcomp: Delete.
sid/bsp/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/bsp/pregen/
        * Makefile.am (ACLOCAL_AMFLAGS): Delete.
        * Makefile.in, *.conf: Regenerate.
        * sh5-gdb.conf, sh5-gloss.conf: New generated files.
sid/component/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
        * families/configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * families/Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * families/{Makefile.in, aclocal.m4, configure}: Regenerate.
sid/component/audio/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/component/bochs/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
        * cmos/Makefile.in, cpu/Makefile.in, cpu/fpu/Makefile.in: Regenerate.
        * cpu/memory/Makefile.in, dma/Makefile.in: Regenerate.
        * floppy/Makefile.in, gui/Makefile.in, harddrv/Makefile.in: Regenerate.
        * keyboard/Makefile.in, pic/Makefile.in, pit/Makefile.in: Regenerate.
        * unmapped/Makefile.in, vga/Makefile.in: Regenerate.
sid/component/cache/
        * Makefile.in: Regenerate.
sid/component/cfgroot/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir and -I libltdl.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
        * libltdl/acinclude.m4: (_LT_ENABLE_LOCK <ld -m flags>): Remove
        non-canonical ppc host match.  Support little-endian powerpc linux.
        * libltdl/configure: Regenerate.
sid/component/cgen-cpu/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/component/cgen-cpu/arm7t/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/cgen-cpu/m32r/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/cgen-cpu/mep/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/cgen-cpu/mt/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/cgen-cpu/sh/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/cgen-cpu/xstormy16/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/consoles/
        * Makefile.in: Regenerate.
sid/component/families/mep/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Define.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/gdb/
        * Makefile.in: Regenerate.
sid/component/gloss/
        * Makefile.in: Regenerate.
sid/component/glue/
        * Makefile.in: Regenerate.
sid/component/ide/
        * Makefile.in: Regenerate.
sid/component/interrupt/
        * Makefile.in: Regenerate.
sid/component/lcd/
        * Makefile.in: Regenerate.
sid/component/lcd/testsuite/
        * Makefile.in: Regenerate.
sid/component/loader/
        * Makefile.in: Regenerate.
sid/component/mapper/
        * Makefile.in: Regenerate.
sid/component/mapper/testsuite/
        * Makefile.in: Regenerate.
sid/component/memory/
        * Makefile.in: Regenerate.
sid/component/mmu/
        * Makefile.in: Regenerate.
sid/component/parport/
        * Makefile.in: Regenerate.
sid/component/profiling/
        * Makefile.in: Regenerate.
sid/component/rtc/
        * Makefile.in: Regenerate.
sid/component/sched/
        * Makefile.in: Regenerate.
sid/component/tcl/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/component/testsuite/
        * Makefile.in: Regenerate.
sid/component/timers/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/component/timers/arm7t/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/component/uart/
        * Makefile.in: Regenerate.
sid/component/uart/testsuite/
        * Makefile.in: Regnerate.
sid/component/uart/testsuite/
        * Makefile.in: Regnerate.
sid/demos/ChangeLog
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/demos/voice-pager/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, configure: Regenerate.
sid/doc/
        * Makefile.am (ACLOCAL_AMFLAGS): Delete.
        * Makefile.in: Regenerate.
sid/include/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, sidconfutil.in, configure: Regenerate.
sid/main/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/main/dynamic/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.
sid/samples/
        * configure.in (AC_CONFIG_AUX_DIR): Specify top dir.
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I top dir.
        * Makefile.in, aclocal.m4, config.in, configure: Regenerate.

Index: sid/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- sid/Makefile.am 5 Oct 2001 19:57:04 -0000 1.5
+++ sid/Makefile.am 20 Sep 2013 08:32:52 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/config
+ACLOCAL_AMFLAGS = -I config -I ..
 SUBDIRS = . @subdirs@
 
 EXTRA_DIST = COPYING.SID
Index: sid/configure.in
===================================================================
RCS file: /cvs/src/src/sid/configure.in,v
retrieving revision 1.8
diff -u -p -r1.8 configure.in
--- sid/configure.in 27 Mar 2006 22:19:18 -0000 1.8
+++ sid/configure.in 20 Sep 2013 08:32:52 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR(..)
 
 dnl set $CC early on
 AC_PROG_CC
Index: sid/bsp/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/bsp/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- sid/bsp/Makefile.am 18 Oct 2006 18:30:52 -0000 1.10
+++ sid/bsp/Makefile.am 20 Sep 2013 08:32:52 -0000
@@ -4,7 +4,7 @@
 ## released and the += operator works correctly inside conditionals.
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 
 SUBDIRS = . pregen
 
Index: sid/bsp/configure.in
===================================================================
RCS file: /cvs/src/src/sid/bsp/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/bsp/configure.in 24 Oct 2003 19:03:17 -0000 1.2
+++ sid/bsp/configure.in 20 Sep 2013 08:32:52 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sid,0.1)
 
 dnl automake support
Index: sid/bsp/pregen/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/bsp/pregen/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/bsp/pregen/Makefile.am 26 Jun 2001 20:46:06 -0000 1.3
+++ sid/bsp/pregen/Makefile.am 20 Sep 2013 08:32:52 -0000
@@ -1,7 +1,6 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
 
 install-data-local:
  $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
Index: sid/bsp/pregen/sh5-gdb.conf
===================================================================
RCS file: sid/bsp/pregen/sh5-gdb.conf
diff -N sid/bsp/pregen/sh5-gdb.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sid/bsp/pregen/sh5-gdb.conf 22 Sep 2013 13:16:19 -0000
@@ -0,0 +1,106 @@
+# sid configuration file
+# created by Id: configrun-sid.in,v 1.39 2006/10/18 18:30:52 brolley Exp
+# run by alan @ bubble (Linux) at Wed Sep 18 12:13:53 CST 2013
+# args: --cpu=sh5 --no-run --gdb=5000
+load libaudio.la audio_component_library
+load libcache.la cache_component_library
+load libcgencpu.la cgen_component_library
+load libconsoles.la console_component_library
+load libgdb.la gdb_component_library
+load libgloss.la gloss_component_library
+load libglue.la glue_component_library
+load libhd44780u.la hd44780u_component_library
+load libide.la ide_component_library
+load libinterrupt.la interrupt_component_library
+load libloader.la loader_component_library
+load libmapper.la mapper_component_library
+load libmemory.la mem_component_library
+load libmmu.la mmu_component_library
+load libparport.la parport_component_library
+load libprof.la prof_component_library
+load librtc.la rtc_component_library
+load libsched.la sched_component_library
+load libtimers.la timer_component_library
+load libuart.la uart_component_library
+load libx86.la x86_component_library
+set main persistent? true
+# first section
+new hw-cpu-sh5 cpu
+new hw-mapper-basic cpu-mapper
+new hw-glue-sequence-8 init-sequence
+new hw-glue-sequence-1 hw-reset-net
+new hw-glue-sequence-8 deinit-sequence
+new hw-glue-sequence-1 yield-net
+new hw-glue-sequence-2 cache-flush-net
+new sid-sched-host-accurate host-sched
+new sid-sched-sim target-sched
+# gloss
+new sw-gloss-generic/libgloss gloss
+# cpu gdb
+new sw-debug-gdb cpu-gdb
+new sid-io-socket-server cpu-gdb-socket
+# memory region 1 (0x00000000,0x00800000)
+new hw-memory-ram/rom-basic mem1
+# second section
+# settings
+set cpu step-insn-count 10000
+set host-sched num-clients 10 # large enough?
+set target-sched num-clients 10 # large enough?
+# pin connections
+connect-pin main perform-activity -> host-sched advance
+connect-pin main perform-activity -> target-sched advance
+connect-pin main starting -> init-sequence input
+connect-pin main stopping -> deinit-sequence input
+connect-pin init-sequence output-0 -> hw-reset-net input
+connect-pin hw-reset-net output-0 -> cpu reset!
+set target-sched 0-name "CPU stepping"
+connect-pin target-sched 0-event -> cpu step!
+connect-pin target-sched 0-control <- cpu step-cycles
+connect-pin target-sched time-query <- cpu time-query
+connect-pin target-sched time-high -> cpu time-high
+connect-pin target-sched time-low -> cpu time-low
+connect-pin yield-net output-0 -> cpu yield
+connect-pin yield-net output-0 -> host-sched yield
+connect-bus cpu insn-memory cpu-mapper access-port
+connect-bus cpu data-memory cpu-mapper access-port
+# gloss
+relate gloss cpu cpu
+connect-pin init-sequence output-2 -> gloss reset
+connect-pin cpu trap <-> gloss trap
+connect-pin cpu trap-code -> gloss trap-code
+set gloss verbose? 0
+connect-bus gloss target-memory cpu-mapper access-port
+set cpu engine-type pbb
+# cpu-gdb
+relate cpu-gdb cpu cpu
+relate cpu-gdb cfgroot main
+relate cpu-gdb target-schedulers target-sched
+relate cpu-gdb host-schedulers host-sched
+connect-pin cpu-gdb process-signal -> main stop!
+connect-pin init-sequence output-3 -> cpu-gdb init
+connect-pin deinit-sequence output-5 -> cpu-gdb deinit
+connect-pin cpu-gdb yield -> yield-net input
+connect-pin cpu-gdb flush-icache -> cache-flush-net input
+connect-pin cache-flush-net output-1 -> cpu flush-icache
+connect-pin cpu-gdb restart -> hw-reset-net input
+set cpu-gdb exit-on-detach? 1
+# cpu-gdb-socket
+connect-pin init-sequence output-2 -> cpu-gdb-socket init
+connect-pin deinit-sequence output-6 -> cpu-gdb-socket fini
+connect-pin cpu-gdb-socket rx -> cpu-gdb remote-rx
+connect-pin cpu-gdb-socket tx <- cpu-gdb remote-tx
+connect-pin host-sched 6-event -> cpu-gdb-socket poll-event
+connect-pin host-sched 6-control <- cpu-gdb-socket poll-control
+set cpu-gdb-socket sockaddr-local 0.0.0.0:5000
+# gdb w/ gloss
+connect-pin gloss trap-chain <-> cpu-gdb trap
+connect-pin gloss trap-code-chain -> cpu-gdb trap-code
+connect-pin gloss process-signal -> cpu-gdb gloss-process-signal
+connect-pin gloss debug-tx -> cpu-gdb target-tx
+relate cpu-gdb gloss gloss
+set cpu-gdb enable-Z-packet? true
+set cpu-gdb operating-mode? false
+set cpu endian little
+# memory region 1 (0x00000000,0x00800000) configuration
+set mem1 size 8388608
+connect-bus cpu-mapper mem1:[0,8388607] mem1 read-write-port
Index: sid/bsp/pregen/sh5-gloss.conf
===================================================================
RCS file: sid/bsp/pregen/sh5-gloss.conf
diff -N sid/bsp/pregen/sh5-gloss.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sid/bsp/pregen/sh5-gloss.conf 22 Sep 2013 13:16:19 -0000
@@ -0,0 +1,93 @@
+# sid configuration file
+# created by Id: configrun-sid.in,v 1.39 2006/10/18 18:30:52 brolley Exp
+# run by alan @ bubble (Linux) at Wed Sep 18 12:13:53 CST 2013
+# args: --cpu=sh5 --no-run a.out
+load libaudio.la audio_component_library
+load libcache.la cache_component_library
+load libcgencpu.la cgen_component_library
+load libconsoles.la console_component_library
+load libgdb.la gdb_component_library
+load libgloss.la gloss_component_library
+load libglue.la glue_component_library
+load libhd44780u.la hd44780u_component_library
+load libide.la ide_component_library
+load libinterrupt.la interrupt_component_library
+load libloader.la loader_component_library
+load libmapper.la mapper_component_library
+load libmemory.la mem_component_library
+load libmmu.la mmu_component_library
+load libparport.la parport_component_library
+load libprof.la prof_component_library
+load librtc.la rtc_component_library
+load libsched.la sched_component_library
+load libtimers.la timer_component_library
+load libuart.la uart_component_library
+load libx86.la x86_component_library
+# first section
+new hw-cpu-sh5 cpu
+new hw-mapper-basic cpu-mapper
+new hw-glue-sequence-8 init-sequence
+new hw-glue-sequence-1 hw-reset-net
+new hw-glue-sequence-8 deinit-sequence
+new hw-glue-sequence-1 yield-net
+new hw-glue-sequence-2 cache-flush-net
+new sid-sched-host-accurate host-sched
+new sid-sched-sim target-sched
+# gloss
+new sw-gloss-generic/libgloss gloss
+# gloss <-> stdio
+new sid-io-stdio stdio
+# cpu loader
+new sw-load-elf cpu-loader
+# memory region 1 (0x00000000,0x00800000)
+new hw-memory-ram/rom-basic mem1
+# second section
+# settings
+set cpu step-insn-count 10000
+set host-sched num-clients 10 # large enough?
+set target-sched num-clients 10 # large enough?
+# pin connections
+connect-pin main perform-activity -> host-sched advance
+connect-pin main perform-activity -> target-sched advance
+connect-pin main starting -> init-sequence input
+connect-pin main stopping -> deinit-sequence input
+connect-pin init-sequence output-0 -> hw-reset-net input
+connect-pin hw-reset-net output-0 -> cpu reset!
+set target-sched 0-name "CPU stepping"
+connect-pin target-sched 0-event -> cpu step!
+connect-pin target-sched 0-control <- cpu step-cycles
+connect-pin target-sched time-query <- cpu time-query
+connect-pin target-sched time-high -> cpu time-high
+connect-pin target-sched time-low -> cpu time-low
+connect-pin yield-net output-0 -> cpu yield
+connect-pin yield-net output-0 -> host-sched yield
+connect-bus cpu insn-memory cpu-mapper access-port
+connect-bus cpu data-memory cpu-mapper access-port
+# gloss
+relate gloss cpu cpu
+connect-pin init-sequence output-2 -> gloss reset
+connect-pin cpu trap <-> gloss trap
+connect-pin cpu trap-code -> gloss trap-code
+set gloss verbose? 0
+connect-bus gloss target-memory cpu-mapper access-port
+# gloss <-> stdio
+set host-sched 0-regular? 1
+set host-sched 0-time 150 # apprx. human perception limit
+connect-pin host-sched 0-event -> stdio poll
+connect-pin gloss debug-tx -> stdio stdout
+connect-pin gloss debug-rx <- stdio stdin
+# gloss w/o gdb
+connect-pin gloss process-signal -> main stop!
+connect-pin gloss process-signal -> yield-net input
+set cpu engine-type pbb
+# cpu loader
+set cpu-loader file "a.out"
+connect-bus cpu-loader load-accessor-data cpu-mapper access-port
+connect-bus cpu-loader load-accessor-insn cpu-mapper access-port # don't trace loading
+connect-pin init-sequence output-1 -> cpu-loader load!
+connect-pin cpu-loader start-pc-set -> cpu start-pc-set!
+connect-pin cpu-loader endian-set -> cpu endian-set!
+connect-pin cpu-loader error -> main stop!
+# memory region 1 (0x00000000,0x00800000) configuration
+set mem1 size 8388608
+connect-bus cpu-mapper mem1:[0,8388607] mem1 read-write-port
Index: sid/component/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- sid/component/Makefile.am 10 May 2005 15:47:29 -0000 1.4
+++ sid/component/Makefile.am 20 Sep 2013 08:32:52 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 
 SUBDIRS = @subdirs@ @make_subdirs@
 
Index: sid/component/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/configure.in,v
retrieving revision 1.14
diff -u -p -r1.14 configure.in
--- sid/component/configure.in 4 Jun 2005 03:22:56 -0000 1.14
+++ sid/component/configure.in 20 Sep 2013 08:32:53 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/audio/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/audio/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/component/audio/Makefile.am 17 Jul 2001 01:28:18 -0000 1.3
+++ sid/component/audio/Makefile.am 20 Sep 2013 08:32:53 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 pkglib_LTLIBRARIES = libaudio.la
 
Index: sid/component/audio/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/audio/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/component/audio/configure.in 4 Aug 2001 11:28:50 -0000 1.2
+++ sid/component/audio/configure.in 20 Sep 2013 08:32:54 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/bochs/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- sid/component/bochs/Makefile.am 4 Mar 2002 23:33:00 -0000 1.5
+++ sid/component/bochs/Makefile.am 20 Sep 2013 08:32:54 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 pkglib_LTLIBRARIES = libx86.la
 
Index: sid/component/bochs/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/bochs/configure.in,v
retrieving revision 1.6
diff -u -p -r1.6 configure.in
--- sid/component/bochs/configure.in 4 Jun 2005 03:22:57 -0000 1.6
+++ sid/component/bochs/configure.in 20 Sep 2013 08:32:55 -0000
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf t
 
 AC_PREREQ(2.4)
 AC_INIT(components.cxx)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE(sidcomp,0.1)
Index: sid/component/cfgroot/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cfgroot/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- sid/component/cfgroot/Makefile.am 19 Aug 2005 19:39:07 -0000 1.7
+++ sid/component/cfgroot/Makefile.am 22 Sep 2013 23:37:40 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../.. -I libltdl
 
 SUBDIRS = @subdirs@
 
Index: sid/component/cfgroot/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cfgroot/configure.in,v
retrieving revision 1.4
diff -u -p -r1.4 configure.in
--- sid/component/cfgroot/configure.in 4 Jun 2005 03:23:01 -0000 1.4
+++ sid/component/cfgroot/configure.in 20 Sep 2013 08:32:57 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/cfgroot/libltdl/acinclude.m4
===================================================================
RCS file: /cvs/src/src/sid/component/cfgroot/libltdl/acinclude.m4,v
retrieving revision 1.2
diff -u -p -r1.2 acinclude.m4
--- sid/component/cfgroot/libltdl/acinclude.m4 4 Jun 2005 03:23:01 -0000 1.2
+++ sid/component/cfgroot/libltdl/acinclude.m4 20 Sep 2013 08:32:57 -0000
@@ -519,7 +519,7 @@ ia64-*-hpux*)
   rm -rf conftest*
   ;;
 
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
@@ -529,9 +529,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
+ powerpc64le-*linux*)
+  LD="${LD-ld} -m elf32lppclinux"
+  ;;
+ powerpc64-*linux*)
+  LD="${LD-ld} -m elf32ppclinux"
+  ;;
         s390x-*linux*)
           LD="${LD-ld} -m elf_s390"
           ;;
@@ -545,9 +548,12 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
         x86_64-*linux*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
+ powerpcle-*linux*)
+  LD="${LD-ld} -m elf64lppc"
+  ;;
+ powerpc-*linux*)
+  LD="${LD-ld} -m elf64ppc"
+  ;;
         s390*-*linux*)
           LD="${LD-ld} -m elf64_s390"
           ;;
Index: sid/component/cgen-cpu/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- sid/component/cgen-cpu/Makefile.am 6 Jun 2006 16:22:05 -0000 1.15
+++ sid/component/cgen-cpu/Makefile.am 20 Sep 2013 08:32:58 -0000
@@ -5,7 +5,7 @@ INTLLIBS = @INTLLIBS@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 pkglib_LTLIBRARIES = libcgencpu.la
 
Index: sid/component/cgen-cpu/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/configure.in,v
retrieving revision 1.12
diff -u -p -r1.12 configure.in
--- sid/component/cgen-cpu/configure.in 5 Feb 2007 20:28:39 -0000 1.12
+++ sid/component/cgen-cpu/configure.in 20 Sep 2013 08:32:59 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(compCGEN.cxx)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/cgen-cpu/arm7t/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/arm7t/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- sid/component/cgen-cpu/arm7t/Makefile.am 8 Sep 2003 18:55:35 -0000 1.6
+++ sid/component/cgen-cpu/arm7t/Makefile.am 20 Sep 2013 08:32:59 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libarm7t.la
 
Index: sid/component/cgen-cpu/arm7t/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/arm7t/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/component/cgen-cpu/arm7t/configure.in 4 Aug 2001 11:57:49 -0000 1.2
+++ sid/component/cgen-cpu/arm7t/configure.in 20 Sep 2013 08:33:00 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/cgen-cpu/m32r/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/m32r/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- sid/component/cgen-cpu/m32r/Makefile.am 12 Jul 2009 17:48:44 -0000 1.7
+++ sid/component/cgen-cpu/m32r/Makefile.am 20 Sep 2013 08:33:00 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libm32r.la
 
Index: sid/component/cgen-cpu/m32r/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/m32r/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/component/cgen-cpu/m32r/configure.in 4 Aug 2001 11:53:47 -0000 1.2
+++ sid/component/cgen-cpu/m32r/configure.in 20 Sep 2013 08:33:02 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/cgen-cpu/mep/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- sid/component/cgen-cpu/mep/Makefile.am 18 Aug 2009 19:29:15 -0000 1.5
+++ sid/component/cgen-cpu/mep/Makefile.am 20 Sep 2013 08:33:02 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libmep.la
 
Index: sid/component/cgen-cpu/mep/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mep/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/component/cgen-cpu/mep/configure.in 5 Feb 2007 20:28:40 -0000 1.1
+++ sid/component/cgen-cpu/mep/configure.in 20 Sep 2013 08:33:03 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/cgen-cpu/mt/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mt/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/component/cgen-cpu/mt/Makefile.am 16 Dec 2005 10:23:13 -0000 1.3
+++ sid/component/cgen-cpu/mt/Makefile.am 20 Sep 2013 08:33:03 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libmt.la
 
Index: sid/component/cgen-cpu/mt/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/mt/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/component/cgen-cpu/mt/configure.in 12 Dec 2005 11:16:42 -0000 1.1
+++ sid/component/cgen-cpu/mt/configure.in 20 Sep 2013 08:33:04 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/cgen-cpu/sh/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- sid/component/cgen-cpu/sh/Makefile.am 18 Oct 2006 18:27:27 -0000 1.1
+++ sid/component/cgen-cpu/sh/Makefile.am 20 Sep 2013 08:33:04 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libsh.la
 
Index: sid/component/cgen-cpu/sh/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/sh/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/component/cgen-cpu/sh/configure.in 18 Oct 2006 18:27:27 -0000 1.1
+++ sid/component/cgen-cpu/sh/configure.in 20 Sep 2013 08:33:05 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/cgen-cpu/xstormy16/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/xstormy16/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/component/cgen-cpu/xstormy16/Makefile.am 19 Aug 2005 18:58:56 -0000 1.3
+++ sid/component/cgen-cpu/xstormy16/Makefile.am 20 Sep 2013 08:33:05 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I ../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libxstormy16.la
 
Index: sid/component/cgen-cpu/xstormy16/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/cgen-cpu/xstormy16/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/component/cgen-cpu/xstormy16/configure.in 17 Dec 2001 09:31:20 -0000 1.1
+++ sid/component/cgen-cpu/xstormy16/configure.in 20 Sep 2013 08:33:05 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/families/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/families/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/component/families/Makefile.am 6 Feb 2002 00:52:30 -0000 1.2
+++ sid/component/families/Makefile.am 20 Sep 2013 08:33:05 -0000
@@ -1,5 +1,5 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 SUBDIRS = @family_subdirs@
Index: sid/component/families/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/families/configure.in,v
retrieving revision 1.3
diff -u -p -r1.3 configure.in
--- sid/component/families/configure.in 5 Feb 2007 20:28:40 -0000 1.3
+++ sid/component/families/configure.in 20 Sep 2013 08:33:06 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.am)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/families/mep/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/families/mep/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- sid/component/families/mep/Makefile.am 5 Feb 2007 20:28:40 -0000 1.1
+++ sid/component/families/mep/Makefile.am 20 Sep 2013 08:33:06 -0000
@@ -1,6 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 pkglib_LTLIBRARIES = libmepfamily.la
 
Index: sid/component/families/mep/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/families/mep/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/component/families/mep/configure.in 5 Feb 2007 20:28:40 -0000 1.1
+++ sid/component/families/mep/configure.in 20 Sep 2013 08:33:07 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(components.cxx)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/component/tcl/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/tcl/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- sid/component/tcl/Makefile.am 13 Nov 2008 18:06:41 -0000 1.6
+++ sid/component/tcl/Makefile.am 22 Sep 2013 05:15:47 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 pkglib_LTLIBRARIES = libtclapi.la
 
Index: sid/component/tcl/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/tcl/configure.in,v
retrieving revision 1.5
diff -u -p -r1.5 configure.in
--- sid/component/tcl/configure.in 13 Nov 2008 18:06:41 -0000 1.5
+++ sid/component/tcl/configure.in 20 Sep 2013 08:33:08 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/timers/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/timers/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/component/timers/Makefile.am 17 Jul 2001 01:22:06 -0000 1.3
+++ sid/component/timers/Makefile.am 20 Sep 2013 08:33:08 -0000
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = @cpu_subdirs@ .
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 pkglib_LTLIBRARIES = libtimers.la
 
Index: sid/component/timers/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/timers/configure.in,v
retrieving revision 1.3
diff -u -p -r1.3 configure.in
--- sid/component/timers/configure.in 4 Jun 2005 03:23:11 -0000 1.3
+++ sid/component/timers/configure.in 20 Sep 2013 08:33:09 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/component/timers/arm7t/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/component/timers/arm7t/Makefile.am,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.am
--- sid/component/timers/arm7t/Makefile.am 4 Aug 2001 11:37:13 -0000 1.3
+++ sid/component/timers/arm7t/Makefile.am 20 Sep 2013 08:33:09 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../../config
+ACLOCAL_AMFLAGS = -I ../../../config -I ../../../..
 
 noinst_LTLIBRARIES = libarm7ttimers.la
 
Index: sid/component/timers/arm7t/configure.in
===================================================================
RCS file: /cvs/src/src/sid/component/timers/arm7t/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/component/timers/arm7t/configure.in 4 Aug 2001 11:37:14 -0000 1.2
+++ sid/component/timers/arm7t/configure.in 20 Sep 2013 08:33:09 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../../config)
+AC_CONFIG_AUX_DIR(../../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 
 dnl automake support
Index: sid/demos/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/demos/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/demos/Makefile.am 26 Jun 2001 20:46:17 -0000 1.2
+++ sid/demos/Makefile.am 20 Sep 2013 08:33:09 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 
 #SUBDIRS = @subdirs@
 SUBDIRS =
Index: sid/demos/configure.in
===================================================================
RCS file: /cvs/src/src/sid/demos/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/demos/configure.in 4 Jun 2005 03:23:12 -0000 1.2
+++ sid/demos/configure.in 20 Sep 2013 08:33:10 -0000
@@ -1,6 +1,6 @@
-dnl Process this thid file  with autoconf to produce a configure script
+dnl Process this file with autoconf to produce a configure script
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/demos/voice-pager/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/demos/voice-pager/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/demos/voice-pager/Makefile.am 26 Jun 2001 20:46:18 -0000 1.2
+++ sid/demos/voice-pager/Makefile.am 20 Sep 2013 08:33:10 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 CXX = arm-elf-g++
 CXXFLAGS = -g -O2
Index: sid/demos/voice-pager/configure.in
===================================================================
RCS file: /cvs/src/src/sid/demos/voice-pager/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/demos/voice-pager/configure.in 4 Jun 2005 03:23:13 -0000 1.2
+++ sid/demos/voice-pager/configure.in 20 Sep 2013 08:33:11 -0000
@@ -1,6 +1,6 @@
 dnl Process this thid file  with autoconf to produce a configure script
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidcomp,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/doc/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/doc/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- sid/doc/Makefile.am 27 Feb 2003 07:26:36 -0000 1.1
+++ sid/doc/Makefile.am 20 Sep 2013 08:33:11 -0000
@@ -1,6 +1,5 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
 
 man_MANS = sid.1
Index: sid/include/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/include/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/include/Makefile.am 26 Jun 2001 20:46:19 -0000 1.2
+++ sid/include/Makefile.am 20 Sep 2013 08:33:11 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 
 include_HEADERS = sidcomp.h sidso.h sidtypes.h
 noinst_HEADERS = sidbusutil.h sidcomputil.h sidpinutil.h sidattrutil.h sidschedutil.h sidmiscutil.h sidconfig.h sidconfutil.h
Index: sid/include/configure.in
===================================================================
RCS file: /cvs/src/src/sid/include/configure.in,v
retrieving revision 1.5
diff -u -p -r1.5 configure.in
--- sid/include/configure.in 4 Jun 2005 03:23:13 -0000 1.5
+++ sid/include/configure.in 20 Sep 2013 08:33:11 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sid,0.1)
 AM_CONFIG_HEADER(sidconfutil.h:sidconfutil.in)
 
Index: sid/main/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/main/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/main/Makefile.am 26 Jun 2001 20:46:19 -0000 1.2
+++ sid/main/Makefile.am 20 Sep 2013 08:33:11 -0000
@@ -1,5 +1,5 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 SUBDIRS = @subdirs@
Index: sid/main/configure.in
===================================================================
RCS file: /cvs/src/src/sid/main/configure.in,v
retrieving revision 1.1
diff -u -p -r1.1 configure.in
--- sid/main/configure.in 7 Dec 2000 19:31:10 -0000 1.1
+++ sid/main/configure.in 20 Sep 2013 08:33:11 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sid,0.1)
 
 dnl automake support
Index: sid/main/dynamic/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/main/dynamic/Makefile.am,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile.am
--- sid/main/dynamic/Makefile.am 5 Feb 2007 20:28:42 -0000 1.16
+++ sid/main/dynamic/Makefile.am 20 Sep 2013 08:33:11 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../../config
+ACLOCAL_AMFLAGS = -I ../../config -I ../../..
 
 INCLUDES = -I. -I../../include -I$(srcdir)/../../include -I$(srcdir)/../../../include
 LIBIBERTY = -L../../../libiberty/pic -L../../../libiberty -liberty
Index: sid/main/dynamic/configure.in
===================================================================
RCS file: /cvs/src/src/sid/main/dynamic/configure.in,v
retrieving revision 1.5
diff -u -p -r1.5 configure.in
--- sid/main/dynamic/configure.in 4 Jun 2005 03:23:13 -0000 1.5
+++ sid/main/dynamic/configure.in 20 Sep 2013 08:33:12 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../../config)
+AC_CONFIG_AUX_DIR(../../..)
 AM_INIT_AUTOMAKE(sidmain,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 
Index: sid/samples/Makefile.am
===================================================================
RCS file: /cvs/src/src/sid/samples/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- sid/samples/Makefile.am 29 Aug 2006 19:33:01 -0000 1.2
+++ sid/samples/Makefile.am 20 Sep 2013 08:33:12 -0000
@@ -1,7 +1,7 @@
 ## Process this with automake to create Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I $(srcdir)/../config
+ACLOCAL_AMFLAGS = -I ../config -I ../..
 
 pkglib_LTLIBRARIES = libexample.la
 pkgdata_DATA = $(libexample_la_SOURCES)
Index: sid/samples/configure.in
===================================================================
RCS file: /cvs/src/src/sid/samples/configure.in,v
retrieving revision 1.2
diff -u -p -r1.2 configure.in
--- sid/samples/configure.in 4 Jun 2005 03:23:14 -0000 1.2
+++ sid/samples/configure.in 20 Sep 2013 08:33:13 -0000
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(../config)
+AC_CONFIG_AUX_DIR(../..)
 AM_INIT_AUTOMAKE(sidsamples,0.1)
 AM_CONFIG_HEADER(config.h:config.in)
 


--
Alan Modra
Australia Development Lab, IBM