gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-84-g9626ff1)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  9626ff1a94e81c1da8738f21d8f88c2f1e1cbd16 (commit)
       via  d0fdb127e16c46f85ceddca00bff1103ac075b68 (commit)
      from  33715a1a58c7c13f45772eba02ef463c3a422c7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gschem/autogen.sh             |    2 +-
 gschem/configure.ac.in        |    1 +
 libgeda/Makefile.am           |    2 ++
 libgeda/autogen.sh            |    2 +-
 libgeda/configure.ac.in       |    1 +
 libgeda/src/o_complex_basic.c |    2 +-
 6 files changed, 7 insertions(+), 3 deletions(-)


=================
 Commit Messages
=================

commit 9626ff1a94e81c1da8738f21d8f88c2f1e1cbd16
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Ensure that buffer pointer is initialised to NULL.

:100644 100644 d363d9f... a3bf769... M	libgeda/src/o_complex_basic.c

commit d0fdb127e16c46f85ceddca00bff1103ac075b68
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Pass correct search path flags to aclocal.
    
    The autotools install several m4 files into the top-level m4
    directories in each project. aclocal (and automake) need to be taught
    to look there before searching the system directories.

:100755 100755 c25896b... 80f01da... M	gschem/autogen.sh
:100644 100644 8d947cc... 56bffe9... M	gschem/configure.ac.in
:100644 100644 dee2935... 3a0edf6... M	libgeda/Makefile.am
:100755 100755 c25896b... 80f01da... M	libgeda/autogen.sh
:100644 100644 1a03e2d... 1bacfe7... M	libgeda/configure.ac.in

=========
 Changes
=========

commit 9626ff1a94e81c1da8738f21d8f88c2f1e1cbd16
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Ensure that buffer pointer is initialised to NULL.

diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index d363d9f..a3bf769 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -390,7 +390,7 @@ OBJECT *o_complex_new(TOPLEVEL *toplevel,
   int save_adding_sel = 0;
   int loaded_normally = FALSE;
 
-  gchar *buffer;
+  gchar *buffer = NULL;
 
   new_node = s_basic_new_object(type, "complex");
 

commit d0fdb127e16c46f85ceddca00bff1103ac075b68
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    Pass correct search path flags to aclocal.
    
    The autotools install several m4 files into the top-level m4
    directories in each project. aclocal (and automake) need to be taught
    to look there before searching the system directories.

diff --git a/gschem/autogen.sh b/gschem/autogen.sh
index c25896b..80f01da 100755
--- a/gschem/autogen.sh
+++ b/gschem/autogen.sh
@@ -147,7 +147,7 @@ do
     echo processing $dr
     ( cd $dr
 
-      aclocalinclude="$ACLOCAL_FLAGS"
+      aclocalinclude="$ACLOCAL_FLAGS -I m4"
 
       if test "$recreate_configure_only" = "0"; then
         # Only run these if we are NOT in the recreate_configure_only mode
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 8d947cc..56bffe9 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -1,6 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_SRCDIR([src/gschem.c])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.54)
 
 PACKAGE=geda-gschem
diff --git a/libgeda/Makefile.am b/libgeda/Makefile.am
index dee2935..3a0edf6 100644
--- a/libgeda/Makefile.am
+++ b/libgeda/Makefile.am
@@ -39,3 +39,5 @@ MAINTAINERCLEANFILES = *.log core FILE *~ Makefile.in configure config.h.in \
 		       mkinstalldirs configure.ac $(INTLTOOL_FILES)
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-update-mime-database
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/libgeda/autogen.sh b/libgeda/autogen.sh
index c25896b..80f01da 100755
--- a/libgeda/autogen.sh
+++ b/libgeda/autogen.sh
@@ -147,7 +147,7 @@ do
     echo processing $dr
     ( cd $dr
 
-      aclocalinclude="$ACLOCAL_FLAGS"
+      aclocalinclude="$ACLOCAL_FLAGS -I m4"
 
       if test "$recreate_configure_only" = "0"; then
         # Only run these if we are NOT in the recreate_configure_only mode
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 1a03e2d..1bacfe7 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -1,6 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_SRCDIR([src/libgeda.c])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.54)
 
 PACKAGE=libgeda




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs