[PATCH] Another try at acinclude.m4.in

[Oswald Buddenhagen]

On Fri, Oct 17, 2003 at 02:38:52AM +0200, Dirk Mueller wrote:
> On Friday 17 October 2003 01:27, Oswald Buddenhagen wrote:
> 
> > wrong. remove the dollars from the parameters, not from the function.
> > coolo, you blew it. yes, i know, my code is _always_ unreadable. :-)=)
> 
> I think you forgot to attach the patch..
> 
i think my "verbal patch" is much simpler to handle given that i
requested removing two dollar signs (and re-adding one, if counting
against bruggie's patch).

btw, bruggie, i do the exec_prefix expansion in the kdm check as well -
temporarily. better safe than sorry ...
one could put that into the EXPAND macro itself, but that goes at the
cost of increasing the size and execution time of configure even more.
nah, who cares for a few bytes/milliseconds more ...

this time with a patch - to make certain persons (who tend to forget
some patches, btw ;}) happy.
ps: cleaning up after oneself is not usual in configure context, so i
removed the unset. :)

greetings

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature, please!
--
Chaos, panic, and disorder - my work here is done.
-------------- next part --------------
Index: admin/acinclude.m4.in
===================================================================
RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
retrieving revision 2.414
diff -U2 -r2.414 acinclude.m4.in
--- admin/acinclude.m4.in	16 Oct 2003 08:51:56 -0000	2.414
+++ admin/acinclude.m4.in	17 Oct 2003 00:59:39 -0000
@@ -1683,7 +1683,9 @@
 
 AC_DEFUN([KDE_EXPAND_MAKEVAR], [
+savex=$exec_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 tmp=$$2
 while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-unset tmp
+exec_prefix=$savex
 ])
 
@@ -1706,8 +1708,8 @@
 if test "${prefix}" != NONE; then
   kde_includes=${includedir}
-  KDE_EXPAND_MAKEVAR(ac_kde_includes, $includedir)
+  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
 
   kde_libraries=${libdir}
-  KDE_EXPAND_MAKEVAR(ac_kde_libraries, $libdir)
+  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
 
 else
Index: kdm/configure.in.in
===================================================================
RCS file: /home/kde/kdebase/kdm/configure.in.in,v
retrieving revision 1.76
diff -U2 -r1.76 configure.in.in
--- kdm/configure.in.in	16 Oct 2003 08:51:57 -0000	1.76
+++ kdm/configure.in.in	17 Oct 2003 00:59:39 -0000
@@ -2,6 +2,4 @@
 dnl this is for kdm:
 
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
 AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
@@ -10,5 +8,4 @@
 KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
 AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
-exec_prefix=$savex
 
 KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])