Compile modules based on HAVE_* features

[geeqie.git] / src / bar.cc

diff --git a/src/bar.cc b/src/bar.cc
index bba0d9e..6c396b3 100644 (file)
--- a/src/bar.cc
+++ b/src/bar.cc
@@ -188,8 +188,7 @@ static const gchar default_config_copyright[] =
 "    </layout>"
 "</gq>";
 
-#if HAVE_LIBCHAMPLAIN
-#if HAVE_LIBCHAMPLAIN_GTK
+#if HAVE_LIBCHAMPLAIN && HAVE_LIBCHAMPLAIN_GTK
 static const gchar default_config_gps[] =
 "<gq>"
 "    <layout id = '_current_'>"
@@ -203,7 +202,6 @@ static const gchar default_config_gps[] =
 "    </layout>"
 "</gq>";
 #endif
-#endif
 
 static const KnownPanes known_panes[] = {
 /* default sidebar */
@@ -218,10 +216,8 @@ static const KnownPanes known_panes[] = {
        {PANE_EXIF,             "file_info",    N_("File info"),        default_config_file_info},
        {PANE_EXIF,             "location",     N_("Location and GPS"), default_config_location},
        {PANE_EXIF,             "copyright",    N_("Copyright"),        default_config_copyright},
-#if HAVE_LIBCHAMPLAIN
-#if HAVE_LIBCHAMPLAIN_GTK
+#if HAVE_LIBCHAMPLAIN && HAVE_LIBCHAMPLAIN_GTK
        {PANE_GPS,              "gps",  N_("GPS Map"),  default_config_gps},
-#endif
 #endif
        {PANE_UNDEF,            nullptr,                nullptr,                        nullptr}
 };