Skip to content

V
vlc-2-2
Commit ffca54bd authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Mozilla plugin: Check for required X11/xpm.h support.

parent ea995e72
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
configure.ac
View file @ ffca54bd
...@@ -5805,6 +5805,7 @@ then ...@@ -5805,6 +5805,7 @@ then
MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h" MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h"
fi fi
if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm]) VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
fi fi
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}]) VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
...@@ -5847,6 +5848,7 @@ then ...@@ -5847,6 +5848,7 @@ then
[], [],
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm] [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
]) ])
AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
LDFLAGS="${LDFLAGS_save}" LDFLAGS="${LDFLAGS_save}"
fi fi
......
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