- no *.la for nautilus modules

[packages/nautilus.git] / nautilus-aclocal.patch

diff --git a/nautilus-aclocal.patch b/nautilus-aclocal.patch
index 1234b0022526ada088a69b5d480ccad47b561244..83302674400924eccdf60312bb5b84ac17590729 100644 (file)
--- a/nautilus-aclocal.patch
+++ b/nautilus-aclocal.patch
@@ -1,7 +1,7 @@
 --- nautils-1.0.6.orig/acinclude.m4    Thu Jan  1 01:00:00 1970
 +++ nautilus-1.0.6/acinclude.m4        Tue Nov 13 11:22:16 2001
-@@ -0,0 +1,390 @@
-+AC_DEFUN(AM_PATH_GNOME,
+@@ -0,0 +1,359 @@
++AC_DEFUN([AM_PATH_GNOME],
 +[dnl 
 +dnl Get the cflags and libraries from the gnome-config script
 +dnl
@@ -141,7 +141,7 @@
 +dnl NAUTILUS_VERSION_CANON(version)
 +dnl                     1
 +
-+AC_DEFUN(NAUTILUS_VERSION_CANON, [`
++AC_DEFUN([NAUTILUS_VERSION_CANON], [`
 +
 +      dnl Assumes that there are no more than 999 revisions at a level,
 +      dnl no more than three levels of revision.
@@ -163,7 +163,7 @@
 +dnl NAUTILUS_VERSION_INSIST(package, get-version-cmd, operator, want-version-var)
 +dnl                      1        2                3         4
 +
-+AC_DEFUN(NAUTILUS_VERSION_INSIST, [
++AC_DEFUN([NAUTILUS_VERSION_INSIST], [
 +      ez_want_version=[$]$4
 +
 +      case "$3" in
@@ -200,7 +200,7 @@
 +dnl
 +dnl Shamelessly cut-n-pasted from AM_PATH_LIBART
 +dnl
-+AC_DEFUN(NAUTILUS_PATH_FREETYPE2,
++AC_DEFUN([NAUTILUS_PATH_FREETYPE2],
 +[dnl 
 +dnl Get the cflags and libraries from the freetype-config script
 +dnl
@@ -360,34 +360,3 @@
 +  AC_SUBST(FREETYPE2_LIBS)
 +  rm -f conf.freetype2test
 +])
-+
-+dnl AM_GCONF_SOURCE
-+dnl Define GCONF_SCHEMA_CONFIG_SOURCE
-+dnl
-+AC_DEFUN(AM_GCONF_SOURCE,
-+[
-+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`
-+  else
-+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+  fi
-+
-+  AC_ARG_WITH(gconf-source, 
-+  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-+
-+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+  AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation")
-+
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR=$sysconfdir/gconf/schemas/
-+  else
-+    GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR
-+  fi
-+
-+  AC_ARG_WITH(gconf-schema-file-dir, 
-+  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT("Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files")
-+])
-+