public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: rgmanager: master - build: improve slang include path detection Date: Thu, 09 Jul 2009 09:41:00 -0000 [thread overview] Message-ID: <20090709094116.BFA7E12030D@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=0bfff9e9bec649f4947ef4b9a164ffdd9ecce0f9 Commit: 0bfff9e9bec649f4947ef4b9a164ffdd9ecce0f9 Parent: ac4e2e66d202d9cfc0071e44a32f7d27281a4449 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Thu Jul 9 11:40:41 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Thu Jul 9 11:40:41 2009 +0200 build: improve slang include path detection make it a lot smarter and avoid a stupid special case Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- configure.ac | 14 +++++--------- rgmanager/src/daemons/Makefile.am | 2 +- rgmanager/src/daemons/slang_event.c | 4 ++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index f5b1637..f7a75ff 100644 --- a/configure.ac +++ b/configure.ac @@ -94,17 +94,14 @@ fi # external libs (no pkgconfig) check_lib_no_libs pthread pthread_mutex_lock -AC_CHECK_HEADERS([slang/slang.h], [slang_in_slang=yes]) -if test x"${slang_in_slang}" = xyes; then - slang_CFLAGS="-I${oldincludedir}/slang" -else - AC_CHECK_HEADERS([slang.h], [], - [AC_MSG_ERROR([Unable to find slang development files])]) -fi -slang_LIBS="-lslang" +AC_CHECK_HEADERS([slang/slang.h], [], + [AC_CHECK_HEADERS([slang.h], [], + [AC_MSG_ERROR([Unable to find slang development files])])]) check_lib_no_libs slang SLmemcmp +slang_LIBS="-lslang" + # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h malloc.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h]) @@ -192,7 +189,6 @@ AC_DEFINE_UNQUOTED([SYSLOGFACILITY], $(eval echo ${SYSLOGFACILITY}), AC_DEFINE_UNQUOTED([SYSLOGLEVEL], $(eval echo ${SYSLOGLEVEL}), [Default syslog level]) -AC_SUBST([slang_CFLAGS]) AC_SUBST([slang_LIBS]) ## *FLAGS handling diff --git a/rgmanager/src/daemons/Makefile.am b/rgmanager/src/daemons/Makefile.am index 5f9a3e5..6381387 100644 --- a/rgmanager/src/daemons/Makefile.am +++ b/rgmanager/src/daemons/Makefile.am @@ -28,7 +28,7 @@ rgmanager_SOURCES = fo_domain.c \ watchdog.c rgmanager_CFLAGS = $(ccs_CFLAGS) $(cman_CFLAGS) $(dlm_CFLAGS) \ - $(xml_CFLAGS) $(slang_CFLAGS) $(logt_CFLAGS) + $(xml_CFLAGS) $(logt_CFLAGS) rgmanager_LDFLAGS = $(ccs_LIBS) $(cman_LIBS) $(dlm_LIBS) \ $(xml_LIBS) $(slang_LIBS) $(logt_LIBS) \ diff --git a/rgmanager/src/daemons/slang_event.c b/rgmanager/src/daemons/slang_event.c index 2a2d509..716d07f 100644 --- a/rgmanager/src/daemons/slang_event.c +++ b/rgmanager/src/daemons/slang_event.c @@ -17,7 +17,11 @@ #include <stdio.h> #include <string.h> +#ifdef HAVE_SLANG_SLANG_H +#include <slang/slang.h> +#else #include <slang.h> +#endif #include <sys/syslog.h> #include <malloc.h> #include <logging.h>
reply other threads:[~2009-07-09 9:41 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090709094116.BFA7E12030D@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).