Changeset d307283d3e0731d50727b21fd500bad39a5c51d2

Timestamp:

27/07/01 18:23:14 (7 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 996250994 +0000

git-parent:

[c085b215f4527c99b144a3683560901f5da8f1f8]

git-author:

Sam Hocevar <sam@videolan.org> 996250994 +0000

Message:

• Additional fixes to the sdl-config detection.
  

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (15 diffs)
• configure.in (modified) (1 diff)

ChangeLog

@@ -9 +9 @@
-Fri, 27 Jul 2001 03:30:44 +0200
-
+  * Additional fixes to the sdl-config detection.
-  * Added a make uninstall rule.
-  * Changed libdvdcss API to force binary incompatibility. Yeah, this is

configure

@@ -4132 +4132 @@
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4134: checking for $ac_word" >&5
-
-
-
-
+11
+
+
+11
-  /*)
-_CONFIG="$SDL
+11_CONFIG="$SDL11
-  ;;
-  ?:/*)          
-_CONFIG="$SDL
+11_CONFIG="$SDL11
-  ;;
-  *)
@@ -4148 +4148 @@
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-
+11
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-_CONFIG" && ac_cv_path_SDL
+11_CONFIG" && ac_cv_path_SDL11
-  ;;
-esac
-fi
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    SDL_HEADER="SDL11/SDL.h"
-  fi
@@ -4170 +4171 @@
-set dummy sdl12-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-3
-
-
-
-
+4
+12
+
+
+12
-  /*)
-_CONFIG="$SDL
+12_CONFIG="$SDL12
-  ;;
-  ?:/*)          
-_CONFIG="$SDL
+12_CONFIG="$SDL12
-  ;;
-  *)
@@ -4187 +4188 @@
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-
+12
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-_CONFIG" && ac_cv_path_SDL
+12_CONFIG" && ac_cv_path_SDL12
-  ;;
-esac
-fi
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    SDL_HEADER="SDL12/SDL.h"
-  fi
@@ -4210 +4212 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-3
+5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-18
+20
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4280 +4282 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-3
+5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-88
+90
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-3
+5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4328 +4330 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-1
+3
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-6
+8
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-1
+3
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4442 +4444 @@
-set dummy gtk-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
@@ -4502 +4504 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-5
+7
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-0
+2
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-5
+7
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4564 +4566 @@
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-7
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4614 +4616 @@
-     ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-7
+9
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-#include <sys/asoundlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-7
+9
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
@@ -4641 +4643 @@
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-4
+6
-ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4649 +4651 @@
-LIBS="-lasound  $LIBS"
-cat > conftest.$ac_ext <<EOF
-2
+4
-#include "confdefs.h"
-
@@ -4656 +4658 @@
-; return 0; }
-EOF
-59
+61
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4896 +4898 @@
-s%@ESD_CONFIG@%$ESD_CONFIG%g
-s%@SDL_CONFIG@%$SDL_CONFIG%g
+s%@SDL11_CONFIG@%$SDL11_CONFIG%g
+s%@SDL12_CONFIG@%$SDL12_CONFIG%g
-s%@GTK_CONFIG@%$GTK_CONFIG%g
-s%@SYS@%$SYS%g

configure.in

@@ -537 +537 @@
-  SDL_HEADER="SDL/SDL.h"
-  if test x${SDL_CONFIG} = xno; then
-
+
+
-    SDL_HEADER="SDL11/SDL.h"
-  fi
-  if test x${SDL_CONFIG} = xno; then
-
+
+
-    SDL_HEADER="SDL12/SDL.h"
-  fi