← Back to branch summary

~ubuntu-branches/ubuntu/karmic/libsdl1.2/karmic

« back to all changes in this revision

Viewing changes to sdl.m4

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2008-01-05 14:10:45 UTC
  • mto: (2.1.3 lenny)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: james.westby@ubuntu.com-20080105141045-mjdg2rp09mamme4a
Tags: upstream-1.2.13
Import upstream version 1.2.13

Show diffs side-by-side

added added

removed removed

Lines of Context:
sdl.m4
20
20
                    , enable_sdltest=yes)
21
21
 
22
22
  if test x$sdl_exec_prefix != x ; then
23
 
    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
 
23
    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
24
24
    if test x${SDL_CONFIG+set} != xset ; then
25
25
      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
26
26
    fi
27
27
  fi
28
28
  if test x$sdl_prefix != x ; then
29
 
    sdl_args="$sdl_args --prefix=$sdl_prefix"
 
29
    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
30
30
    if test x${SDL_CONFIG+set} != xset ; then
31
31
      SDL_CONFIG=$sdl_prefix/bin/sdl-config
32
32
    fi
42
42
  if test "$SDL_CONFIG" = "no" ; then
43
43
    no_sdl=yes
44
44
  else
45
 
    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
46
 
    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
 
45
    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
 
46
    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
47
47
 
48
 
    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
 
48
    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
49
49
           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
50
 
    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
 
50
    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
51
51
           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
52
52
    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
53
53
           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`