From: Glenn Morris <rgm@gnu.org>
Date: Fri, 18 May 2012 10:17:28 +0000 (-0400)
Subject: Auto-commit of generated files.
X-Git-Tag: emacs-24.2.90~471^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=adf4198e98a7a664d2a624c06220210227a3c096;p=emacs.git

Auto-commit of generated files.
---

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 7029746b9bd..956a8373684 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -476,6 +476,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INFO_EXT = @INFO_EXT@
 INFO_OPTS = @INFO_OPTS@
 INSTALL = @INSTALL@
+INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/autogen/configure b/autogen/configure
index 1c699212665..e397eb8f4b2 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1165,6 +1165,7 @@ NS_OBJC_OBJ
 NS_OBJ
 ns_self_contained
 LEIM_INSTALLDIR
+INSTALL_ARCH_INDEP_EXTRA
 TEMACS_LDFLAGS2
 LD_SWITCH_X_SITE_RPATH
 XMKMF
@@ -4482,12 +4483,12 @@ case "${canonical}" in
       * )            unported=yes ;;
     esac
     opsys=darwin
-    # Use fink packages if available.
-    # FIXME?  Is it really our business to decide this for the user?
-    if test -d /sw/include && test -d /sw/lib; then
-      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-    fi
+    ## Use fink packages if available.
+    ## FIXME find a better way to do this: http://debbugs.gnu.org/11507
+##    if test -d /sw/include && test -d /sw/lib; then
+##      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+##      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+##    fi
   ;;
 
   ## HP 9000 series 700 and 800, running HP/UX
@@ -10109,6 +10110,7 @@ $as_echo "#define NS_HAVE_NSINTEGER 1" >>confdefs.h
 fi
 
 
+INSTALL_ARCH_INDEP_EXTRA=install-etc
 LEIM_INSTALLDIR="\${install_prefix}/leim"
 ns_self_contained=no
 ns_frag=/dev/null
@@ -10133,6 +10135,7 @@ if test "${HAVE_NS}" = yes; then
                infodir="\${ns_appresdir}/info"
      lispdir="\${ns_appresdir}/lisp"
      LEIM_INSTALLDIR="\${ns_appresdir}/leim"
+     INSTALL_ARCH_INDEP_EXTRA=
   fi
   ns_frag=$srcdir/src/ns.mk
   NS_OBJ="fontset.o fringe.o image.o"
@@ -10147,6 +10150,7 @@ CPPFLAGS="$tmp_CPPFLAGS"
 
 
 
+
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes