On Thu, 25 Jun 2015, Rodolfo kix Garcia escribió:
> On Sat, 13 Jun 2015, Christophe escribió:
>
> >
> > ----- Rodolfo García Peñas <k...@kix.es> a écrit :
> > > On Mon, 06 Apr 2015, Christophe CURIS escribió:
> > >
> > > > diff --git a/configure.ac b/configure.ac
> > > > index 4e55a94..6a02376 100644
> > > > --- a/configure.ac
> > > > +++ b/configure.ac
> > > > @@ -502,15 +502,16 @@ AS_IF([test "x$enable_modelock" = "xyes"],
> > > > dnl XDND Drag-nd-Drop support
> > > > dnl =========================
> > > > AC_ARG_ENABLE([xdnd],
> > > > - [AS_HELP_STRING([--disable-xdnd], [disable Drag-nd-Drop support])],
> > > > + [AS_HELP_STRING([--disable-xdnd], [disable support for
> > > > Drag-and-Drop on the dock @<:@default=enabled@:>@])],
> > > > [AS_CASE(["$enableval"],
> > > > [yes|no], [],
> > > > [AC_MSG_ERROR([bad value $enableval for --disable-xdnd]) ]) ],
> > > > [enable_xdnd=yes])
> > > > AS_IF([test "x$enable_xdnd" = "xyes"],
> > > > - [supported_xext="$supported_xext XDnD"
> > > > - AC_DEFINE([XDND], [1], [whether Drag-nd-Drop support should be
> > > > enabled])],
> > > > + [supported_core="$supported_core XDnD"
> > > > + AC_DEFINE([USE_DOCK_XDND], [1], [whether Drag-and-Drop on the
> > > > dock should be enabled])],
> > > > [unsupported="$unsupported XDnd"])
> > > > +AM_CONDITIONAL([USE_DOCK_XDND], [test "x$enable_dock_xdnd" != "xno"])
> > > >
> > > >
> > > > dnl XShape support
> > > > diff --git a/src/Makefile.am b/src/Makefile.am
> > > > index 56ebe08..7fe9db7 100644
> > > > --- a/src/Makefile.am
> > > > +++ b/src/Makefile.am
> > > > @@ -84,7 +84,6 @@ wmaker_SOURCES = \
> > > > usermenu.c \
> > > > usermenu.h \
> > > > xdnd.h \
> > > > - xdnd.c \
> > > > xinerama.h \
> > > > xinerama.c \
> > > > xmodifier.h \
> > > > @@ -108,6 +107,9 @@ wmaker_SOURCES = \
> > > > wsmap.c \
> > > > wsmap.h
> > > >
> > > > +if USE_DOCK_XDND
> > > > +wmaker_SOURCES += xdnd.c
> > > > +endif
> > > > if USE_MWM_HINTS
> > > > wmaker_SOURCES += motif.h motif.c
> > > > endif
> > >
> > > Hi,
> > >
> > > I am not sure if this patch is correct, because the xdnd.c file is
> > > included always in the Makefile file, so the compiler try to use it. I am
> > > not sure if I am missing something:
> > >
> > > kix@debian:~/src/wmaker/wmaker-crm$ ./configure --disable-xdnd >/dev/null
> > > 2>&1
> > > kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> > > src/Makefile:am__append_1 = xdnd.c
> > > src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> > > src/Makefile.am:wmaker_SOURCES += xdnd.c
> > > src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> > > src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> > > xdnd.c \
> > > kix@debian:~/src/wmaker/wmaker-crm$ make distclean >/dev/null 2>&1
> > > kix@debian:~/src/wmaker/wmaker-crm$ ./configure >/dev/null 2>&1
> > > kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> > > src/Makefile:am__append_1 = xdnd.c
> > > src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> > > src/Makefile.am:wmaker_SOURCES += xdnd.c
> > > src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> > > src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> > > xdnd.c \
> > > kix@debian:~/src/wmaker/wmaker-crm$ date
> > > dom jun 7 19:24:25 CEST 2015
> > > kix@debian:~/src/wmaker/wmaker-crm$ ls -l src/Makefile
> > > -rw-r--r-- 1 kix kix 28709 jun 7 19:24 src/Makefile
> > > kix@debian:~/src/wmaker/wmaker-crm$
> > >
> > > Thanks for your reply,
> > > Cheers,
> > > kix.
> >
> >
> > Hi,
> >
> > I confirm I can reproduce here too.
> > The code is right, the issue comes because you need to re-run automake to
> > regenerate the "Makefile.in", something that "configure" does not do (it is
> > outside its scope).
> >
> > An simple solution is to do nothing: when you run "make" it will detect the
> > change when entering in the "src/" directory and automatically regenerate
> > the "Makefile.in", then it will re-generate the "Makefile".
> >
> > Another solution is to explicitly run "autogen.sh" before the "configure",
> > which might be better because it also runs "autoheader", something that the
> > Makefile will not do for you because the dependency check is too
> > complicated, and the impact too costly to do it everytime.
> >
> > Christophe.
>
> Thanks Christophe for you reply. I did it, but the problem continues:
>
> With automake:
>
> kix@debian:~/src/wmaker/wmaker-crm$ make distclean > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$ automake
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$ ./configure --disable-xdnd > /dev/null
> 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile:am__append_1 = xdnd.c
> src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$
>
> With autogen:
>
> kix@debian:~/src/wmaker/wmaker-crm$ make distclean > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ ./autogen.sh > /dev/null 2>&1 &&
> ./configure --disable-xdnd > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile:am__append_1 = xdnd.c
> src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$ make distclean > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ ./autogen.sh > /dev/null 2>&1 &&
> ./configure > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile:am__append_1 = xdnd.c
> src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$ make distclean > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ ./autogen.sh > /dev/null 2>&1 &&
> ./configure --disable-xdnd > /dev/null 2>&1
> kix@debian:~/src/wmaker/wmaker-crm$ grep xdnd.c src/*
> src/Makefile:am__append_1 = xdnd.c
> src/Makefile: wmspec.c workspace.c workspace.h wsmap.c wsmap.h xdnd.c \
> src/Makefile.am:wmaker_SOURCES += xdnd.c
> src/Makefile.in:@USE_DOCK_XDND_TRUE@am__append_1 = xdnd.c
> src/Makefile.in: wmspec.c workspace.c workspace.h wsmap.c wsmap.h
> xdnd.c \
> kix@debian:~/src/wmaker/wmaker-crm$
>
> I am in this commit:
>
> kix@debian:~/src/wmaker/wmaker-crm$ git log --oneline | head -1
> c3ba9ae wmaker: moved calculation of internal offset in handleDockMove
> outside the loop
> kix@debian:~/src/wmaker/wmaker-crm$
>
> Thanks a lot,
> Cheers,
> kix
Hi, the code has problems:
kix@debian:~/src/wmaker/wmaker-crm$ grep enable_dock_xdnd configure.ac
AM_CONDITIONAL([USE_DOCK_XDND], [test "x$enable_dock_xdnd" != "xno"])
kix@debian:~/src/wmaker/wmaker-crm$
The variable "enable_dock_xdnd" is never set, so the value is always empty
(""). Therefore the test is always true.
Cheers,
kix
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
