diff options
| author | onestone <onestone> | 2007-01-22 16:12:38 +0000 |
|---|---|---|
| committer | onestone <onestone> | 2007-01-22 16:12:38 +0000 |
| commit | 714fa09647adbf7290b609b660da5e16563850e7 (patch) | |
| tree | ccc170304d553f089c928f8d8d3d4f6d21b04ca8 | |
| parent | b3951c85780998fed1b8da0eda5d5c73f03972fa (diff) | |
| download | aquamarine-714fa09647adbf7290b609b660da5e16563850e7.tar.gz aquamarine-714fa09647adbf7290b609b660da5e16563850e7.tar.bz2 | |
aquamarine: fixed build system for chroot environments
| -rw-r--r-- | configure.in.in | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/configure.in.in b/configure.in.in index 7c33c08..d49353e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -11,18 +11,15 @@ KDE_CHECK_HEADER(kdecoration.h,HAVE_KDECORATION=1, AC_MSG_ERROR([Unable to find KDecoration. Make sure you have the kdebase development package installed.])) ]) -BERYL_SETTINGS_REQUIRES="\ - berylsettings >= 0.1.4 \ - glib-2.0" - AC_ARG_ENABLE(berylsettings, AC_HELP_STRING([--disable-berylsettings], [disable beryl settings]), [berylsettings="${enableval}"], [berylsettings="yes"]) AM_CONDITIONAL(include_bs, test "$berylsettings" = "yes") KDE_PKG_CHECK_MODULES(XCOMPOSITE, "xcomposite",[],AC_MSG_ERROR([xcomposite not found])) +KDE_PKG_CHECK_MODULES(XDAMAGE, "xdamage",[],AC_MSG_ERROR([xdamage not found])) KDE_PKG_CHECK_MODULES(DECOLIB, "libberyldecoration",[],AC_MSG_ERROR([libberyldecoration not found])) if test "$berylsettings" = "yes"; then - KDE_PKG_CHECK_MODULES(BERYLSETTINGS, $BERYL_SETTINGS_REQUIRES, + KDE_PKG_CHECK_MODULES(BERYLSETTINGS, "berylsettings", [berylsettings_found="yes"],AC_MSG_WARN([berylsettings not found.])) if test "$berylsettings_found" = "yes"; then diff --git a/src/Makefile.am b/src/Makefile.am index 91bc12a..8ff3192 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,9 +12,9 @@ aquamarine_SOURCES = aquamarine.cpp \ options.cpp \ settings.kcfgc -aquamarine_LDADD = $(LIB_KDECORE) -lkdecorations $(BERYLSETTINGS_LIBS) $(XCOMPOSITE_LIBS) $(DECOLIB_LIBS) +aquamarine_LDADD = $(LIB_KDECORE) -lkdecorations $(BERYLSETTINGS_LIBS) $(XCOMPOSITE_LIBS) $(XDAMAGE_LIBS) $(DECOLIB_LIBS) aquamarine_LDFLAGS = $(all_libraries) -KDE_CXXFLAGS = $(BERYLSETTINGS_CFLAGS) $(XCOMPOSITE_CFLAGS) $(DECOLIB_CFLAGS) +KDE_CXXFLAGS = $(BERYLSETTINGS_CFLAGS) $(XCOMPOSITE_CFLAGS) $(XDAMAGE_CFLAGS) $(DECOLIB_CFLAGS) METASOURCES = AUTO |