Skip to content

Commit 3b4cb0b

Browse files
committed
Allow compiling without nautilus/nautilus-extension.h
Some old distributions like CentOS 7 can build eiciel but still use an old nautilus extensions headers layout.
1 parent 20fa416 commit 3b4cb0b

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

configure.ac

+9
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,15 @@ AC_CHECK_LIB(acl, acl_get_perm,
193193
AC_SUBST(ACL_LIBS, [-lacl])
194194
],)
195195

196+
# This must be easier, right?
197+
OLDCXXFLAGS="$CXXFLAGS"
198+
OLDCPPFLAGS="$CPPFLAGS"
199+
CXXFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}"
200+
CPPFLAGS="$CXXFLAGS ${GTKMM_CFLAGS} ${NAUTILUS_EXTENSION_CFLAGS}"
201+
AC_CHECK_HEADERS([nautilus/nautilus-extension.h], [], [], [])
202+
CXXFLAGS="$OLDCXXFLAGS"
203+
CPPFLAGS="$OLDCPPFLAGS"
204+
196205
dnl Output files
197206
AC_CONFIG_FILES([Makefile
198207
src/Makefile

meson.build

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
project('eiciel', 'cpp',
33
version : '0.9.13',
44
meson_version : '>=0.54',
5-
license: 'GPL2+')
5+
license: 'GPL2+',
6+
default_options: ['cpp_std=c++11'])
67

78
package_name = 'eiciel'
89
email = 'rofirrim@gmail.com'
@@ -49,6 +50,10 @@ has_acl_get_perm_np = compiler.has_function('acl_get_perm_np',
4950
dependencies: libacl)
5051
conf_data.set('HAVE_ACL_GET_PERM_NP', has_acl_get_perm_np)
5152

53+
has_nautilus_extension_h = compiler.has_header('nautilus/nautilus-extension.h',
54+
dependencies: [libnautilus_extensions3, gtkmm3])
55+
conf_data.set('HAVE_NAUTILUS_NAUTILUS_EXTENSION_H', has_nautilus_extension_h)
56+
5257
# Internationalization
5358
i18n = import('i18n')
5459
subdir('po')

src/eiciel_nautilus_page.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,14 @@
2222
#include <glib/gi18n-lib.h>
2323
#include <gtk/gtk.h>
2424
#include <gtkmm.h>
25+
2526
extern "C" {
27+
#ifdef HAVE_NAUTILUS_NAUTILUS_EXTENSION_H
2628
#include <nautilus-extension.h>
29+
#else
30+
#include <libnautilus-extension/nautilus-property-page-provider.h>
31+
#include <libnautilus-extension/nautilus-property-page.h>
32+
#endif
2733
}
2834

2935
#include "eiciel_main_window.hpp"

0 commit comments

Comments
 (0)