You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
61 lines
2.0 KiB
61 lines
2.0 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../flightgear/X11.patch |
|
# Copyright (C) 2006 The T2 SDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
--- FlightGear-0.9.9/configure.orig 2006-02-13 17:19:28.000000000 +0100 |
|
+++ FlightGear-0.9.9/configure 2006-02-15 02:56:21.000000000 +0100 |
|
@@ -4556,11 +4556,11 @@ |
|
;; |
|
|
|
*) |
|
- if test -d /usr/X11R6 ; then |
|
- EXTRA_DIR1="/usr/X11R6" |
|
+ if test -d /usr/X11 ; then |
|
+ EXTRA_DIR1="/usr/X11" |
|
fi |
|
- if test -d /opt/X11R6 ; then |
|
- EXTRA_DIR2="/opt/X11R6" |
|
+ if test -d /opt/X11 ; then |
|
+ EXTRA_DIR2="/opt/X11" |
|
fi |
|
EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2 /usr/local" |
|
;; |
|
@@ -4601,7 +4601,7 @@ |
|
fi |
|
|
|
|
|
- mylibdir="${exdir}/lib${subexdir}" |
|
+ mylibdir="${exdir}/lib${libsuff}${subexdir}" |
|
|
|
mylibdir="$mylibdir" |
|
if test -r $mylibdir ; then |
|
@@ -5166,7 +5166,7 @@ |
|
sed 's/^/| /' conftest.$ac_ext >&5 |
|
|
|
LIBS=$ac_save_LIBS |
|
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` |
|
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib${libsuff}/g` |
|
do |
|
# Don't even attempt the hair of trying to link an X program! |
|
for ac_extension in a so sl; do |
|
@@ -8934,7 +8934,7 @@ |
|
conftest$ac_exeext conftest.$ac_ext |
|
if test "$ac_cv_search_glutGetModifiers" = no; then |
|
for ac_lib in glut freeglut ; do |
|
- LIBS="-l$ac_lib $ac_func_search_save_LIBS" |
|
+ LIBS="-L$ac_x_libraries -l$ac_lib $ac_func_search_save_LIBS" |
|
cat >conftest.$ac_ext <<_ACEOF |
|
/* confdefs.h. */ |
|
_ACEOF
|
|
|