make lcdproc compile under Darwin/Mac OS X based on patch by Eric Pooch
This commit is contained in:
@@ -651,6 +651,9 @@ case "$host" in
|
|||||||
BSD/OS*/4*)
|
BSD/OS*/4*)
|
||||||
CCSHARED="-fpic"
|
CCSHARED="-fpic"
|
||||||
;;
|
;;
|
||||||
|
*darwin*)
|
||||||
|
LDSHARED="-bundle -flat_namespace -undefined suppress"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
dnl checks for libraries
|
dnl checks for libraries
|
||||||
|
|||||||
@@ -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
|
lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
|
||||||
|
|
||||||
|
if DARWIN
|
||||||
|
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir)
|
AM_CPPFLAGS = -I$(top_srcdir)
|
||||||
|
|
||||||
## EOF
|
## EOF
|
||||||
|
|||||||
+8
-1
@@ -29,8 +29,15 @@ case "$host" in
|
|||||||
AC_DEFINE([FREEBSD],[1],[Define if you're using FreeBSD.])
|
AC_DEFINE([FREEBSD],[1],[Define if you're using FreeBSD.])
|
||||||
ac_system_host=FreeBSD
|
ac_system_host=FreeBSD
|
||||||
;;
|
;;
|
||||||
|
*-*-*darwin*)
|
||||||
|
AC_DEFINE([DARWIN],[1],[Define if you're using Darwin/Mac OS X.])
|
||||||
|
ac_system_host=Darwin
|
||||||
|
;;
|
||||||
esac
|
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_MSG_CHECKING(whether to enable debugging)
|
||||||
AC_ARG_ENABLE(debug,
|
AC_ARG_ENABLE(debug,
|
||||||
|
|||||||
+4
-2
@@ -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_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
|
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user