summaryrefslogtreecommitdiff
path: root/audio/amarok/files/patch-configure
blob: 3d709a8a99cf032c41ffd8737d44bba6c20ff0fb (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
$FreeBSD$

--- configure.orig
+++ configure
@@ -39576,7 +39576,7 @@
 if test "$with_libvisual" = "yes"; then
     ## libvisual plugin depends on sdl
     # Extract the first word of "sdl-config", so it can be a program name with args.
-set dummy sdl-config; ac_word=$2
+set dummy $SDL_CONFIG; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_SDL_CONFIG+set}" = set; then
@@ -39613,15 +39613,15 @@
 
 
 
-    if test x$SDL_CONFIG = xyes; then
-        sdl_cflags=`sdl-config --cflags`
-        sdl_libs=`sdl-config --libs`
+    if test -n $SDL_CONFIG ; then
+	sdl_cflags=`$SDL_CONFIG --cflags`
+	sdl_libs=`$SDL_CONFIG --libs`
     fi
 
 
 
 
-    if test x$PKGCONFIGFOUND = xyes -a x$SDL_CONFIG = xyes; then
+    if test x$PKGCONFIGFOUND = xyes -a -n $SDL_CONFIG ; then
 
 
   succeeded=no
@@ -40872,7 +40872,7 @@
 
 
 OLDCFLAGS="$CFLAGS"
-CFLAGS="-I$ruby_includes -Wall"
+CFLAGS+="-I$ruby_includes -Wall"
 OLDCPPFLAGS="$CPPFLAGS"
 CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used