Skip to content

V
vlc-1.1
Commit 1f1c0508 authored by Pavlov Konstantin's avatar Pavlov Konstantin
Browse files
Options

revert 15853 as it brokes things

parent 1b168781
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 14 deletions
configure.ac
View file @ 1f1c0508
...@@ -5149,13 +5149,12 @@ then ...@@ -5149,13 +5149,12 @@ then
have_xul=true have_xul=true
MOZILLA_CONFIG="${XULRUNNER_CONFIG}" MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
fi fi
fi
if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}" LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
AC_CHECK_LIB(Xt,XtStrings, AC_CHECK_LIB(Xt,XtStrings,
[ [
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}] VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE]) VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
], ],
[], [],
...@@ -5163,7 +5162,7 @@ then ...@@ -5163,7 +5162,7 @@ then
]) ])
LDFLAGS="${LDFLAGS_save}" LDFLAGS="${LDFLAGS_save}"
fi fi
fi
mozilla=: mozilla=:
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment