diff options
| author | Scott Moreau <oreaus@gmail.com> | 2011-10-16 08:23:06 -0600 |
|---|---|---|
| committer | Scott Moreau <oreaus@gmail.com> | 2011-10-18 09:18:05 -0600 |
| commit | c0771b1431e4c2fd26b86ea68f8234340de1746f (patch) | |
| tree | 0313e0a76f87bd844ade482a9c5ed8dd4128dae2 | |
| parent | 8f41133b142952c388388d505d0b15d8f979b404 (diff) | |
| download | scripts-c0771b1431e4c2fd26b86ea68f8234340de1746f.tar.gz scripts-c0771b1431e4c2fd26b86ea68f8234340de1746f.tar.bz2 | |
Use gconf when gtk is enabled.
| -rwxr-xr-x | build_compiz++ | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build_compiz++ b/build_compiz++ index bf8149b..4b99b8d 100755 --- a/build_compiz++ +++ b/build_compiz++ @@ -196,16 +196,16 @@ CORE_CMAKE_FLAGS="$CMAKE_FLAGS" # Adjust deps and flags if [[ "$GNOME_ENABLED" = "true" ]]; then - DEPENDENCIES="$DEPENDENCIES libmetacity-dev libgnome-window-settings-dev libgnome-desktop-dev gnome-control-center-dev libglib2.0-dev libgconf2-dev" + DEPENDENCIES="$DEPENDENCIES libmetacity-dev libgnome-window-settings-dev libgnome-desktop-dev gnome-control-center-dev libglib2.0-dev" components+=(compizconfig-backend-gconf) - CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_GNOME=ON -DBUILD_GNOME_KEYBINDINGS=ON -DBUILD_METACITY=ON -DBUILD_GTK=ON -DCOMPIZ_DISABLE_PLUGIN_GNOMECOMPAT=OFF -DUSE_GCONF=ON" + CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_GNOME=ON -DBUILD_GNOME_KEYBINDINGS=ON -DBUILD_METACITY=ON -DBUILD_GTK=ON -DCOMPIZ_DISABLE_PLUGIN_GNOMECOMPAT=OFF" else - CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_GNOME=OFF -DBUILD_GNOME_KEYBINDINGS=OFF -DBUILD_METACITY=ON -DBUILD_GTK=ON -DCOMPIZ_DISABLE_PLUGIN_GNOMECOMPAT=ON -DCOMPIZ_DISABLE_PLUGIN_GLIB=ON -DUSE_GCONF=OFF" + CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_GNOME=OFF -DBUILD_GNOME_KEYBINDINGS=OFF -DBUILD_METACITY=ON -DBUILD_GTK=ON -DCOMPIZ_DISABLE_PLUGIN_GNOMECOMPAT=ON -DCOMPIZ_DISABLE_PLUGIN_GLIB=ON" fi if [[ "$GTK_ENABLED" = "true" ]]; then - DEPENDENCIES="$DEPENDENCIES libmetacity-dev libgtk2.0-dev libwnck-dev" - CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_METACITY=ON -DBUILD_GTK=ON" + DEPENDENCIES="$DEPENDENCIES libmetacity-dev libgtk2.0-dev libwnck-dev libgconf2-dev" + CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_METACITY=ON -DBUILD_GTK=ON -DUSE_GCONF=ON" else CORE_CMAKE_FLAGS="$CORE_CMAKE_FLAGS -DBUILD_METACITY=OFF -DBUILD_GTK=OFF" fi |