Commit 5f94d097 authored by Cheng Sun's avatar Cheng Sun

Add USE_GTK to config.h, so that reconfiguring with a change in...

Add USE_GTK to config.h, so that reconfiguring with a change in --with(out)-gtk correctly triggers a rebuild
parent 1b3d60f8
...@@ -254,8 +254,9 @@ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ], [ ...@@ -254,8 +254,9 @@ AS_IF([ test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ], [
]) ])
]) ])
]) ])
AM_CONDITIONAL(USE_GTK, [ test "x$gtk_found" = "xyes" ]) AS_IF([ test "x$gtk_found" = "xyes" ],
AC_DEFINE([USE_GTK], [1], [Define to 1 if using GTK+]))
AM_CONDITIONAL(WITH_GTK, [ test "x$gtk_found" = "xyes" ])
dnl dnl
dnl final flags for ActiveX dnl final flags for ActiveX
......
...@@ -47,14 +47,14 @@ npvlc_LTLIBRARIES = libvlcplugin.la ...@@ -47,14 +47,14 @@ npvlc_LTLIBRARIES = libvlcplugin.la
AM_CPPFLAGS += -DXP_UNIX -DDATA_PATH=\"$(pkgdatadir)\" AM_CPPFLAGS += -DXP_UNIX -DDATA_PATH=\"$(pkgdatadir)\"
libvlcplugin_la_LIBADD += $(MOZILLA_LIBS) libvlcplugin_la_LIBADD += $(MOZILLA_LIBS)
if USE_GTK if WITH_GTK
AM_CPPFLAGS += $(GTK_CFLAGS) -DUSE_GTK AM_CPPFLAGS += $(GTK_CFLAGS)
libvlcplugin_la_LIBADD += $(GTK_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 libvlcplugin_la_LIBADD += $(GTK_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
SOURCES_support = \ SOURCES_support = \
support/npunix.cpp \ support/npunix.cpp \
vlcplugin_gtk.cpp \ vlcplugin_gtk.cpp \
vlcplugin_gtk.h vlcplugin_gtk.h
else # !USE_GTK else # !WITH_GTK
AM_CPPFLAGS += $(XCB_CFLAGS) AM_CPPFLAGS += $(XCB_CFLAGS)
libvlcplugin_la_LIBADD += $(XCB_LIBS) libvlcplugin_la_LIBADD += $(XCB_LIBS)
SOURCES_support = \ SOURCES_support = \
......
#ifndef __VLCPLUGIN_H__ #ifndef __VLCPLUGIN_H__
#define __VLCPLUGIN_H__ #define __VLCPLUGIN_H__
#include "config.h"
#include "vlcplugin_base.h" #include "vlcplugin_base.h"
#if defined(XP_UNIX) #if defined(XP_UNIX)
......
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