Patchwork [16/20] Add sdl to new feature convention

login
register
mail settings
Submitter Juan Quintela
Date Aug. 12, 2009, 4:29 p.m.
Message ID <14a06af1091d2a8565f29ca727057ca418ed48ca.1250093910.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/31218/
State Superseded
Headers show

Comments

Juan Quintela - Aug. 12, 2009, 4:29 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 configure |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

Patch

diff --git a/configure b/configure
index 7f0dc35..cc37a47 100755
--- a/configure
+++ b/configure
@@ -186,6 +186,7 @@  curses=""
 docs=""
 nptl=""
 pthread=""
+sdl=""
 vde=""
 vnc_tls=""
 vnc_sasl=""
@@ -222,7 +223,6 @@  kerneldir=""
 aix="no"
 blobs="yes"
 fdt="yes"
-sdl="yes"
 xen="yes"
 pkgversion=""

@@ -430,6 +430,8 @@  for opt do
   ;;
   --disable-sdl) sdl="no"
   ;;
+  --enable-sdl) sdl="yes"
+  ;;
   --fmod-lib=*) fmod_lib="$optarg"
   ;;
   --fmod-inc=*) fmod_inc="$optarg"
@@ -646,6 +648,7 @@  echo "  --disable-sparse         disable sparse checker (default)"
 echo "  --disable-strip          disable stripping binaries"
 echo "  --disable-werror         disable compilation abort on warning"
 echo "  --disable-sdl            disable SDL"
+echo "  --enable-sdl             enable SDL"
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 echo "  --audio-drv-list=LIST    set audio drivers list:"
 echo "                           Available drivers: $audio_possible_drivers"
@@ -908,8 +911,7 @@  fi

 sdl_too_old=no

-if test "$sdl" = "yes" ; then
-  sdl=no
+if test "$sdl" != "no" ; then
   cat > $TMPC << EOF
 #include <SDL.h>
 #undef main /* We don't want SDL to override our main() */
@@ -940,6 +942,11 @@  EOF
         sdl=no
       fi
     fi # static link
+  else # sdl not found
+    if test "$sdl" = "yes" ; then
+      feature_not_found "sdl"
+    fi
+    sdl=no
   fi # sdl compile test
 fi