[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/kioslave/media
From: Stephan Kulow <coolo () kde ! org>
Date: 2005-07-21 15:17:16
Message-ID: 1121959036.645441.23558.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 437341 by coolo:
don't overstress automake
M +12 -1 configure.in.in
M +1 -7 kcmodule/Makefile.am
--- trunk/KDE/kdebase/kioslave/media/configure.in.in #437340:437341
@@ -6,7 +6,6 @@
LINUXCDPOLLING=yes
AC_SUBST(LINUXCDPOLLING)
])
-AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
AC_ARG_WITH(hal,AC_HELP_STRING([--with-hal],[Enable HAL support [default=check]]),[hal_test="$withval"],[hal_test="yes"])
@@ -149,4 +148,16 @@
AC_MSG_RESULT(no)
fi
+AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
+
+MEDIA_CPPFLAGS=
+if test "$LINUXCDPOLLING" = "yes"; then
+MEDIA_CPPFLAGS="$MEDIA_CPPFLAGS -DCOMPILE_LINUXCDPOLLING"
+fi
+if test "$HALBACKEND" = yes; then
+MEDIA_CPPFLAGS="$MEDIA_CPPFLAGS -DCOMPILE_HALBACKEND"
+fi
+
+AC_SUBST(MEDIA_CPPFLAGS)
+
--- trunk/KDE/kdebase/kioslave/media/kcmodule/Makefile.am #437340:437341
@@ -1,13 +1,7 @@
INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes)
METASOURCES = AUTO
-CXXFLAGS=
-if include_media_linuxcdpolling
-CXXFLAGS+=-DCOMPILE_LINUXCDPOLLING
-endif
-if include_media_halbackend
-CXXFLAGS+=-DCOMPILE_HALBACKEND
-endif
+AM_CPPFLAGS = $(MEDIA_CPPFLAGS)
kde_module_LTLIBRARIES = kcm_media.la
kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic