gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-50-gdbb2d15)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  dbb2d15d8d477ace013d0ddadea7e34f5d777b31 (commit)
      from  281b0efaf9830b80ab2449106bbc3c1c2c360702 (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
=========

 gnetlist/scheme/Makefile.am          |    1 -
 gnetlist/scheme/gnet-gsch2pcb.scm.in |    4 +---
 m4/pcb-data-dirs.m4                  |   13 -------------
 3 files changed, 1 insertions(+), 17 deletions(-)


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

commit dbb2d15d8d477ace013d0ddadea7e34f5d777b31
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Remove pcbconfdir configure option and its use in gsch2pcb's m4 path
    
    PCB doesn't use this path, so remove it.

:100644 100644 66a1cd8... ec804bf... M	gnetlist/scheme/Makefile.am
:100644 100644 ae4eeb7... ad9446d... M	gnetlist/scheme/gnet-gsch2pcb.scm.in
:100644 100644 84b4da0... ee20959... M	m4/pcb-data-dirs.m4

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

commit dbb2d15d8d477ace013d0ddadea7e34f5d777b31
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Remove pcbconfdir configure option and its use in gsch2pcb's m4 path
    
    PCB doesn't use this path, so remove it.

diff --git a/gnetlist/scheme/Makefile.am b/gnetlist/scheme/Makefile.am
index 66a1cd8..ec804bf 100644
--- a/gnetlist/scheme/Makefile.am
+++ b/gnetlist/scheme/Makefile.am
@@ -33,7 +33,6 @@ gnet-gsch2pcb.scm: $(srcdir)/gnet-gsch2pcb.scm.in
 	sed \
 		-e 's;@m4@;${M4};g' \
 		-e 's;@pcbm4dir@;${PCBM4DIR};g' \
-		-e 's;@pcbconfdir@;${PCBCONFDIR};g' \
 		$(srcdir)/gnet-gsch2pcb.scm.in > $@
 
 all-local:
diff --git a/gnetlist/scheme/gnet-gsch2pcb.scm.in b/gnetlist/scheme/gnet-gsch2pcb.scm.in
index ae4eeb7..ad9446d 100644
--- a/gnetlist/scheme/gnet-gsch2pcb.scm.in
+++ b/gnetlist/scheme/gnet-gsch2pcb.scm.in
@@ -122,11 +122,10 @@
 ;; where pcb stores its m4 files and the pcb config directory.
 (if (not (defined? 'gsch2pcb:pcb-m4-command)) (define gsch2pcb:pcb-m4-command "@m4@"))
 (if (not (defined? 'gsch2pcb:pcb-m4-dir)) (define gsch2pcb:pcb-m4-dir "@pcbm4dir@"))
-(if (not (defined? 'gsch2pcb:pcb-m4-confdir)) (define gsch2pcb:pcb-m4-confdir "@pcbconfdir@"))
 
 ;; Let the user override the m4 search path
 (if (not (defined? 'gsch2pcb:pcb-m4-path))
-    (define gsch2pcb:pcb-m4-path (list gsch2pcb:pcb-m4-dir gsch2pcb:pcb-m4-confdir "$HOME/.pcb" "."))
+    (define gsch2pcb:pcb-m4-path (list gsch2pcb:pcb-m4-dir "$HOME/.pcb" "."))
 )
 
 ;; Build up the m4 command line
@@ -181,7 +180,6 @@
 	    "   ----------------------------------------\n"
 	    "   gsch2pcb:pcb-m4-command:    " gsch2pcb:pcb-m4-command "\n"
 	    "   gsch2pcb:pcb-m4-dir:        " gsch2pcb:pcb-m4-dir "\n"
-	    "   gsch2pcb:pcb-m4-confdir:    " gsch2pcb:pcb-m4-confdir "\n"
 	    "   gsch2pcb:pcb-m4-path:       " gsch2pcb:pcb-m4-path-str "\n"
 	    "   gsch2pcb:m4-command-line:   " gsch2pcb:pcb-m4-command-line  "\n"
 	    "\n"
diff --git a/m4/pcb-data-dirs.m4 b/m4/pcb-data-dirs.m4
index 84b4da0..ee20959 100644
--- a/m4/pcb-data-dirs.m4
+++ b/m4/pcb-data-dirs.m4
@@ -62,17 +62,4 @@ AC_DEFUN([AX_PCB_DIRS],
       fi ], [])
   AC_MSG_RESULT([$PCBLIBPATH])
   AC_SUBST([PCBLIBPATH])
-
-  # PCB configuration files
-  AC_MSG_CHECKING([where to look for PCB configuration])
-  PCBCONFDIR="${sysconfdir}/pcb"
-  AC_ARG_WITH([pcb-confdir],
-    AS_HELP_STRING([--with-pcb-confdir=DIR],
-      [directory where PCB site configuration files are installed [[SYSCONFDIR/pcb]]]),
-   [ if (test "X$with_pcb_confdir" != "Xno" &&
-          test "X$with_pcb_confdir" != "Xyes"); then
-        PCBCONFDIR="$with_pcb_confdir"
-     fi ], [])
-  AC_MSG_RESULT([$PCBCONFDIR])
-  AC_SUBST([PCBCONFDIR])
 ])dnl AX_PCB_DIRS




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