Check for getopt instead of getopt_long to decide if the system has a
working getopt implementation (we don't use getopt_long at all).
Include {topdir}/shared for the clients so they pull in our included
getopt.h. This fixes bulding on systems which have getopt(), but no getopt.h.
This commit is contained in:
@@ -73,6 +73,7 @@ v.0.5dev (ongoing development)
|
|||||||
+ new driver imonlcd for SoundGraph iMON LCD (Dean Harding, Jonathan Kyler)
|
+ new driver imonlcd for SoundGraph iMON LCD (Dean Harding, Jonathan Kyler)
|
||||||
* MtxOrb driver: Fix backlight for old firmware
|
* MtxOrb driver: Fix backlight for old firmware
|
||||||
* Add checks for null pointer / failed malloc to menu code
|
* Add checks for null pointer / failed malloc to menu code
|
||||||
|
* lcdproc, lcdexec, lcdvc clients: Use our included getopt.h
|
||||||
|
|
||||||
v.0.5.2
|
v.0.5.2
|
||||||
* fix switching on/off the Load screen in lcdproc client using the menu
|
* fix switching on/off the Load screen in lcdproc client using the menu
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ lcdexec_SOURCES = lcdexec.c menu.c menu.h
|
|||||||
|
|
||||||
lcdexec_LDADD = ../../shared/libLCDstuff.a
|
lcdexec_LDADD = ../../shared/libLCDstuff.a
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
||||||
|
|
||||||
|
|
||||||
EXTRA_DIST = $(sysconf_DATA)
|
EXTRA_DIST = $(sysconf_DATA)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ if DARWIN
|
|||||||
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
|
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
||||||
|
|
||||||
|
|
||||||
EXTRA_DIST = $(sysconf_DATA)
|
EXTRA_DIST = $(sysconf_DATA)
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ if DARWIN
|
|||||||
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
|
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -DSYSCONFDIR=\"$(sysconfdir)\" -DPIDFILEDIR=\"$(pidfiledir)\"
|
||||||
|
|
||||||
#AM_CFLAGS = -g -O0
|
#AM_CFLAGS = -g -O0
|
||||||
#AM_LDFLAGS = -g
|
#AM_LDFLAGS = -g
|
||||||
|
|||||||
+1
-1
@@ -190,7 +190,7 @@ AC_CHECK_FUNCS(select socket strdup strerror strtol uname cfmakeraw snprintf)
|
|||||||
|
|
||||||
dnl Many people on non-GNU/Linux systems don't have getopt
|
dnl Many people on non-GNU/Linux systems don't have getopt
|
||||||
AC_CONFIG_LIBOBJ_DIR(shared)
|
AC_CONFIG_LIBOBJ_DIR(shared)
|
||||||
AC_CHECK_FUNC(getopt_long,
|
AC_CHECK_FUNC(getopt,
|
||||||
[
|
[
|
||||||
AC_ARG_WITH(included-getopt,
|
AC_ARG_WITH(included-getopt,
|
||||||
[AS_HELP_STRING([--with-included-getopt], [Use the included getopt rather than glibc's])],
|
[AS_HELP_STRING([--with-included-getopt], [Use the included getopt rather than glibc's])],
|
||||||
|
|||||||
Reference in New Issue
Block a user