(Fread_file_name): Correct handling of dollars in file

[bpt/emacs.git] / configure1.in

diff --git a/configure1.in b/configure1.in
index e86c4f5..6e4cf07 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -1336,7 +1336,11 @@ esac
 [ -n "${x_libraries}" ] && LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
 [ -n "${x_includes}" ] && C_SWITCH_X_SITE="-I${x_includes}"
 
-bitmapdir="${x_includes}"
+if [ x"${x_includes}" = x ]; then
+  bitmapdir=/usr/include/X11/bitmaps;
+else
+  bitmapdir="${x_includes}/bitmaps";
+fi
 
 # Avoid forcing the search of /usr/include before fixed include files.
 if [ "$C_SWITCH_X_SITE" = "-I/usr/include" ]; then
@@ -1578,7 +1582,7 @@ AC_ALLOCA
 AC_HAVE_LIBRARY(-lm)
 AC_HAVE_FUNCS(gettimeofday gethostname dup2 rename closedir mkdir rmdir \
 random lrand48 bcopy bcmp logb frexp fmod drem ftime res_init setsid \
-strerror fpathconf select mktime eaccess)
+strerror fpathconf select mktime eaccess getpagesize)
 
 ok_so_far=true
 AC_FUNC_CHECK(socket, , ok_so_far=)
@@ -1644,7 +1648,7 @@ AC_SUBST(X_TOOLKIT_TYPE)
 AC_SUBST(machfile)
 AC_SUBST(opsysfile)
 
-AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${configuration}\"")
+AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "\"${canonical}\"")
 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS,  "\"${config_options}\"")
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")