[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (602d9929cd447854b5bd7df3764e92882c2fd668)
The branch, master has been updated
via 602d9929cd447854b5bd7df3764e92882c2fd668 (commit)
from f6732881063141084bb6efc98e7b150ef61e5c32 (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
=========
ChangeLog | 8 ++++++++
configure.ac | 43 ++++++++++++++++++++++++++++---------------
src/hid/lpr/hid.conf | 1 +
3 files changed, 37 insertions(+), 15 deletions(-)
=================
Commit Messages
=================
commit 602d9929cd447854b5bd7df3764e92882c2fd668
Author: Jared Casper <jaredcasper@xxxxxxxxx>
Commit: Anthony Blake <tonyb33@xxxxxxxxx>
Some cleanup of configure script
Added top level check for pkg-config with PKG_PROG_PKG_CONFIG and removed
AC_PATH_PROG call for pkg-config from inside a block conditional on
enable_dbus.
Added a PKG_CHECK_MODULE for cairo if the toporouter output is enabled.
Added a check for HID dependencies. A hid's hid.conf can set a variable "deps"
which is a list of other HIDs that must be included with that hid. Added ps
the lpr's deps.
:100644 100644 2140da7... cd22fb5... M ChangeLog
:100644 100644 2685bd7... 08fcd6e... M configure.ac
:100644 100644 c3cac0f... 037993c... M src/hid/lpr/hid.conf
=========
Changes
=========
commit 602d9929cd447854b5bd7df3764e92882c2fd668
Author: Jared Casper <jaredcasper@xxxxxxxxx>
Commit: Anthony Blake <tonyb33@xxxxxxxxx>
Some cleanup of configure script
Added top level check for pkg-config with PKG_PROG_PKG_CONFIG and removed
AC_PATH_PROG call for pkg-config from inside a block conditional on
enable_dbus.
Added a PKG_CHECK_MODULE for cairo if the toporouter output is enabled.
Added a check for HID dependencies. A hid's hid.conf can set a variable "deps"
which is a list of other HIDs that must be included with that hid. Added ps
the lpr's deps.
diff --git a/ChangeLog b/ChangeLog
index 2140da7..cd22fb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-17 15:17 jaredcasper
+
+ * configure.ac,src/hid/lpr/hid.conf: Added top level check for
+ pkg-config with PKG_PROG_PKG_CONFIG and removed AC_PATH_PROG call for
+ pkg-config from inside a block conditional on enable_dbus. Added a
+ PKG_CHECK_MODULE for cairo if the toporouter output is enabled. Added a
+ check for HID dependencies.
+
2009-05-05 17:17 ineiev
* src/gts/cdt.c: fix find_closest() for glib < 2.4.0.
diff --git a/configure.ac b/configure.ac
index 2685bd7..08fcd6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,9 +225,7 @@ fi
AC_MSG_CHECKING([whether to enable toporouter])
AC_ARG_ENABLE([toporouter],
- [AS_HELP_STRING([--enable-toporouter],
- [build toporouter [[yes]]])
- ]
+ [AS_HELP_STRING([--enable-toporouter], [build toporouter [default=yes]]) ]
)
AS_CASE(["x$enable_toporouter"],[xyes | xno],,
[enable_toporouter=yes
@@ -238,12 +236,10 @@ AM_CONDITIONAL([WITH_TOPOROUTER], test $enable_toporouter != no)
AC_MSG_CHECKING([whether to enable toporouter output])
AC_ARG_ENABLE([toporouter-output],
- [AS_HELP_STRING([--enable-toporouter-output],
- [enable toporouter graphical output [[yes]]])
- ]
+ [AS_HELP_STRING([--enable-toporouter-output], [enable toporouter graphical output [default=no]]) ]
)
AS_CASE(["z$enable_toporouter_output"],[zyes | zno],,
- [enable_toporouter_output=yes]
+ [enable_toporouter_output=no]
)
AC_MSG_RESULT([$enable_toporouter_output])
AS_CASE([$enable_toporouter_output],[yes],
@@ -258,6 +254,15 @@ AC_DEFINE_UNQUOTED([TOPO_OUTPUT_ENABLED], [$topo_output_enabled],
[Define to 1 to enable toporouter graphical output]
)
+PKG_PROG_PKG_CONFIG()
+
+if test "x$enable_toporouter_output" = "xyes"; then
+ PKG_CHECK_MODULES(CAIRO, cairo,,
+ [AC_MSG_ERROR([Cannot find cairo, needed by the toporouter
+Please review the following errors:
+$CAIRO_PKG_ERRORS])]
+ )
+fi
AC_MSG_CHECKING([for whether to use DBUS])
AC_ARG_ENABLE([dbus],
@@ -275,12 +280,6 @@ if test "x$enable_dbus" = "xyes"; then
Either do not use --enable-dbus or enable the gtk or lesstif GUI HID.])
esac
- # 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(DBUS, dbus-1 >= 0.61,
[saved_LIBS="$LIBS"
LIBS="$LIBS $DBUS_LIBS"
@@ -336,6 +335,20 @@ which exporters you want and do not list png there.])
esac
fi
+for hid in $HIDLIST; do
+ F=$srcdir/src/hid/$hid/hid.conf
+ if test -f $F ; then
+ echo checking $hid depedencies
+ deps=
+ . $F
+ for dep in $deps; do
+ if test "X`echo $HIDLIST | grep $dep`" = "X"; then
+ AC_MSG_ERROR([you have requested the $hid HID but not the $dep HID, which it depends on])
+ fi
+ done
+ fi
+done
+
for e in $HIDLIST; do
HIDLIBS="$HIDLIBS lib$e.a"
done
@@ -787,8 +800,8 @@ AM_CONDITIONAL(DEBUG_BUILD, test x$enable_debug = xyes)
# ------------- Complete set of CFLAGS and LIBS -------------------
-CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS"
-LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS"
+CFLAGS="$CFLAGS $X_CFLAGS $DBUS_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $CAIRO_CFLAGS"
+LIBS="$LIBS $XM_LIBS $DBUS_LIBS $X_LIBS $GLIB_LIBS $GTK_LIBS $DMALLOC_LIBS $GD_LIBS $INTLLIBS $CAIRO_LIBS"
# if we have gcc then add -Wall
diff --git a/src/hid/lpr/hid.conf b/src/hid/lpr/hid.conf
index c3cac0f..037993c 100644
--- a/src/hid/lpr/hid.conf
+++ b/src/hid/lpr/hid.conf
@@ -1 +1,2 @@
type=printer
+deps=ps
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs