aboutsummaryrefslogtreecommitdiffstats
path: root/packages/fltk
AgeCommit message (Expand)Author
2008-10-18bb files: Revert the introduction of FILE_PRHolger Hans Peter Freyther
2008-10-15[PR] Change PR to FILE_PR and intro PR as FILE_PR + DISTRO_PR @media only all and (prefers-color-scheme: dark) { .highlight .hll { background-color: #49483e } .highlight .c { color: #75715e } /* Comment */ .highlight .err { color: #960050; background-color: #1e0010 } /* Error */ .highlight .k { color: #66d9ef } /* Keyword */ .highlight .l { color: #ae81ff } /* Literal */ .highlight .n { color: #f8f8f2 } /* Name */ .highlight .o { color: #f92672 } /* Operator */ .highlight .p { color: #f8f8f2 } /* Punctuation */ .highlight .ch { color: #75715e } /* Comment.Hashbang */ .highlight .cm { color: #75715e } /* Comment.Multiline */ .highlight .cp { color: #75715e } /* Comment.Preproc */ .highlight .cpf { color: #75715e } /* C
2008-06-06fltk: update to 1.1.9 and make it build againHenning Heinold
2008-02-28fltk: Use autotools_stage_allRichard Purdie
2008-02-20add efltk, the enhanced FLTKMichael Lauer
2007-05-07fltk: clean up. Bump PR. Partly closes 2234.Rolf Leggewie
2007-01-06fltk 1.1.7: Better configure options and revamped staging.Joaquim Duran
2007-01-04fltk: 1.1.4: also build gl pluginsKoen Kooi
2006-11-05fltk: add 1.1.4 + fldevice patch, needed for giac 0.6.xKoen Kooi
2006-10-17fltk: dropped empty dir - close #1490Marcin Juszkiewicz
2006-10-12fltk: added 1.1.7 - close #1459Joaquim Duran
2006-10-12fltk: dropped non-fetchable 1.2 snapshotMarcin Juszkiewicz
2006-10-10Remove MAINTAINER fields from recipes, add MAINTAINER file to replace them.Koen Kooi
2005-07-14update my email address in MAINTAINER fields.Rene Wagner
2005-06-30import clean BK tree at cset 1.3670Koen Kooi
2005-02-23Merge bk://oe-devel.bkbits.net/openembeddednslu2-linux.adm@bkbits.net
2004-12-09Merge oe-devel@oe-devel.bkbits.net:openembeddedChris Larson
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-23 07:30:04 +0000
obal */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Thu, 9 Jun 2011 18:12:45 +0200
Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 configure.ac |   72 ++++-----------------------------------------------------
 1 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/configure.ac b/configure.ac
index eeaf3dc..841efe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1101,73 +1101,11 @@ dnl ---------------------------------------------------------------------------
 dnl - Check for X Server location
 dnl ---------------------------------------------------------------------------
 
-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
-# symlink to each other, and configure should use the more stable
-# location (the real directory) if possible.
-#
-# On Solaris, the /usr/bin/Xserver script is used to decide whether to
-# use Xsun or Xorg, so this is used on Solaris.
-#
-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
-# and /usr/X11 since they often symlink to each other, and configure
-# should use the more stable location (the real directory) if possible.
-#
-if test -x /usr/X11/bin/Xserver; then
-   X_PATH="/usr/X11/bin"
-   X_SERVER_PATH="/usr/X11/bin"
-   X_SERVER="/usr/X11/bin/Xserver"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
-   X_PATH="/usr/X11R6/bin"
-   X_SERVER_PATH="/usr/X11R6/bin"
-   X_SERVER="/usr/X11R6/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
-   X_PATH="/usr/X11/bin"
-   X_SERVER_PATH="/usr/X11/bin"
-   X_SERVER="/usr/X11/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/X11R6/bin/X; then
-   X_PATH="/usr/X11R6/bin"
-   X_SERVER_PATH="/usr/X11R6/bin"
-   X_SERVER="/usr/X11R6/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/bin/Xorg; then
-   X_PATH="/usr/bin"
-   X_SERVER_PATH="/usr/bin"
-   X_SERVER="/usr/bin/Xorg"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/X11/bin/X; then
-   X_PATH="/usr/X11/bin"
-   X_SERVER_PATH="/usr/X11/bin"
-   X_SERVER="/usr/X11/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/openwin/bin/Xsun; then
-   # Do not add /usr/openwin/bin here because on Solaris you need
-   # /usr/openwin/bin in your PATH even if you are using the Xorg
-   # Xserver.  We add this to the path below.
-   X_PATH="/usr/openwin/bin"
-   X_SERVER_PATH="/usr/openwin/bin"
-   X_SERVER="/usr/openwin/bin/Xsun"
-   X_CONFIG_OPTIONS="-audit 0 -nobanner"
-elif test -x /opt/X11R6/bin/X; then
-   X_PATH="/opt/X11R6/bin"
-   X_SERVER_PATH="/opt/X11R6/bin"
-   X_SERVER="/opt/X11R6/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/bin/X; then
-   X_PATH="/usr/bin"
-   X_SERVER_PATH="/usr/bin"
-   X_SERVER="/usr/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-else
-   # what to do, what to do, this is wrong, but this just sets the
-   # defaults, perhaps this user is cross compiling or some such
-   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
-   X_SERVER_PATH="/usr/bin"
-   X_SERVER="/usr/bin/X"
-   X_CONFIG_OPTIONS="-audit 0"
-fi
+# We hardcode the X paths since we know where it will be in the OE univers
+X_PATH="/usr/bin"
+X_SERVER_PATH="/usr/bin"
+X_SERVER="/usr/bin/X"
+X_CONFIG_OPTIONS="-audit 0"
 
 dnl ---------------------------------------------------------------------------
 dnl - Check for Xnest / Xephyr support
-- 
1.6.6.1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-23 07:30:03 +0000