On Tue, Jul 13, 2010 at 4:03 PM, Enlightenment SVN
<no-re...@enlightenment.org> wrote:
> Log:
> clean up a bit the autotools and various things
>
> make distcheck can't be done as it tries to install some files in /etc
>
And we really want that? Does any other program do things like this?
The way I see it, it's up to packagers to handle these things, and when
users decide to build from source, they should copy any necessary config
file to its right place.
And breaking distcheck is still wrong anyway.
> Author: caro
> Date: 2010-07-13 12:03:14 -0700 (Tue, 13 Jul 2010)
> New Revision: 50230
>
> Added:
> trunk/PROTO/elsa/m4/ac_attribute.m4 trunk/PROTO/elsa/m4/efl_compiler_flag.m4
> Modified:
> trunk/PROTO/elsa/Makefile.am trunk/PROTO/elsa/configure.ac
> trunk/PROTO/elsa/data/Makefile.am trunk/PROTO/elsa/src/bin/Makefile.am
> trunk/PROTO/elsa/src/bin/elsa.c trunk/PROTO/elsa/src/bin/elsa.h
> trunk/PROTO/elsa/src/bin/elsa_config.h trunk/PROTO/elsa/src/bin/elsa_gui.c
> trunk/PROTO/elsa/src/bin/elsa_gui.h trunk/PROTO/elsa/src/bin/elsa_pam.c
> trunk/PROTO/elsa/src/bin/elsa_pam.h trunk/PROTO/elsa/src/bin/elsa_session.c
> trunk/PROTO/elsa/src/bin/elsa_session.h
>
> Modified: trunk/PROTO/elsa/Makefile.am
> ===================================================================
> --- trunk/PROTO/elsa/Makefile.am 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/Makefile.am 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,6 +1,18 @@
> -SUBDIRS = src data
>
> ACLOCAL_AMFLAGS = -I m4
>
> -EXTRA_DIST = config.rpath m4/ChangeLog
> -MAINTAINERCLEANFILES = Makefile.in config.guess config.h.in aclocal.m4
> config.h.in~ config.sub configure depcomp install-sh missing config.rpath
> mkinstalldirs
> +SUBDIRS = src data
> +
> +MAINTAINERCLEANFILES = \
> +Makefile.in \
> +config.guess \
> +config.h.in \
> +aclocal.m4 \
> +config.h.in~ \
> +config.sub \
> +configure \
> +depcomp \
> +install-sh \
> +missing \
> +config.rpath \
> +mkinstalldirs
>
> Modified: trunk/PROTO/elsa/configure.ac
> ===================================================================
> --- trunk/PROTO/elsa/configure.ac 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/configure.ac 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,15 +1,20 @@
> -rm -f config.cache
> +# FIXME:
> +# * what about USE_PAM and pam not found ?
> +# * DISPLAY should not be set here but in source instead
> +# * what about LOCALEDIR ?
>
> -AC_INIT(configure.ac)
> -AC_PREREQ([2.63])
> -AM_CONFIG_HEADER(config.h)
> +AC_INIT([elsa], [0.0.1], [enlightenment-de...@lists.sourceforge.net])
> +AC_PREREQ([2.59])
> +AC_CONFIG_SRCDIR([configure.ac])
> AC_CONFIG_MACRO_DIR([m4])
>
> AC_CANONICAL_BUILD
> AC_CANONICAL_HOST
> AC_CANONICAL_TARGET
>
> -AM_INIT_AUTOMAKE(elsa, 0.0.1)
> +AM_INIT_AUTOMAKE([1.6 dist-bzip2])
> +AM_CONFIG_HEADER([config.h])
> +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
>
> m4_ifdef([AM_GNU_GETTEXT_VERSION], [
> AM_GNU_GETTEXT_VERSION([0.12.1])
> @@ -24,80 +29,116 @@
> ])
> AC_SUBST(LTLIBINTL)
>
> -AC_ISC_POSIX
> -AC_PROG_CC
> -AC_PROG_CXX
> -AM_PROG_CC_STDC
> -AC_HEADER_STDC
> -AC_C_CONST
> -AC_FUNC_MALLOC
>
> +### Needed information
>
> -dnl Set the localedir var for gettext
> +# Set the localedir var for gettext
> AC_DEFINE([LOCALEDIR], ["/usr/share/locale/"], ["locales"])
>
> -dnl Set PACKAGE_DATA_DIR in config.h.
> -if test "x${prefix}" = "xNONE"; then
> - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
> "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
> -else
> - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
> Data Directory])
> -fi
> -
> -dnl Set PACKAGE_BIN_DIR in config.h.
> -if test "x${bindir}" = 'xNONE'; then
> - if test "x${prefix}" = "xNONE"; then
> - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
> [Installation Directory for User Executables])
> - else
> - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation
> Directory for User Executables])
> - fi
> -else
> - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory
> for User Executables])
> -fi
> -
> -dnl Set PACKAGE_LIB_DIR in config.h.
> -if test "x${libdir}" = 'xNONE'; then
> - if test "x${prefix}" = "xNONE"; then
> - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
> [Installation Directory for Libraries])
> - else
> - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation
> Directory for Libraries])
> - fi
> -else
> - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory
> for Libraries])
> -fi
> -
> -dnl Set DISPLAY in config.h.
> +# Set DISPLAY in config.h.
> display=":0.0"
> AC_DEFINE_UNQUOTED(DISPLAY, "${display}", [Display to use])
>
> -dnl Set PACKAGE_SOURCE_DIR in config.h.
> -packagesrcdir=`cd $srcdir && pwd`
> -AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code
> Directory])
> -
> -dnl Set PACKAGE_SOURCE_DIR in config.h.
> +# Set USE_PAM in config.h.
> usepam=""
> AC_DEFINE_UNQUOTED(USE_PAM, "${use_pam}", [Use pam authentification])
>
> -dnl Set edje_cc path
> -AC_ARG_WITH(edje-cc,
> -[ --with-edje-cc=PATH specify a specific path to edje_cc],
> -[
> - v=$withval;
> - edje_cc=$v
> - echo " Enlightenment edje_cc explicitly set to "$edje_cc;
> -],[
> - edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
> -])
> +
> +### Additional options to configure
> +
> +# Set edje_cc path
> +AC_ARG_WITH([edje-cc],
> + [AC_HELP_STRING([ --with-edje-cc=PATH], [specify a specific path to
> edje_cc])],
> + [
> + v=$withval;
> + edje_cc=$v
> + echo " Enlightenment edje_cc explicitly set to "$edje_cc;
> + ],
> + [edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc])
> AC_SUBST(edje_cc)
>
> +
> +### Checks for programs
> +AC_PROG_CC
> +
> +# pkg-config
> +PKG_PROG_PKG_CONFIG
> +
> +
> +### Checks for libraries
> +
> +PKG_CHECK_MODULES([ELSA], [elementary >= 0.5.0.0])
> +
> +AC_CHECK_LIB([pam], [pam_start],
> + [dummy="yes"],
> + [AC_MSG_ERROR([libpam not found.])])
> +
> +
> +### Checks for header files
> +
> +# Pam
> +AC_CHECK_HEADER([security/pam_appl.h],
> + [dummy="yes"],
> + [AC_MSG_ERROR("Cannot find security/pam_appl.h. Make sure your CPPFLAGS
> environment variable contains include lines for the location of this file")])
> +
> +
> +### Checks for types
> +
> +
> +### Checks for structures
> +
> +
> +### Checks for compiler characteristics
> +AC_ISC_POSIX
> +AC_PROG_CC_STDC
> +AC_HEADER_STDC
> +AC_C_CONST
> +AC_GNU_SOURCE
> +AC_C___ATTRIBUTE__
> +
> +EFL_COMPILER_FLAG([-Wall])
> +EFL_COMPILER_FLAG([-W])
> +EFL_COMPILER_FLAG([-Wshadow])
> +
> +
> +### Checks for linker characteristics
> +
> +
> +### Checks for library functions
> +AC_FUNC_MALLOC
> AC_CHECK_FUNCS(strndup)
>
> -PKG_CHECK_MODULES(ELSA, [
> - elementary >= 0.5.0.0
> +
> +AC_OUTPUT([
> +Makefile
> +src/Makefile
> +src/bin/Makefile
> +data/Makefile
> +data/themes/Makefile
> ])
>
> -AC_OUTPUT([Makefile
> - src/Makefile
> - src/bin/Makefile
> - data/Makefile
> - data/themes/Makefile])
>
> +#####################################################################
> +## Info
> +
> +echo
> +echo
> +echo
> +echo
> "------------------------------------------------------------------------"
> +echo "$PACKAGE_NAME $PACKAGE_VERSION"
> +echo
> "------------------------------------------------------------------------"
> +echo
> +echo "Configuration Options Summary:"
> +echo
> +echo " edje_cc..............: ${edje_cc}"
> +echo
> +echo "Compilation............: make (or gmake)"
> +echo " CPPFLAGS.............: $CPPFLAGS"
> +echo " CFLAGS...............: $CFLAGS"
> +echo " LDFLAGS..............: $LDFLAGS"
> +echo
> +echo "Installation...........: make install (as root if needed, with 'su' or
> 'sudo')"
> +echo " prefix...............: $prefix"
> +echo
> +
> +
>
> Modified: trunk/PROTO/elsa/data/Makefile.am
> ===================================================================
> --- trunk/PROTO/elsa/data/Makefile.am 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/data/Makefile.am 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,9 +1,12 @@
> -AUTOMAKE_OPTIONS = 1.4 foreign
> +
> MAINTAINERCLEANFILES = Makefile.in
> -SUBDIRS = themes
>
> +SUBDIRS = themes
> +
> pamdir = /etc/pam.d/
> pam_DATA = elsa
>
> confdir = /etc
> conf_DATA = elsa.conf
> +
> +EXTRA_DIST = elsa elsa.conf
>
> Modified: trunk/PROTO/elsa/src/bin/Makefile.am
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/Makefile.am 2010-07-13 17:53:32 UTC (rev
> 50229)
> +++ trunk/PROTO/elsa/src/bin/Makefile.am 2010-07-13 19:03:14 UTC (rev
> 50230)
> @@ -1,6 +1,12 @@
>
> -AM_CFLAGS = -Wall -W -g -D_GNU_SOURCE @ELSA_CFLAGS@
> +MAINTAINERCLEANFILES = Makefile.in
>
> +AM_CPPFLAGS = \
> +-I$(top_srcdir)/src/bin \
> +-I$(top_builddir)/src/bin \
> +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
> +...@elsa_cflags@
> +
> bin_PROGRAMS = elsa
>
> elsa_SOURCES = \
> @@ -15,10 +21,5 @@
> elsa.h \
> elsa.c
>
> -
> -elsa_INCLUDES =
> -
> elsa_LDFLAGS =
> elsa_LDADD = @ELSA_LIBS@ -lpam
> -
> -MAINTAINERCLEANFILES = Makefile.in
>
> Modified: trunk/PROTO/elsa/src/bin/elsa.c
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa.c 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa.c 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,6 +1,6 @@
> #include <unistd.h>
> #include <sys/types.h>
> -#include <X11/Xlib.h>
> +
> #include "elsa.h"
>
>
>
> Modified: trunk/PROTO/elsa/src/bin/elsa.h
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa.h 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa.h 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,8 +1,12 @@
> #ifndef ELSA_H_
> #define ELSA_H_
>
> +#ifdef HAVE_CONFIG_H
> +# include <config.h>
> +#endif
> +
> #include <stdio.h>
> -#include <config.h>
> +
> #include <Elementary.h>
>
> #include "elsa_session.h"
> @@ -10,5 +14,4 @@
> #include "elsa_gui.h"
> #include "elsa_config.h"
>
> -#define __UNUSED__ __attribute__((unused))
> -#endif //ELSA_H_
> +#endif /* ELSA_H_ */
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_config.h
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_config.h 2010-07-13 17:53:32 UTC (rev
> 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_config.h 2010-07-13 19:03:14 UTC (rev
> 50230)
> @@ -1,6 +1,5 @@
> #ifndef ELSA_CONFIG_H_
> #define ELSA_CONFIG_H_
> -#include <Elementary.h>
>
> #define ELSA_CONFIG_FILE "elsa.cfg"
> #define ELSA_SESSION_PATH "config/session/path"
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_gui.c
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_gui.c 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_gui.c 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,5 +1,3 @@
> -#include <Elementary.h>
> -#include <Ecore_X.h>
> #include "elsa.h"
>
> typedef struct Elsa_Gui_ {
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_gui.h
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_gui.h 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_gui.h 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,9 +1,11 @@
> #ifndef ELSA_GUI_H_
> #define ELSA_GUI_H_
> +
> int elsa_gui_init();
> void elsa_gui_run();
> void elsa_gui_shutdown();
> char *elsa_gui_user_get();
> char *elsa_gui_password_get();
> void elsa_gui_auth_error();
> +
> #endif
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_pam.c
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_pam.c 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_pam.c 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,6 +1,6 @@
> -#include <security/pam_appl.h>
> #include <stdlib.h>
> #include <string.h>
> +
> #include "elsa.h"
>
> /*
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_pam.h
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_pam.h 2010-07-13 17:53:32 UTC (rev 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_pam.h 2010-07-13 19:03:14 UTC (rev 50230)
> @@ -1,5 +1,6 @@
> #ifndef ELSA_PAM_H_
> #define ELSA_PAM_H_
> +
> #include <security/pam_appl.h>
>
> typedef enum ELSA_PAM_ITEM_TYPE_ {
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_session.c
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_session.c 2010-07-13 17:53:32 UTC (rev
> 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_session.c 2010-07-13 19:03:14 UTC (rev
> 50230)
> @@ -1,4 +1,4 @@
> -#include "elsa.h"
> +
> #include <sys/types.h>
> #include <grp.h>
> #include <pwd.h>
> @@ -9,8 +9,8 @@
> #include <stdlib.h>
> #include <sys/types.h>
> #include <sys/wait.h>
> -//#include <Elementary.h>
>
> +#include "elsa.h"
>
>
> char *mcookie;
>
> Modified: trunk/PROTO/elsa/src/bin/elsa_session.h
> ===================================================================
> --- trunk/PROTO/elsa/src/bin/elsa_session.h 2010-07-13 17:53:32 UTC (rev
> 50229)
> +++ trunk/PROTO/elsa/src/bin/elsa_session.h 2010-07-13 19:03:14 UTC (rev
> 50230)
> @@ -1,6 +1,5 @@
> #ifdef ELSA_SESSION_H_
> #define ELSA_SESSION_H_
> -//#include <Elementary.h>
>
> void elsa_session_init(struct passwd *pwd);
> void elsa_session_run(struct passwd *pwd);
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by Sprint
> What will you do first with EVO, the first 4G phone?
> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
