diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-20 22:40:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-20 22:40:27 +0000 |
| commit | 3cdd44798b7565639ca08dc051fbe21e41d546fa (patch) | |
| tree | 5f17b20ab5d24e352f023b69a696d065e87eb8d7 | |
| parent | e0dd6178a1c1e9e43f1f454fb73a0e2d30838799 (diff) | |
| download | kpowersave-3cdd4479.tar.gz kpowersave-3cdd4479.zip | |
Fix kpowersave Autotools compilation
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1242466 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | configure.in.in | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/configure.in.in | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/configure.in.in b/configure.in.in index 0da1e93..213e7a3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -171,3 +171,6 @@ AC_LANG_RESTORE AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) AC_SUBST(XGETTEXT) + +CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE" +AC_SUBST(CXXFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 091b8e6..d5d7a6a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,7 +75,7 @@ kpowersave_la_SOURCES = \ kpowersave_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version -kpowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-qt-1 -lXss -lXext -lXtst +kpowersave_la_LIBADD = $(LIB_KIO) @PACKAGE_LIBS@ -ldbus-tqt-1 -lXss -lXext -lXtst # this is where the desktop file will go xdg_apps_DATA = kpowersave.desktop diff --git a/src/configure.in.in b/src/configure.in.in index 8beae17..9f9bdd1 100644 --- a/src/configure.in.in +++ b/src/configure.in.in @@ -5,5 +5,5 @@ AC_C_BIGENDIAN AC_CHECK_KDEMAXPATHLEN AC_PATH_QT -AC_PATH_QT_TQMOC_UIC +# AC_PATH_QT_TQMOC_UIC |