modules/gui/beos/VlcWrapper.h: compile fix

[vlc] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index dc0638fd82b226e94d358511ea87e6646dc2d96b..d199c6aaeea54f834a12ab65eeb9bb0ff915ebb3 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -182,8 +182,9 @@ if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
 else
   AC_CHECK_FUNCS(textdomain,,[
     AC_CHECK_LIB(intl,textdomain,
-      LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
-      LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
+      LDFLAGS_vlc="${LDFLAGS_vlc} ${LIBINTL}"
+      LDFLAGS_plugins="${LDFLAGS_plugins} ${LIBINTL}",,
+      ${LIBINTL}
     )
   ])
 fi
@@ -1263,7 +1264,11 @@ then
           PLUGINS="${PLUGINS} mux_ts_dvbpsi"
           LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ],
         [  AC_MSG_WARN([cannot find libdvbpsi headers]) ],
-        [#include <stdint.h>
+        [#if defined( HAVE_STDINT_H )
+#   include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+#   include <inttypes.h>
+#endif
 #include <dvbpsi/dvbpsi.h>
 #include <dvbpsi/descriptor.h>
 #include <dvbpsi/pat.h>
@@ -2380,15 +2385,15 @@ if test "x${enable_skins}" != "xno"; then
         WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
       fi ])
   # look for wx-config
-  AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
-  if test "x${WX_CONFIG}" != "xno"
+  AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
+  if test "x${WX_CONFIG_SKINS}" != "xno"
   then
-    if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+    if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
     then
       AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.])
     fi
-    CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG} --cxxflags` -DWX_SKINS"
-    LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG} --libs`"
+    CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS"
+    LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`"
   fi
 
   if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then