[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-248-gbcaf9f8)

To: geda-cvs@xxxxxxxx
Subject: gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-248-gbcaf9f8)
From: git@xxxxxxxxxx
Date: Sun, 26 Oct 2008 03:42:46 -0700
Delivered-to: archiver@xxxxxxxx
Delivered-to: geda-cvs@xxxxxxxx
Delivery-date: Sun, 26 Oct 2008 06:42:54 -0400
List-archive: <http://www.seul.org/pipermail/geda-cvs>
List-help: <mailto:geda-cvs-request@moria.seul.org?subject=help>
List-id: gEDA CVS commits mailing list <geda-cvs.moria.seul.org>
List-post: <mailto:geda-cvs@moria.seul.org>
List-subscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs>, <mailto:geda-cvs-request@moria.seul.org?subject=subscribe>
List-unsubscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs>, <mailto:geda-cvs-request@moria.seul.org?subject=unsubscribe>
Reply-to: gEDA CVS commits mailing list <geda-cvs@xxxxxxxxxxxxxx>
Sender: geda-cvs-bounces@xxxxxxxxxxxxxx
The branch, master has been updated
       via  bcaf9f8dafcd25335b61b2ea80d071bde720bbd1 (commit)
       via  19765672b4293cae3cf7237a633f7741ce3e4883 (commit)
       via  d322f0919b078b4ae553224477678008915dfb0c (commit)
      from  5f4679ea28dd036a40973e2e8888439ee426a7b2 (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
=========

 gattrib/configure.ac    |   29 +++++++++++++++++++-------
 gnetlist/configure.ac   |   29 +++++++++++++++++++-------
 gschem/configure.ac.in  |   29 +++++++++++++++++++-------
 gsymcheck/configure.ac  |   29 +++++++++++++++++++-------
 libgeda/configure.ac.in |   50 +++++++++++++++++++++++++++++-----------------
 libgeda/src/f_print.c   |    4 +++
 libgeda/src/s_clib.c    |    7 ++++++
 utils/configure.ac      |   29 +++++++++++++++++++-------
 8 files changed, 147 insertions(+), 59 deletions(-)


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

commit bcaf9f8dafcd25335b61b2ea80d071bde720bbd1
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:31 2008 +0000

    Use pkg-config support for Guile if present.
    
    Using pkg-config allows easier cross-compilation, since the build
    process can use a pkg-config binary native to the build machine with .pc
    files for the host machine.

:100644 100644 11a850e... e0a861b... M	gattrib/configure.ac
:100644 100644 e37d935... d046ece... M	gnetlist/configure.ac
:100644 100644 0cbbc38... 258e7b2... M	gschem/configure.ac.in
:100644 100644 cefe722... 7ecbb0f... M	gsymcheck/configure.ac
:100644 100644 6e9b968... c59039a... M	libgeda/configure.ac.in
:100644 100644 6ac437f... 5288702... M	utils/configure.ac

commit 19765672b4293cae3cf7237a633f7741ce3e4883
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:30 2008 +0000

    libgeda: Conditionally include sys/wait.h depending on its presence.
    
    Some platforms (e.g. MinGW) do not have sys/wait.h. In those cases,
    define the WIFSIGNALED, WTERMSIG, WIFEXITED, WEXITSTATUS macros as
    constants, allowing us to use command backed symbol library sources,
    but with reduced error handling.

:100644 100644 9dc9ff6... 9351b85... M	libgeda/src/s_clib.c

commit d322f0919b078b4ae553224477678008915dfb0c
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:27 2008 +0000

    Add configure test for platform's support of the getlogin() function.
    
    If the getlogin() function isn't present on the host platform (e.g.
    MinGW), don't emit the %%Author comment in libgeda's postscript output.

:100644 100644 0a01eae... 6e9b968... M	libgeda/configure.ac.in
:100644 100644 8c6e0b2... 10752f0... M	libgeda/src/f_print.c

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

commit bcaf9f8dafcd25335b61b2ea80d071bde720bbd1
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:31 2008 +0000

    Use pkg-config support for Guile if present.
    
    Using pkg-config allows easier cross-compilation, since the build
    process can use a pkg-config binary native to the build machine with .pc
    files for the host machine.

diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 11a850e..e0a861b 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -97,7 +97,27 @@ fi
 
 ############################################################################
 # Check for guile start
-GUILE_FLAGS
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+   # Find about the installed guile
+   GUILE_FLAGS
+   GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -105,7 +125,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -171,12 +190,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
 ############################################################################
 ##  This is looks for GTK2.4.
 #                                                                                      
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
 # Search for gtk+ 2.4.x 
 PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
 
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index e37d935..d046ece 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -139,7 +139,27 @@ fi
 
 ############################################################################
 # Check for guile start
-GUILE_FLAGS
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+   # Find about the installed guile
+   GUILE_FLAGS
+   GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -147,7 +167,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -214,12 +233,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
 # Check for gtk+ 2.4 start
 # 
 
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
 PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
 
 # This next bit of code figures out what gtk we need to use.
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 0cbbc38..258e7b2 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -91,7 +91,27 @@ fi
 
 ############################################################################
 # Check for guile start
-GUILE_FLAGS
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+   # Find about the installed guile
+   GUILE_FLAGS
+   GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -99,7 +119,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -238,12 +257,6 @@ fi
 # Check for gtk+ 2.4 start
 # 
 
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0, GTK="yes", no_GTK="yes")
 
 # This next bit of code figures out what gtk we need to use.
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index cefe722..7ecbb0f 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -51,7 +51,27 @@ fi
 
 ############################################################################
 # Check for guile start
-GUILE_FLAGS
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+   # Find about the installed guile
+   GUILE_FLAGS
+   GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -59,7 +79,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -127,12 +146,6 @@ AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", DL_LIB="")
 # Check for gtk+ 2.4 start
 # 
 
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
 PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
 
 # This next bit of code figures out what gtk we need to use.
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 6e9b968..c59039a 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -94,12 +94,39 @@ IT_PROG_INTLTOOL(0.35.0)
 #########################################################################
 
 ############################################################################
+# Check for pkg-config start
+#
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+    AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+#
+# Check for pkg-config end
+############################################################################
+
+############################################################################
 # Check for guile start
 #
 
-# Find about the installed guile
-AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
-GUILE_FLAGS
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_LDFLAGS=$GUILE_LIBS
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+   # Find about the installed guile
+   AC_GEDA_MACRO_CHECK([GUILE_FLAGS], [guile.m4])
+   GUILE_FLAGS
+   GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -107,7 +134,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -174,20 +200,6 @@ fi
 ############################################################################
 
 ############################################################################
-# Check for pkg-config start
-#
-
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-    AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
-#
-# Check for pkg-config end
-############################################################################
-
-############################################################################
 # Check for glib 2.4 start
 # 
 
diff --git a/utils/configure.ac b/utils/configure.ac
index 6ac437f..5288702 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -88,7 +88,27 @@ fi
 
 ############################################################################
 # Check for guile start
-GUILE_FLAGS
+
+# Check for pkg-config
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test $PKG_CONFIG = no; then
+   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
+fi
+
+PKG_CHECK_MODULES(GUILE, guile-1.8, GUILE_PC="yes", no_GUILE_PC="yes")
+
+if test "$GUILE_PC" = "yes" 
+then
+
+   GUILE_VERSION=`$PKG_CONFIG guile-1.8 --modversion`
+
+else
+
+  # Find about the installed guile
+  GUILE_FLAGS
+  GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+
+fi
 
 # Check Guile version
 guile_need_major=1
@@ -96,7 +116,6 @@ guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
-GUILE_VERSION=`$GUILE_CONFIG info guileversion`
 
 guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
@@ -180,12 +199,6 @@ fi
 # Check for gtk+ 2.4 start
 # 
 
-# Check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test $PKG_CONFIG = no; then
-   AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed and in your PATH])
-fi
-
 PKG_CHECK_MODULES(GTK24, gtk+-2.0 >= 2.4.0, GTK24="yes", no_GTK24="yes")
 
 # This next bit of code figures out what gtk we need to use.

commit 19765672b4293cae3cf7237a633f7741ce3e4883
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:30 2008 +0000

    libgeda: Conditionally include sys/wait.h depending on its presence.
    
    Some platforms (e.g. MinGW) do not have sys/wait.h. In those cases,
    define the WIFSIGNALED, WTERMSIG, WIFEXITED, WEXITSTATUS macros as
    constants, allowing us to use command backed symbol library sources,
    but with reduced error handling.

diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index 9dc9ff6..9351b85 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -123,7 +123,14 @@
 #include <dmalloc.h>
 #endif
 
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#else
+#define WIFSIGNALED(x) 0
+#define WTERMSIG(x)    0
+#define WIFEXITED(x)   1
+#define WEXITSTATUS(x) 0
+#endif
 
 #include <time.h>
 

commit d322f0919b078b4ae553224477678008915dfb0c
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date:   Sun Oct 26 10:41:27 2008 +0000

    Add configure test for platform's support of the getlogin() function.
    
    If the getlogin() function isn't present on the host platform (e.g.
    MinGW), don't emit the %%Author comment in libgeda's postscript output.

diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index 0a01eae..6e9b968 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -328,7 +328,7 @@ AC_C_CONST
 
 # Checks for library functions.
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(strstr chown)
+AC_CHECK_FUNCS(strstr chown getlogin)
 
 # 
 # Checks for header files end
diff --git a/libgeda/src/f_print.c b/libgeda/src/f_print.c
index 8c6e0b2..10752f0 100644
--- a/libgeda/src/f_print.c
+++ b/libgeda/src/f_print.c
@@ -119,7 +119,9 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
   fprintf(fp, "%%%%Creator: gEDA gschem %s\n"
 	  "%%%%CreationDate: %s"
 	  "%%%%Title: %s\n"
+#ifdef HAVE_GETLOGIN
 	  "%%%%Author: %s\n"
+#endif
 	  "%%%%BoundingBox: %d %d %d %d\n"
 	  "%%%%Orientation: %s\n"
 	  "%%%%Pages: 1\n"
@@ -128,7 +130,9 @@ int f_print_header(TOPLEVEL *toplevel, FILE *fp,
 	  DATE_VERSION,
 	  ctime(&current_time),
 	  toplevel->page_current->page_filename,
+#ifdef HAVE_GETLOGIN
 	  getlogin(),
+#endif
 	  llx, lly, urx, ury,
 	  ((toplevel->print_orientation == LANDSCAPE)
 	   ? "Landscape" : "Portrait")




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs
Prev by Author: gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-245-g5f4679e)
Next by Author: gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-250-g2d2d9d9)
Previous by thread: gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-245-g5f4679e)
Next by thread: gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-250-g2d2d9d9)
Index(es):
- Author
- Thread