Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unneeded HAVE_TRACKER conditional #664

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Conversation

dgsga
Copy link
Contributor

@dgsga dgsga commented Jan 9, 2024

Refactor Spotlight macro

Warn if any Spotlight support components are missing at configure time

@dgsga dgsga requested a review from rdmark January 9, 2024 15:01
@dgsga dgsga self-assigned this Jan 9, 2024
@dgsga
Copy link
Contributor Author

dgsga commented Jan 9, 2024

I have refactored the Spotlight macro so it meets all the following conditions:

  1. If only tracker installed: Spotlight support = no (configure warns talloc and tracker SPARQL are not found)
  2. If only tracker SPARQL installed: Spotlight support = no (configure warns talloc and tracker are not found)
  3. If only talloc installed: Spotlight support = no (configure warns tracker and tracker SPARQL are not found)
  4. If tracker & tracker SPARQL installed: Spotlight support = no (configure warns talloc is not found)
  5. If only tracker & talloc installed: Spotlight support = no (configure warns tracker SPARQL is not found)
  6. If only talloc & tracker SPARQL installed: Spotlight support = no (configure warns tracker is not found)
  7. If all three are present: Spotlight support=yes (no warnings at configure time)

This should help users identify which missing packages need to be installed for Spotlight support if required

Refactor Spotlight macro

Warn if any Spotlight support components are missing at configure time
Copy link
Member

@rdmark rdmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that we’re being more verbose now when other spotlight dependencies are missing!

#ifdef HAVE_TRACKER
printf( " tracker manager:\t%s\n", TRACKER_PREFIX "/bin/" TRACKER_MANAGING_COMMAND);

#ifdef WITH_SPOTLIGHT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn’t dbus strictly speaking used for other functionality too, even if you’re not building spotlight? E.g. afpstats

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well spotted. I'll look into it as just moving bus-daemon path outside of the Spotlight conditional causes compilation failure.
dbus-session.conf is Spotlight only.

@dgsga dgsga merged commit 9935adb into main Jan 9, 2024
11 checks passed
@dgsga dgsga deleted the 654-dgsga-spotlightfix branch January 9, 2024 15:48
Copy link

sonarcloud bot commented Jan 9, 2024

dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 9, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 9, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 11, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 13, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 24, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 24, 2024
* Remove unneeded HAVE_TRACKER conditional

* Refactor Spotlight macro

* Warn if any Spotlight support components are missing at configure time
dgsga added a commit to dgsga/netatalk that referenced this pull request Jan 24, 2024
• Remove unneeded HAVE_TRACKER conditional

• Refactor Spotlight macro

• Warn if any Spotlight support components are missing at configure time
dgsga added a commit that referenced this pull request May 19, 2024
* Remove unneeded HAVE_TRACKER conditional

• Refactor Spotlight macro

• Warn if any Spotlight support components are missing at configure time
dgsga added a commit that referenced this pull request May 19, 2024
* Remove unneeded HAVE_TRACKER conditional

• Refactor Spotlight macro

• Warn if any Spotlight support components are missing at configure time
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants