From e5506cb3afd80d013e0fcc9915c7a6dc73ce78da Mon Sep 17 00:00:00 2001
From: Daniel Jahre <rock@lospalmos.net>
Date: Mon, 4 Apr 2005 09:22:28 +0000
Subject: [PATCH] Daniel Jahre: 	adopted pingus for the new clanlib06 path

[2005030223111021996] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5766 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 ...-library-path-detection-in-configure.patch | 119 ++++++++++++++++++
 package/kasc/pingus/pingus.conf               |   6 +
 2 files changed, 125 insertions(+)
 create mode 100644 package/kasc/pingus/fix-ld-library-path-detection-in-configure.patch

diff --git a/package/kasc/pingus/fix-ld-library-path-detection-in-configure.patch b/package/kasc/pingus/fix-ld-library-path-detection-in-configure.patch
new file mode 100644
index 000000000..3183d77c5
--- /dev/null
+++ b/package/kasc/pingus/fix-ld-library-path-detection-in-configure.patch
@@ -0,0 +1,119 @@
+--- ./configure.vanilla	2005-03-02 18:18:51.723372440 +0100
++++ ./configure	2005-03-02 18:47:02.916272040 +0100
+@@ -4635,7 +4635,7 @@
+ if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lcposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8179,7 +8179,7 @@
+ if test "${ac_cv_lib_pthread_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lpthread  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8342,7 +8342,7 @@
+ if test "${ac_cv_lib_Hermes_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lHermes  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8401,7 +8401,7 @@
+ if test "${ac_cv_lib_clanCore_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanCore  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8467,7 +8467,7 @@
+ if test "${ac_cv_lib_clanApp_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanApp  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8525,7 +8525,7 @@
+ if test "${ac_cv_lib_clanDisplay_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanDisplay  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8583,7 +8583,7 @@
+ if test "${ac_cv_lib_clanSound_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanSound  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8642,7 +8642,7 @@
+ if test "${ac_cv_lib_clanMikMod_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanMikMod  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8700,7 +8700,7 @@
+ if test "${ac_cv_lib_clanVorbis_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanVorbis  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8761,7 +8761,7 @@
+ if test "${ac_cv_lib_clanGL_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanGL  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8872,7 +8872,7 @@
+ if test "${ac_cv_lib_clanJPEG_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanJPEG  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -8940,7 +8940,7 @@
+ if test "${ac_cv_lib_clanPNG_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanPNG  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+@@ -9008,7 +9008,7 @@
+ if test "${ac_cv_lib_clanGUI_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
++  ac_check_lib_save_LIBS="$LIBS -L$LD_LIBRARY_PATH"
+ LIBS="-lclanGUI  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
diff --git a/package/kasc/pingus/pingus.conf b/package/kasc/pingus/pingus.conf
index 2a88f0be0..a68a1b6fa 100644
--- a/package/kasc/pingus/pingus.conf
+++ b/package/kasc/pingus/pingus.conf
@@ -23,6 +23,9 @@
 
 bindir=$root/$ROCKCFG_PKG_GAMES_BINDIR
 datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR
+
+export LD_LIBRARY_PATH="$root/opt/clanlib06/lib"
+
 [ "$ROCKCFG_DISABLE_NLS" == "1" ] && \
   var_append extraconfopt " " "--disable-nls"
 [ "$ROCKCFG_PKG_PINGUS_NOGETTEXT" == "1" ] && \
@@ -30,5 +33,8 @@ datadir=$root/$ROCKCFG_PKG_GAMES_DATADIR
 [ "$ROCKCFG_PKG_PINGUS_OPENGL" == "1" ] && \
   var_append extraconfopt " " "--with-clanGL"
 
+var_append confopt " " "--with-extra-includes=$root/opt/clanlib06/include"
+var_append confopt " " "--with-extra-libs=$root/opt/clanlib06/lib"
+
 #  --disable-rpath         do not hardcode runtime library paths