From ddcd6c5d5da154dd5505db5e265e4e06d0d77cb2 Mon Sep 17 00:00:00 2001 From: Arnaud Launay Date: Thu, 31 Oct 2002 09:46:06 +0000 Subject: [PATCH] Patch and suggestion by Dan Fandrich : - do not use /proc/meminfo if cross-compiling - fix packaging comment git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@5507 67ed7778-7388-44ab-90cf-0a291f65f57c --- configure.in | 19 ++++++++++++------- packaging/linux-hotplug/Makefile.am | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index e2a05db7e..dd9fcb7fb 100644 --- a/configure.in +++ b/configure.in @@ -281,14 +281,19 @@ dnl --------------------------------------------------------------------------- dnl /proc/meminfo: If the meminfo /proc entry is available, we use it dnl to limit the libgphoto2 filesystem cache size. dnl --------------------------------------------------------------------------- -AC_CHECK_FILE(/proc/meminfo, [ - proc_meminfo_msg="available"; - proc_meminfo=true; - AC_DEFINE(HAVE_PROCMEMINFO,1,[whether we get memory info from /proc/meminfo]) -], [ - proc_meminfo_msg="not available"; +if test "$cross_compiling" != yes; then + AC_CHECK_FILE(/proc/meminfo, [ + proc_meminfo_msg="available"; + proc_meminfo=true; + AC_DEFINE(HAVE_PROCMEMINFO,1,[whether we get memory info from /proc/meminfo]) + ], [ + proc_meminfo_msg="not available"; + proc_meminfo=false; + ]) +else + proc_meminfo_msg="state not known, cross-compilation"; proc_meminfo=false; -]) +fi dnl Check for sysctl() AC_MSG_CHECKING([for sysctl on BSD]) diff --git a/packaging/linux-hotplug/Makefile.am b/packaging/linux-hotplug/Makefile.am index 8a643d6b0..931babcce 100644 --- a/packaging/linux-hotplug/Makefile.am +++ b/packaging/linux-hotplug/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ noinst_PROGRAMS = print-usb-usermap # FIXME: This should only be built if target system is linux +# and not cross-compiled. print_usb_usermap_SOURCE = print-usb-usermap.c print_usb_usermap_LDADD = ../../libgphoto2/libgphoto2.la