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:
mmdolze
2009-06-06 16:01:38 +00:00
parent 8644e5a347
commit 10fba98c88
5 changed files with 5 additions and 4 deletions
+1
View File
@@ -73,6 +73,7 @@ v.0.5dev (ongoing development)
+ new driver imonlcd for SoundGraph iMON LCD (Dean Harding, Jonathan Kyler)
* MtxOrb driver: Fix backlight for old firmware
* Add checks for null pointer / failed malloc to menu code
* lcdproc, lcdexec, lcdvc clients: Use our included getopt.h
v.0.5.2
* fix switching on/off the Load screen in lcdproc client using the menu
+1 -1
View File
@@ -8,7 +8,7 @@ lcdexec_SOURCES = lcdexec.c menu.c menu.h
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)
+1 -1
View File
@@ -12,7 +12,7 @@ if DARWIN
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
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)
+1 -1
View File
@@ -12,7 +12,7 @@ if DARWIN
AM_LDFLAGS = -framework CoreFoundation -framework IOKit
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_LDFLAGS = -g
+1 -1
View File
@@ -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
AC_CONFIG_LIBOBJ_DIR(shared)
AC_CHECK_FUNC(getopt_long,
AC_CHECK_FUNC(getopt,
[
AC_ARG_WITH(included-getopt,
[AS_HELP_STRING([--with-included-getopt], [Use the included getopt rather than glibc's])],