[xiph-commits] r3571 - in browser_plugin/trunk: . src

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-04-28 18:45:55 -0700 (Mon, 28 Apr 2008)
New Revision: 3571

Modified:
   browser_plugin/trunk/configure.ac
   browser_plugin/trunk/src/Makefile.am
Log:
use autoconf X macros to get X11 cflags and library flags


Modified: browser_plugin/trunk/configure.ac
===================================================================
--- browser_plugin/trunk/configure.ac	2008-04-29 01:45:49 UTC (rev 3570)
+++ browser_plugin/trunk/configure.ac	2008-04-29 01:45:55 UTC (rev 3571)
@@ -92,6 +92,16 @@
 AC_SUBST(XPIDL_INCLUDE)
 
 dnl
+dnl Detect X11
+dnl
+
+AC_PATH_XTRA
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_LDFLAGS)
+AC_SUBST(X_LIBS)
+AC_SUBST(X_EXTRA_LIBS)
+
+dnl
 dnl Detect GTK (needed for the linux plugin)
 dnl
 PKG_CHECK_MODULES(GTK, gtk+-2.0)

Modified: browser_plugin/trunk/src/Makefile.am
===================================================================
--- browser_plugin/trunk/src/Makefile.am	2008-04-29 01:45:49 UTC (rev 3570)
+++ browser_plugin/trunk/src/Makefile.am	2008-04-29 01:45:55 UTC (rev 3571)
@@ -13,8 +13,9 @@
 AM_CXXFLAGS = -Wall -Wno-non-virtual-dtor -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
 			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) $(LIBOGGPLAY_CFLAGS)
 AM_CFLAGS = -Wall -Werror -DXP_UX -DMOZ_X11 -DUSE_AUDIO -shared \
-			-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(OGGZ_CFLAGS) \
-			$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(LIBOGGPLAY_CFLAGS) -Wdeclaration-after-statement
+	-g $(SSE2_CFLAGS) -Wno-strict-aliasing $(X_CFLAGS) $(OGGZ_CFLAGS) \
+	$(ALSA_CFLAGS) $(IMLIB2_CFLAGS) $(LIBOGGPLAY_CFLAGS) \
+	-Wdeclaration-after-statement
 
 
 INCLUDES=-I$(srcdir)/include -I$(srcdir)/support -I$(srcdir)/audio @GTK_CFLAGS@ @FIREFOX_CFLAGS@
@@ -50,10 +51,10 @@
 	support/npn_gate.cpp			\
 	audio/sydney_audio_alsa.c		\
 	plugin_cmml.c
-libnpoggplugin_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
+libnpoggplugin_la_LIBADD = $(X_LIBS) $(LIBOGGPLAY_LIBS) $(ALSA_LIBS) $(IMLIB2_LIBS) $(PTHREAD_LIBS)
 
 libnpoggplugin_static_la_SOURCES = $(libnpoggplugin_la_SOURCES)
-libnpoggplugin_static_la_LIBADD = -lX11 -lXt $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
+libnpoggplugin_static_la_LIBADD = $(X_LIBS) $(LIBOGGPLAY_STATICLIBS) $(PTHREAD_LIBS) ${ALSA_LIBS}
 
 EXTRA_libnpoggplugin_la_SOURCES = nsILibOggPlugin.idl
 nodist_libnpoggplugin_la_SOURCES = nsILibOggPlugin.h