Changeset 4157 for pjproject/trunk/aconfigure.ac

Timestamp:

Jun 6, 2012 9:37:25 AM (12 years ago)

Author:

nanang

Message:

Close #1529:

• replaced obsoleted SDL constants SDL_*_OVERLAY
• updated build config/scripts

File:

• pjproject/trunk/aconfigure.ac (modified) (1 diff)

pjproject/trunk/aconfigure.ac

@@ -853 +853 @@
               ],
               [
-                  SDL_CONFIG="sdl-config"
                   if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then
-                        SDL_CONFIG=$with_sdl/bin/sdl-config
                         AC_MSG_RESULT([Using SDL prefix... $with_sdl])
+                        AC_PATH_PROGS(SDL_CONFIG,sdl-config sdl2-config,,$with_sdl/bin)
+                  else
+                        AC_PATH_PROGS(SDL_CONFIG, sdl-config sdl2-config)
                   fi
-              
-                  AC_MSG_CHECKING([SDL availability..])
-                  if (sh -c "$SDL_CONFIG --version" | grep 1.3) then
-                          AC_SUBST(ac_sdl_cflags)
-                          AC_SUBST(ac_sdl_ldflags)
-                          ac_sdl_cflags=`$SDL_CONFIG --cflags`
-                          ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
-                          ac_sdl_ldflags=`$SDL_CONFIG --libs`
-                          LIBS="$LIBS $ac_sdl_ldflags"
-                   else
+                  
+                  AC_MSG_CHECKING([SDL availability])
+                  if test "x$SDL_CONFIG" = "x"; then
+                        AC_MSG_RESULT([not found])
+                  elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then
+                        AC_SUBST(ac_sdl_cflags)
+                        AC_SUBST(ac_sdl_ldflags)
+                        ac_sdl_cflags=`$SDL_CONFIG --cflags`
+                        ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+                        ac_sdl_ldflags=`$SDL_CONFIG --libs`
+                        LIBS="$LIBS $ac_sdl_ldflags"
+                  else
                         AC_MSG_RESULT([Unsupported SDL version])
-                   fi
+                  fi
               ])