Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 166622 Details for
Bug 217861
circular depencies: app-admin/gamin-0.1.9-r1 and dev-libs/glib-2.16.3
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
failed.patch
failed.patch (text/plain), 3.19 KB, created by
Pacho Ramos
on 2008-09-27 18:53:05 UTC
(
hide
)
Description:
failed.patch
Filename:
MIME Type:
Creator:
Pacho Ramos
Created:
2008-09-27 18:53:05 UTC
Size:
3.19 KB
patch
obsolete
>From 7c72b9bade4f7449915e213d161beb3eb1560cea Mon Sep 17 00:00:00 2001 >From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi.cardona@lri.fr> >Date: Wed, 27 Aug 2008 12:00:37 +0200 >Subject: [PATCH] add configure switches to restrict building the server or the libs > > >diff --git a/Makefile.am b/Makefile.am >index e5a31a7..c347f25 100644 >--- a/Makefile.am >+++ b/Makefile.am >@@ -1,14 +1,27 @@ > ## Process this file with automake to produce Makefile.in > >-SUBDIRS = lib libgamin server tests doc >+SUBDIRS = lib doc > >+if BUILD_LIBGAMIN > pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = gamin.pc > >+SUBDIRS += libgamin >+ > if WITH_PYTHON > SUBDIRS += python > endif > >+endif >+ >+if BUILD_SERVER >+SUBDIRS += lib server >+endif >+ >+if BUILD_TESTS >+SUBDIRS += tests >+endif >+ > #if BUILD_DOCS > #install-data-local: > # -doxygen >diff --git a/configure.in b/configure.in >index e0cfecd..7beefbf 100644 >--- a/configure.in >+++ b/configure.in >@@ -94,16 +94,44 @@ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) > AC_CHECK_FUNCS(usleep setsid setenv putenv getlogin_r) > AC_STRUCT_ST_MTIM_NSEC > >+ > dnl >-dnl Start of pkg-config checks >+dnl libgamin/libfam configuration > dnl >-PKG_CHECK_MODULES(DAEMON, glib-2.0) >-AC_SUBST(DAEMON_CFLAGS) >-AC_SUBST(DAEMON_LIBS) >+AC_ARG_ENABLE(libgamin, >+ AC_HELP_STRING([--enable-libgamin], [Build libgamin/libfam (default=yes)]), >+ [enable_libgamin="$enableval"], [enable_libgamin=yes]) >+AM_CONDITIONAL(BUILD_LIBGAMIN, test x$enable_libgamin = xyes) >+ >+ >+dnl >+dnl Server configuration >+dnl >+AC_ARG_ENABLE(server, >+ AC_HELP_STRING([--enable-server], [Build gam_server (default=yes)]), >+ [enable_server="$enableval"], [enable_server=yes]) >+ >+if test x$enable_server = xyes ; then >+ PKG_CHECK_MODULES(DAEMON, glib-2.0) >+ AC_SUBST(DAEMON_CFLAGS) >+ AC_SUBST(DAEMON_LIBS) >+fi >+AM_CONDITIONAL(BUILD_SERVER, test x$enable_server = xyes) >+ >+ >+dnl >+dnl Tests >+dnl >+enable_tests="no" >+if test x$enable_server = xyes && test x$enable_libgamin = xyes ; then >+ PKG_CHECK_MODULES(TEST, glib-2.0) >+ AC_SUBST(TEST_LIBS) >+ AC_SUBST(TEST_CFLAGS) >+ enable_tests="yes" >+ >+fi >+AM_CONDITIONAL(BUILD_TESTS, test x$enable_tests = xyes) > >-PKG_CHECK_MODULES(TEST, glib-2.0) >-AC_SUBST(TEST_LIBS) >-AC_SUBST(TEST_CFLAGS) > > AC_ARG_ENABLE(more-warnings, > AC_HELP_STRING([--disable-more-warnings], [Minimum compiler warnings]), >@@ -487,13 +515,13 @@ if test "$with_python" != "no" ; then > else > PYTHON= > fi >-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") > if test "$PYTHON_INCLUDES" != "" > then >- enable_python="yes" >+ enable_python="$enable_libgamin" > else > enable_python="no" > fi >+AM_CONDITIONAL(WITH_PYTHON, test "$enable_python" = "yes") > AC_SUBST(pythondir) > AC_SUBST(PYTHON_VERSION) > AC_SUBST(PYTHON_INCLUDES) >@@ -569,6 +597,11 @@ gamin-$VERSION: > source code location: ${srcdir} > compiler: ${CC} > compiler flags: ${AM_CFLAGS} ${CFLAGS} >+ >+ build gam_server: ${enable_server} >+ build libgamin/libfam: ${enable_libgamin} >+ build python bindings: ${enable_python} >+ build tests: ${enable_tests} > > backends: ${backends} > build documentation: ${build_docs} >-- >1.6.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 217861
:
166622
|
166623
|
166635
|
166636
|
166637