--- Makefile.local.in	13 Nov 2009 00:17:01 -0000	1.28
+++ Makefile.local.in	16 Mar 2010 21:02:55 -0000
@@ -107,6 +107,7 @@
 DYNAMIC_FLAG = @DYNAMIC_FLAG@
 STATIC_LIB_SUFFIX = @STATIC_LIB_SUFFIX@
 SHARED_LIB_SUFFIX = @SHARED_LIB_SUFFIX@
+LDCONFIG = @LDCONFIG@
 
 ifeq ($(patsubst darwin%,,$(HOST_OS)),)
   MAC_OSX = 1
--- configure.ac	26 Jan 2010 17:36:53 -0000	1.45
+++ configure.ac	16 Mar 2010 21:02:55 -0000
@@ -225,6 +225,11 @@
   INSTALL_FLAGS=""
 fi
 
+AC_SUBST(LDCONFIG)
+AC_PATH_PROG(LDCONFIG, ldconfig, 
+    AC_MSG_WARN([ldconfig not found. Library installation may fail.]),
+    [$PATH:/sbin:/usr/sbin])
+
 AC_SUBST(TIME)
 if test -n "$MAC_OSX"; then
 AC_PATH_PROG(TIME, gtime, [not found])
--- java/Makefile	4 Dec 2009 20:57:59 -0000	1.29
+++ java/Makefile	16 Mar 2010 21:02:55 -0000
@@ -208,7 +208,7 @@
       -L ../lib $(OBJ_PATH)/$(PACKAGE)/*.o \
       -o $(ARCH_LIB_PATH)/$(LIB_JNI) -lcvc3 $(LD_LIBS)
 ifeq ($(CYGWIN),)
-	-ldconfig -nv $(ARCH_LIB_PATH)
+	$(LDCONFIG) -nv $(ARCH_LIB_PATH)
 endif
 endif
 	ln -sf $(LIB_JNI) $(ARCH_LIB_PATH)/$(LIB_JNI_COMPAT)
@@ -229,7 +229,7 @@
 $(LIB_PATH)/$(LIB_JNI): $(ARCH_LIB_PATH)/$(LIB_JNI)
 	ln -sf $< $@
 # [chris] ldconfig seems to just delete the .so's!
-# -ldconfig -nv '$(call dirx,$@)'
+# $(LDCONFIG) -nv '$(call dirx,$@)'
 	ln -sf $(LIB_JNI) '$(call dirx,$@)/$(LIB_JNI_COMPAT)'
 	ln -sf $(LIB_JNI) '$(call dirx,$@)/$(LIB_JNI_MAJOR)'
 	ln -sf $(LIB_JNI) '$(call dirx,$@)/$(LIB_JNI_BASE)'
@@ -250,7 +250,7 @@
 	ln -sf $(LIB_JNI) $(libdir)/$(LIB_JNI_BASE)
 ifeq ($(MAC_OSX),)
 ifeq ($(CYGWIN),)
-	-ldconfig -nv $(libdir)
+	$(LDCONFIG) -nv $(libdir)
 endif
 endif
 #	chmod 644 $(libdir)/$(LIB_JNI)
--- src/Makefile	26 Jan 2010 17:36:54 -0000	1.29
+++ src/Makefile	16 Mar 2010 21:02:55 -0000
@@ -208,7 +208,7 @@
 else
 	cat UNPACKED | xargs $(CXX) $(SHARED) $(CXXFLAGS) $(LDFLAGS) \
     -Wl,-soname,$(LIB_SHARED_MAJOR) -o '$(LIB_SHARED)' `` $(LD_LIBS)
-	-ldconfig -nv $(LIB_DIR)
+	$(LDCONFIG) -nv $(LIB_DIR)
 endif
 endif
 	ln -sf $(LIB_SHARED_FULL) $(LIB_DIR)/$(LIB_SHARED_COMPAT)
@@ -225,7 +225,7 @@
 	ln -sf $(LIB_SHARED) '$(call dirx,$@)/$(LIB_SHARED_FULL)'
 ifeq ($(MAC_OSX),)
 ifeq ($(CYGWIN),)
-	-ldconfig -nv '$(call dirx,$@)'
+	$(LDCONFIG) -nv '$(call dirx,$@)'
 endif
 endif
 	ln -sf $(LIB_SHARED_FULL) '$(call dirx,$@)/$(LIB_SHARED_COMPAT)'
@@ -264,7 +264,7 @@
 	$(INSTALL) $(INSTALL_FLAGS) -m 644 $(CVC_LIB) $(libdir)
 ifeq ($(MAC_OSX),)
 ifeq ($(CYGWIN),)
-	-ldconfig -nv $(libdir)
+	$(LDCONFIG) -nv $(libdir)
 endif
 endif
 	ln -sf $(CVC_LIB_NAME) $(libdir)/$(LIB_SHARED_COMPAT)