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

Makefile: Fix make dist in certain edge cases #74

Merged
merged 1 commit into from
Jan 22, 2014
Merged

Makefile: Fix make dist in certain edge cases #74

merged 1 commit into from
Jan 22, 2014

Conversation

algernon
Copy link
Contributor

Due to the way internal modules were built, if both mongodb and
libmongo-client was disabled, make dist failed. When amqp was explicitly
disabled, make dist failed.

The reason being, we use a dummy.c to trigger building the bundled
libraries, but the dummy.c files were not created if mongodb/amqp were
disabled. Now we create them anyway, just don't recurse into the
directory when the module is disabled.

Signed-off-by: Gergely Nagy algernon@balabit.hu

Due to the way internal modules were built, if both mongodb and
libmongo-client was disabled, make dist failed. When amqp was explicitly
disabled, make dist failed.

The reason being, we use a dummy.c to trigger building the bundled
libraries, but the dummy.c files were not created if mongodb/amqp were
disabled. Now we create them anyway, just don't recurse into the
directory when the module is disabled.

Signed-off-by: Gergely Nagy <algernon@balabit.hu>
bazsi added a commit that referenced this pull request Jan 22, 2014
Makefile: Fix make dist in certain edge cases
@bazsi bazsi merged commit 891b3a4 into syslog-ng:master Jan 22, 2014
@algernon algernon deleted the merge/h/distcheck-dummy-fix branch January 22, 2014 11:09
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.

2 participants