From fe248c747634dba5da4088651d15335aabc9029e Mon Sep 17 00:00:00 2001 From: marschap Date: Sat, 4 Feb 2006 19:38:09 +0000 Subject: [PATCH] make lcdproc compile under Darwin/Mac OS X based on patch by Eric Pooch --- acinclude.m4 | 3 +++ clients/lcdproc/Makefile.am | 4 ++++ configure.in | 9 ++++++++- server/Makefile.am | 6 ++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c5c5ec0..316e3f8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -651,6 +651,9 @@ case "$host" in BSD/OS*/4*) CCSHARED="-fpic" ;; + *darwin*) + LDSHARED="-bundle -flat_namespace -undefined suppress" + ;; esac dnl checks for libraries diff --git a/clients/lcdproc/Makefile.am b/clients/lcdproc/Makefile.am index 381ef2e..7835e2f 100644 --- a/clients/lcdproc/Makefile.am +++ b/clients/lcdproc/Makefile.am @@ -6,6 +6,10 @@ lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cp lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a +if DARWIN +AM_LDFLAGS = -framework CoreFoundation -framework IOKit +endif + AM_CPPFLAGS = -I$(top_srcdir) ## EOF diff --git a/configure.in b/configure.in index 08824e4..192eafe 100644 --- a/configure.in +++ b/configure.in @@ -29,8 +29,15 @@ case "$host" in AC_DEFINE([FREEBSD],[1],[Define if you're using FreeBSD.]) ac_system_host=FreeBSD ;; +*-*-*darwin*) + AC_DEFINE([DARWIN],[1],[Define if you're using Darwin/Mac OS X.]) + ac_system_host=Darwin + ;; esac -AC_DEFINE_UNQUOTED([SYSTEM_HOST], [$ac_system_host], [Set this to your system host (Linux, Solaris, OpenBSD, NetBSD or FreeBSD)]) +AC_DEFINE_UNQUOTED([SYSTEM_HOST], [$ac_system_host], [Set this to your system host (Linux, Solaris, OpenBSD, NetBSD, FreeBSD or Darwin)]) + +dnl treat Darwin special in Makefiles +AM_CONDITIONAL(DARWIN, test x$ac_system_host = Darwin) AC_MSG_CHECKING(whether to enable debugging) AC_ARG_ENABLE(debug, diff --git a/server/Makefile.am b/server/Makefile.am index 49257f7..a8abb05 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -6,9 +6,11 @@ sbin_PROGRAMS=LCDd LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h -LCDd_LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a +LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a -LCDd_LDFLAGS = -rdynamic -uget_args +if !DARWIN +AM_LDFLAGS = -rdynamic -uget_args +endif AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared