diff options
| -rw-r--r-- | configure.ac | 49 | ||||
| -rw-r--r-- | lib/gtk-vlc-player/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 16 |
3 files changed, 50 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 80b9b08..bf881a0 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PROG_CC_C99 if [[ $ac_cv_prog_cc_c99 = no ]]; then AC_MSG_ERROR([C compiler does not support C99 mode!]) fi -AC_PROG_CC_C_O +AM_PROG_CC_C_O AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc) @@ -34,23 +34,23 @@ AC_SUBST(XSLT_FLAGS) # Checks for libraries. # PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0]) -CFLAGS="$CFLAGS $LIBGTK_CFLAGS" -LIBS="$LIBS $LIBGTK_LIBS" # FIXME: further restrict libvlc version PKG_CHECK_MODULES(LIBVLC, [libvlc >= 1.1.13 vlc-plugin]) -CFLAGS="$CFLAGS $LIBVLC_CFLAGS" -LIBS="$LIBS $LIBVLC_LIBS" -PKG_CHECK_MODULES(LIBXML2, [libxml-2.0], [ - CFLAGS="$CFLAGS $LIBXML2_CFLAGS" - LIBS="$LIBS $LIBXML2_LIBS" -], [ +PKG_CHECK_MODULES(LIBXML2, [libxml-2.0], , [ AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config) if [[ x$XML2_CONFIG != x ]]; then - CFLAGS="$CFLAGS `$XML2_CONFIG --cflags`" - LIBS="$LIBS `$XML2_CONFIG --libs`" + LIBXML2_CFLAGS="`$XML2_CONFIG --cflags`" + AC_SUBST(LIBXML2_CFLAGS) + LIBXML2_LIBS="`$XML2_CONFIG --libs`" + AC_SUBST(LIBXML2_LIBS) else + temp_CFLAGS="$CFLAGS" + temp_LIBS="$LIBS" + CFLAGS= + LIBS= + AC_CHECK_LIB(xml2, xmlParseFile, , [ AC_MSG_ERROR([Required libxml-2.0 package or library missing!]) ]) @@ -59,6 +59,14 @@ PKG_CHECK_MODULES(LIBXML2, [libxml-2.0], [ libxml/xpath.h libxml/xpathInternals.h], , [ AC_MSG_ERROR([Required libxml headers are missing!]) ]) + + LIBXML2_CFLAGS="$CFLAGS" + AC_SUBST(LIBXML2_CFLAGS) + LIBXML2_LIBS="$LIBS" + AC_SUBST(LIBXML2_LIBS) + + CFLAGS="$temp_CFLAGS" + LIBS="$temp_LIBS" fi ]) @@ -105,17 +113,26 @@ if [[ $html_doc = yes -a x$XSLTPROC = x ]]; then fi AM_CONDITIONAL(BUILD_HTML, test $html_doc = yes) -# FIXME -AC_DEFINE(USE_BUILDER, , [foo]) -AC_DEFINE(TRANSCRIPT_JUSTIFY, 1, [foo]) +AC_ARG_ENABLE(console, + AS_HELP_STRING([--enable-console], + [Enable console-mode binaries [default=no]]), + [console=$enableval], [console=no]) +if [[ $console = no ]]; then + case $host in + *-*-windows*) GTKAPP_LDFLAGS="$GTKAPP_LDFLAGS -mwindows" ;; + esac +fi # Export symbols # necessary for auto-registering GTK+ signal handlers by GTK+ builder case $host in -*-*-linux*) LIBS="$LIBS -Wl,--export-dynamic" ;; -*-*-windows*) LIBS="$LIBS -Wl,--export-all-symbols" ;; +*-*-linux*) GTKAPP_LDFLAGS="$GTKAPP_LDFLAGS -Wl,--export-dynamic" ;; +*-*-windows*) GTKAPP_LDFLAGS="$GTKAPP_LDFLAGS -Wl,--export-all-symbols" ;; esac +AC_SUBST(GTKAPP_CFLAGS) +AC_SUBST(GTKAPP_LDFLAGS) + AC_CONFIG_FILES([Makefile \ lib/Makefile lib/gtk-vlc-player/Makefile \ src/Makefile \ diff --git a/lib/gtk-vlc-player/Makefile.am b/lib/gtk-vlc-player/Makefile.am index 83742d1..839a245 100644 --- a/lib/gtk-vlc-player/Makefile.am +++ b/lib/gtk-vlc-player/Makefile.am @@ -1,7 +1,9 @@ AM_CFLAGS = -Wall lib_LTLIBRARIES = libgtk-vlc-player.la - libgtk_vlc_player_la_SOURCES = gtk-vlc-player.c gtk-vlc-player.h +libgtk_vlc_player_la_CFLAGS = @LIBGTK_CFLAGS@ @LIBVLC_CFLAGS@ +libgtk_vlc_player_la_LIBADD = @LIBGTK_LIBS@ @LIBVLC_LIBS@ + include_HEADERS = gtk-vlc-player.h diff --git a/src/Makefile.am b/src/Makefile.am index 17dbd2c..f5c53cc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,18 @@ AM_CFLAGS = -Wall -AM_CPPFLAGS = -I$(top_srcdir)/lib/gtk-vlc-player bin_PROGRAMS = experiment-player experiment_player_SOURCES = main.c -experiment_player_LDADD = $(top_srcdir)/lib/gtk-vlc-player/libgtk-vlc-player.la + +experiment_player_CFLAGS = +experiment_player_CPPFLAGS = +experiment_player_LDFLAGS = +experiment_player_LDADD = + +experiment_player_CPPFLAGS += -I@top_srcdir@/lib/gtk-vlc-player +experiment_player_LDADD += @top_srcdir@/lib/gtk-vlc-player/libgtk-vlc-player.la + +experiment_player_CFLAGS += @LIBGTK_CFLAGS@ +experiment_player_LDADD += @LIBGTK_LIBS@ + +experiment_player_CFLAGS += @GTKAPP_CFLAGS@ +experiment_player_LDFLAGS += @GTKAPP_LDFLAGS@ |