|
Lines 6046-6052
Link Here
|
| 6046 |
AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no) |
6046 |
AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no) |
| 6047 |
if test "${SEAMONKEY_CONFIG}" = "no" |
6047 |
if test "${SEAMONKEY_CONFIG}" = "no" |
| 6048 |
then |
6048 |
then |
| 6049 |
AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no) |
6049 |
AC_PATH_PROG(XULRUNNER_CONFIG, true, no) |
| 6050 |
if test "${XULRUNNER_CONFIG}" = "no" |
6050 |
if test "${XULRUNNER_CONFIG}" = "no" |
| 6051 |
then |
6051 |
then |
| 6052 |
AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) |
6052 |
AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) |
|
Lines 6062-6090
Link Here
|
| 6062 |
) |
6062 |
) |
| 6063 |
if test ! -z "${MOZILLA_CONFIG}" |
6063 |
if test ! -z "${MOZILLA_CONFIG}" |
| 6064 |
then |
6064 |
then |
| 6065 |
if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then |
|
|
| 6066 |
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}" |
6065 |
LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}" |
| 6067 |
AC_CHECK_LIB(Xt,XtStrings, |
6066 |
AC_CHECK_LIB(Xt,XtStrings, |
| 6068 |
[ |
6067 |
[ |
| 6069 |
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]) |
6068 |
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]) |
| 6070 |
VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE -lXpm]) |
6069 |
VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lXpm]) |
| 6071 |
], |
6070 |
], |
| 6072 |
[], |
6071 |
[], |
| 6073 |
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm] |
6072 |
[[] |
| 6074 |
]) |
6073 |
]) |
| 6075 |
AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) |
6074 |
AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) |
| 6076 |
LDFLAGS="${LDFLAGS_save}" |
6075 |
LDFLAGS="${LDFLAGS_save}" |
| 6077 |
fi |
|
|
| 6078 |
|
6076 |
|
| 6079 |
mozilla=: |
6077 |
mozilla=: |
| 6080 |
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" |
6078 |
PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla" |
| 6081 |
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 |
6079 |
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 |
| 6082 |
VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) |
6080 |
VLC_ADD_CPPFLAGS([mozilla],[[`pkg-config libxul-unstable --cflags | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) |
| 6083 |
if ${need_xpcom_libs}; then |
|
|
| 6084 |
VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) |
| 6085 |
else |
| 6086 |
VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`]) |
| 6087 |
fi |
| 6088 |
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" |
6081 |
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" |
| 6089 |
MOZILLA_REQUIRED_HEADERS=1 |
6082 |
MOZILLA_REQUIRED_HEADERS=1 |
| 6090 |
AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) |
6083 |
AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) |
|
Lines 6100-6106
Link Here
|
| 6100 |
fi |
6092 |
fi |
| 6101 |
MOZILLA_REQUIRED_HEADERS= |
6093 |
MOZILLA_REQUIRED_HEADERS= |
| 6102 |
CPPFLAGS="${CPPFLAGS_save}" |
6094 |
CPPFLAGS="${CPPFLAGS_save}" |
| 6103 |
MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`" |
6095 |
MOZILLA_SDK_PATH="`pkg-config libxul --variable=sdkdir`" |
| 6104 |
fi |
6096 |
fi |
| 6105 |
dnl End of moz_sdk = "" |
6097 |
dnl End of moz_sdk = "" |
| 6106 |
else |
6098 |
else |
