* Bug report howto is a online document.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 079a21479e2feca0b8d9fc2f471f41a34cafdf44..8ea337c200138882998ac67e12cdb3463e601b9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -294,6 +294,7 @@ dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof lseek)
 AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
 AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
+AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
 
 dnl Check for setlocal and langinfo
 AC_CHECK_FUNCS(setlocale)
@@ -709,11 +710,19 @@ if test "${ac_cv_c_pipe}" != "no"; then
 fi
 
 dnl Check for various optimization flags
+AC_CACHE_CHECK([if \$CC accepts -Os],
+    [ac_cv_c_os],
+    [CFLAGS="${CFLAGS_save} -Os"
+     AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)])
+if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then
+    CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os"
+fi
+
 AC_CACHE_CHECK([if \$CC accepts -O3],
     [ac_cv_c_o3],
     [CFLAGS="${CFLAGS_save} -O3"
      AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
-if test "${ac_cv_c_o3}" != "no"; then
+if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then
     CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
 fi
 
@@ -721,17 +730,17 @@ AC_CACHE_CHECK([if \$CC accepts -O2],
     [ac_cv_c_o2],
     [CFLAGS="${CFLAGS_save} -O2"
      AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
-if test "${ac_cv_c_o2}" != "no"; then
+if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then
     if test "${ac_cv_c_o3}" = "no"; then
         CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
     fi
     CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
-else
+else 
     AC_CACHE_CHECK([if \$CC accepts -O],
         [ac_cv_c_o],
         [CFLAGS="${CFLAGS_save} -O"
          AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
-    if test "${ac_cv_c_o}" != "no"; then
+    if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then
         if test "${ac_cv_c_o3}" = "no"; then
             CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
        fi
@@ -2627,6 +2636,22 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
   fi
 fi
 
+dnl
+dnl  SVG module
+dnl
+AC_ARG_ENABLE(svg,
+  [  --enable-svg       SVG support (default disabled)])
+if test "${enable_svg}" == "yes"
+then
+  PKG_CHECK_MODULES(SVG, 
+       librsvg-2.0 >= 2.5.0,
+       [
+         AX_ADD_LDFLAGS([svg],[$SVG_LIBS])
+         AX_ADD_CFLAGS([svg],[$SVG_CFLAGS])
+          AX_ADD_PLUGINS([svg]) ],
+        [AC_MSG_WARN(SVG library not found)])
+fi
+
 dnl
 dnl  Qt Embedded module
 dnl  (disabled by default)
@@ -3550,21 +3575,26 @@ fi
 dnl
 dnl corba (ORBit) plugin
 dnl
+dnl Default: do not enable corba
+enablecorba=false
 AC_ARG_ENABLE(corba,
   [  --enable-corba          corba interface support (default disabled)])
 if test "${enable_corba}" = "yes"; then
       GLIB_VERSION=2.3.2
-      PKG_CHECK_MODULES(LIBMEDIACONTROL, 
+      PKG_CHECK_MODULES(CORBA, 
        ORBit-2.0 >= 2.8.0 \
        glib-2.0 >= $GLIB_VERSION \
        gobject-2.0 >= $GLIB_VERSION \
        gthread-2.0 >= $GLIB_VERSION,
        [
-         AX_ADD_LDFLAGS([corba],[$LIBMEDIACONTROL_LIBS])
-         AX_ADD_CFLAGS([corba],[$LIBMEDIACONTROL_CFLAGS])
+         enablecorba=true
+         AX_ADD_LDFLAGS([corba],[$CORBA_LIBS])
+         AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
           AX_ADD_PLUGINS([corba snapshot]) ],
-        [AC_MSG_WARN(corba library not found)])
+        [ enablecorba=false
+         AC_MSG_WARN(corba library not found) ])
 fi
+AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue)
 
 AC_ARG_WITH(,[Misc options:])