# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1210187879 -7200
# Node ID 13ce402e1736d4183b639aae50e08063d5056640
# Parent  fd8a9a4d81d944bffd5a1c3258dab652470b27d4
Call AC_SUBST on SHEBANG_PATHNAME, for #! support.

2008-05-07  Aidan Kehoe  <kehoea@parhasard.net>

	* configure.ac (XE_EXPAND_VARIABLE): Call AC_SUBST on
	SHEBANG_PATHNAME, as suggested by Michael Sperber in
	y9ly7aj1wfc.fsf@deinprogramm.de.
	* Makefile.in.in: Regenerate.
	* configure: Ditto.

diff -r fd8a9a4d81d9 -r 13ce402e1736 ChangeLog
--- a/ChangeLog	Sun Jan 20 19:53:54 2008 +0100
+++ b/ChangeLog	Wed May 07 21:17:59 2008 +0200
@@ -1,3 +1,11 @@
+2008-05-07  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* configure.ac (XE_EXPAND_VARIABLE): Call AC_SUBST on
+	SHEBANG_PATHNAME, as suggested by Michael Sperber in
+	y9ly7aj1wfc.fsf@deinprogramm.de.
+	* Makefile.in.in: Regenerate.
+	* configure: Ditto.
+
 2008-01-20  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* Makefile.in.in (SHEBANG_PROGNAME): 
diff -r fd8a9a4d81d9 -r 13ce402e1736 Makefile.in.in
--- a/Makefile.in.in	Sun Jan 20 19:53:54 2008 +0100
+++ b/Makefile.in.in	Wed May 07 21:17:59 2008 +0200
@@ -413,7 +413,7 @@
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
 	-chmod 0755 ${bindir}/${PROGNAME}-${version}
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-	cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME}
+	cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME}
 # endif /* CYGWIN */
 #endif /* WIN32_NATIVE */
 	if test "${prefix}" != "${exec_prefix}"; then \
diff -r fd8a9a4d81d9 -r 13ce402e1736 configure
--- a/configure	Sun Jan 20 19:53:54 2008 +0100
+++ b/configure	Wed May 07 21:17:59 2008 +0200
@@ -706,6 +706,7 @@
 build_cpu
 build_vendor
 build_os
+SHEBANG_PROGNAME
 configuration
 CC
 CFLAGS
@@ -4858,6 +4859,8 @@
   SHEBANG_PROGNAME=xemacs-script
 fi
 
+
+
 cat >>confdefs.h <<_ACEOF
 #define EMACS_PROGNAME "$PROGNAME"
 _ACEOF
@@ -40455,6 +40458,7 @@
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
 build_os!$build_os$ac_delim
+SHEBANG_PROGNAME!$SHEBANG_PROGNAME$ac_delim
 configuration!$configuration$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
@@ -40506,7 +40510,6 @@
 ldap_libs!$ldap_libs$ac_delim
 postgresql_libs!$postgresql_libs$ac_delim
 lwlib_objs!$lwlib_objs$ac_delim
-canna_libs!$canna_libs$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -40548,6 +40551,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+canna_libs!$canna_libs$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 have_esd_config!$have_esd_config$ac_delim
 SRC_SUBDIR_DEPS!$SRC_SUBDIR_DEPS$ac_delim
@@ -40624,7 +40628,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r fd8a9a4d81d9 -r 13ce402e1736 configure.ac
--- a/configure.ac	Sun Jan 20 19:53:54 2008 +0100
+++ b/configure.ac	Wed May 07 21:17:59 2008 +0200
@@ -1226,6 +1226,8 @@
   SHEBANG_PROGNAME=xemacs-script
 fi
 
+AC_SUBST(SHEBANG_PROGNAME)
+
 AC_DEFINE_UNQUOTED(EMACS_PROGNAME, "$PROGNAME")
 
 AC_DEFINE_UNQUOTED(SHEBANG_PROGNAME, "${PROGNAME}-script")