mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 00:18:26 +00:00
6013a4b9a3deps: * add pkg from x11-libs/ to prevent auto-rdep could be an useflag per pkg but forced here, as xcursor and xrandr * fontconfig is required by xft option (truetype useflag) * rm libpng as support is now built-in patches instead of sed Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40761 Signed-off-by: Sam James <sam@gentoo.org>
27 lines
943 B
Diff
27 lines
943 B
Diff
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -3,7 +3,10 @@
|
|
# For non-gcc compilers, change the options to "no-dependencies"
|
|
AUTOMAKE_OPTIONS = foreign dist-zip
|
|
|
|
-SUBDIRS = utils include lib chart doc tests shutterbug adie pathfinder calculator controlpanel glviewer
|
|
+if COND_TOOLS
|
|
+ INC_TOOLS = adie calculator pathfinder shutterbug
|
|
+endif
|
|
+SUBDIRS = utils include lib chart doc tests controlpanel glviewer $(INC_TOOLS)
|
|
EXTRA_DIST = ADDITIONS AUTHORS INSTALL LICENSE LICENSE_ADDENDUM TRACING README fox.spec fox-config index.html aclocal.m4
|
|
|
|
bin_SCRIPTS = fox-config
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -51,6 +51,10 @@
|
|
LT_AGE=`expr $FOX_INTERFACE_VERSION - $FOX_BINARY_VERSION`
|
|
LT_INIT([win32-dll])
|
|
|
|
+AC_ARG_WITH(tools,[ --with-tools choices are yes, no])
|
|
+AC_MSG_RESULT([$with_tools])
|
|
+AM_CONDITIONAL(COND_TOOLS, test "x$with_tools" != "xno")
|
|
+
|
|
# Check win32 compile
|
|
case "$host_os" in
|
|
*mingw32*) OS_WINDOWS=1 ;;
|