From: <enl...@li...> - 2003-05-24 00:07:03
|
Enlightenment CVS committal Author : jeoparde Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: ChangeLog Makefile.am acinclude.m4 autogen.sh configure.in Log Message: Overly delayed patch, from Tilman Sauerbeck <ti...@co...> - Update autofoo system...include everything in data/ - Support for crypt() and /etc/shadow ... PAM no longer compulsory - Messages to syslog instead of stdout =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ChangeLog 31 Jan 2003 21:57:02 -0000 1.1 +++ ChangeLog 24 May 2003 00:06:31 -0000 1.2 @@ -1,3 +1,29 @@ +2003-05-06 Tilman Sauerbeck <ti...@co...> + * output info/error messages/warnings to syslog + instead of stdout/stderr + +2003-05-05 Tilman Sauerbeck <ti...@co...> + * src/client/entrance_theme.c entrance_theme_parse(): + changed the theme format. + added color_parse() offset_parse() size_parse() pos_parse() + +2003-05-02 Tilman Sauerbeck <ti...@co...> + * configure.in: use pkg-config to check for e libs + * use automake to install config and data files + * check whether to use shadow at runtime + +2003-04-25 Tilman Sauerbeck <ti...@co...> + * configure.in: Check for crypt() and /etc/shadow + * configure.in: Use AH_VERBATIM() to create config.h.in + instead of acconfig.h + * src/client/ui_callbacks.c (entrance_return_key_cb) + use entrance_session_auth_user() instead of entrance_auth_cmp() + * src/client/entrance_config.[ch]: added option "use_pam_auth" + * src/client/sys_callbacks.c (entrance_start_x) + only clear PAM session if PAM is used + * src/client/entrance_session.c (entrance_session_auth_user) + handle entrance_auth_pam() _and_ entrance_auth_crypt() + New Stuff - Added a "Default" option to the session list menu =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 1 Mar 2003 07:09:13 -0000 1.2 +++ Makefile.am 24 May 2003 00:06:32 -0000 1.3 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src +SUBDIRS = data src EXTRA_DIST = \ autogen.sh README AUTHORS COPYING @@ -9,15 +9,6 @@ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in -install-data-local: - @$(NORMAL_INSTALL) - if test -d $(srcdir)/data; then \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ - (cd $(srcdir); tar -cf - data) | (cd $(DESTDIR)$(pkgdatadir); tar -xf -); \ - (cd $(srcdir)/config/init.d; tar -cf - entrance) | (cd $(DESTDIR)$(pkgdatadir); tar -xf -) \ - fi - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX); \ - (cd $(srcdir)/config/pam.d; tar -cf - entrance) | (cd $(DESTDIR)$(PAM_PREFIX); tar -xf -) dist-hook: if test -d data; then \ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/acinclude.m4,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- acinclude.m4 1 Feb 2003 05:13:33 -0000 1.1 +++ acinclude.m4 24 May 2003 00:06:32 -0000 1.2 @@ -1,136 +1,14 @@ -dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl -dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS -dnl -dnl The script must support `--cflags' and `--libs' args. -dnl If MINIMUM-VERSION is specified, the script must also support the -dnl `--version' arg. -dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given, -dnl it must also support `--prefix' and `--exec-prefix'. -dnl (In other words, it must be like gtk-config.) -dnl -dnl For example: -dnl -dnl AC_PATH_GENERIC(Foo, 1.0.0) -dnl -dnl would run `foo-config --version' and check that it is at least 1.0.0 -dnl -dnl If so, the following would then be defined: -dnl -dnl FOO_CFLAGS to `foo-config --cflags` -dnl FOO_LIBS to `foo-config --libs` -dnl -dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK) -dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount) -dnl -dnl @author Angus Lees <gu...@cs...> -dnl @version $Id: acinclude.m4,v 1.1 2003/02/01 05:13:33 jeoparde Exp $ - -AC_DEFUN(AC_PATH_GENERIC, -[dnl -dnl we're going to need uppercase, lowercase and user-friendly versions of the -dnl string `LIBRARY' -pushdef([UP], translit([$1], [a-z], [A-Z]))dnl -pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl - -dnl -dnl Get the cflags and libraries from the LIBRARY-config script -dnl -AC_ARG_WITH(DOWN-prefix,[ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], - DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") -AC_ARG_WITH(DOWN-exec-prefix,[ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], - DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") - - if test x$DOWN[]_config_exec_prefix != x ; then - DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix" - if test x${UP[]_CONFIG+set} != xset ; then - UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config - fi - fi - if test x$DOWN[]_config_prefix != x ; then - DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix" - if test x${UP[]_CONFIG+set} != xset ; then - UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config - fi - fi - - AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no) - ifelse([$2], , - AC_MSG_CHECKING(for $1), - AC_MSG_CHECKING(for $1 - version >= $2) - ) - no_[]DOWN="" - if test "$UP[]_CONFIG" = "no" ; then - no_[]DOWN=yes - else - UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`" - UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`" - ifelse([$2], , ,[ - DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \ - --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \ - --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \ - --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])" - DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])" - DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])" - - # Compare wanted version to what config script returned. - # If I knew what library was being run, i'd probably also compile - # a test program at this point (which also extracted and tested - # the version in some library-specific way) - if test "$DOWN[]_config_major_version" -lt \ - "$DOWN[]_wanted_major_version" \ - -o \( "$DOWN[]_config_major_version" -eq \ - "$DOWN[]_wanted_major_version" \ - -a "$DOWN[]_config_minor_version" -lt \ - "$DOWN[]_wanted_minor_version" \) \ - -o \( "$DOWN[]_config_major_version" -eq \ - "$DOWN[]_wanted_major_version" \ - -a "$DOWN[]_config_minor_version" -eq \ - "$DOWN[]_wanted_minor_version" \ - -a "$DOWN[]_config_micro_version" -lt \ - "$DOWN[]_wanted_micro_version" \) ; then - # older version found - no_[]DOWN=yes - echo -n "*** An old version of $1 " - echo -n "($DOWN[]_config_major_version" - echo -n ".$DOWN[]_config_minor_version" - echo ".$DOWN[]_config_micro_version) was found." - echo -n "*** You need a version of $1 newer than " - echo -n "$DOWN[]_wanted_major_version" - echo -n ".$DOWN[]_wanted_minor_version" - echo ".$DOWN[]_wanted_micro_version." - echo "***" - echo "*** If you have already installed a sufficiently new version, this error" - echo "*** probably means that the wrong copy of the DOWN-config shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the" - echo "*** correct copy of DOWN-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi - ]) - fi - if test "x$no_[]DOWN" = x ; then - AC_MSG_RESULT(yes) - ifelse([$3], , :, [$3]) - else - AC_MSG_RESULT(no) - if test "$UP[]_CONFIG" = "no" ; then - echo "*** The DOWN-config script installed by $1 could not be found" - echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the UP[]_CONFIG environment variable to the" - echo "*** full path to DOWN-config." - fi - UP[]_CFLAGS="" - UP[]_LIBS="" - ifelse([$4], , :, [$4]) - fi - AC_SUBST(UP[]_CFLAGS) - AC_SUBST(UP[]_LIBS) - - popdef([UP]) - popdef([DOWN]) +dnl AC_EXPAND_DIR(VARNAME, DIR) +dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR, +dnl and assigns the resulting string to VARNAME +dnl example: AC_DEFINE_DIR(DATADIR, "$datadir") +dnl by Alexandre Oliva <ol...@dc...> +AC_DEFUN(AC_EXPAND_DIR, [ + $1=$2 + $1=`( + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + eval echo \""[$]$1"\" + )` ]) + =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 31 Jan 2003 21:57:02 -0000 1.1 +++ autogen.sh 24 May 2003 00:06:32 -0000 1.2 @@ -141,8 +141,7 @@ if test x$NOCONFIGURE = x; then echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME + $srcdir/configure $conf_flags "$@" else echo Skipping configure process. fi =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in 1 Mar 2003 07:09:13 -0000 1.3 +++ configure.in 24 May 2003 00:06:32 -0000 1.4 @@ -4,28 +4,43 @@ AM_INIT_AUTOMAKE(entrance, 0.0.2) AM_CONFIG_HEADER(src/config.h) +dnl init config.h.in +AH_VERBATIM(HAVE_PAM, +#undef HAVE_PAM +) +AH_VERBATIM(HAVE_SHADOW, +#undef HAVE_SHADOW +) +AH_VERBATIM(PACKAGE_DATA_DIR, +#undef PACKAGE_DATA_DIR +) +AH_VERBATIM(PACKAGE_SOURCE_DIR, +#undef PACKAGE_SOURCE_DIR +) +AH_VERBATIM(PACKAGE_CFG_DIR, +#undef PACKAGE_CFG_DIR +) +AH_VERBATIM(PREFIX, +#undef PREFIX +) + AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC -dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${datadir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}") - else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") - fi -else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") -fi +AC_EXPAND_DIR(PACKAGE_DATA_DIR, "$datadir/${PACKAGE}") +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "$PACKAGE_DATA_DIR") if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PREFIX, "/usr/local/") + AC_DEFINE_UNQUOTED(PREFIX, "/usr/local/") else - AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") + AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") fi +AC_EXPAND_DIR(PACKAGE_CFG_DIR, "$sysconfdir") +AC_DEFINE_UNQUOTED(PACKAGE_CFG_DIR, "$PACKAGE_CFG_DIR") + dnl Set PACKAGE_SOURCE_DIR in config.h. packagesrcdir=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") @@ -40,78 +55,22 @@ fi changequote([,])dnl -withval="" -AC_ARG_WITH(pam-prefix, -[ --with-pam-prefix=<prefix> specify where pam files go],[ -if test x$withval != x; then - AC_MSG_RESULT("PAM files will be installed in prefix ${withval}.") -fi]) -if test x$withval != x; then - PAM_PREFIX_UNEXPANDED="$withval" -else - PAM_PREFIX_UNEXPANDED="$sysconfdir" -fi -PAM_PREFIX=`eval echo $PAM_PREFIX_UNEXPANDED` -AC_SUBST(PAM_PREFIX) - -AC_ARG_WITH(edb, - [ --with-edb=DIR use edb in <DIR>], - [ CFLAGS="$CFLAGS -I$withval/include" - LIBS="-L$withval/lib $LIBS"]) -AC_ARG_WITH(ebg, - [ --with-ebg=DIR use ebg in <DIR>], - [ CFLAGS="$CFLAGS -I$withval/include" - LIBS="-L$withval/lib $LIBS"]) -AC_ARG_WITH(evas, - [ --with-evas=DIR use evas in <DIR>], - [ CFLAGS="$CFLAGS -I$withval/include" - LIBS="-L$withval/lib $LIBS"]) -AC_ARG_WITH(ecore, - [ --with-ecore=DIR use ecore in <DIR>], - [ CFLAGS="$CFLAGS -I$withval/include" - LIBS="-L$withval/lib $LIBS"]) - -AC_PATH_GENERIC(edb, 1.0.3, [ - AC_SUBST(edb_libs) - AC_SUBST(edb_cflags) ], - AC_MSG_ERROR(Cannot find edb: Is edb-config in path?)) -edb_libs=`edb-config --libs` -edb_cflags=`edb-config --cflags` -AC_SUBST(edb_libs) -AC_SUBST(edb_cflags) - -AC_PATH_GENERIC(ecore, 0.0.2, [ - AC_SUBST(ecore_libs) - AC_SUBST(ecore_cflags) ], - AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?)) -ecore_libs=`ecore-config --libs` -ecore_cflags=`ecore-config --cflags` -AC_SUBST(ecore_libs) -AC_SUBST(ecore_cflags) - -AC_PATH_GENERIC(evas, 1.0.0, [ - AC_SUBST(evas_libs) - AC_SUBST(evas_cflags) ], - AC_MSG_ERROR(Cannot find evas: Is evas-config in path?)) -evas_libs=`evas-config --libs` -evas_cflags=`evas-config --cflags` -AC_SUBST(evas_libs) -AC_SUBST(evas_cflags) - -AC_PATH_GENERIC(ebg, 1.0.0, [ - AC_SUBST(ebg_libs) - AC_SUBST(ebg_cflags) ], - AC_MSG_ERROR(Cannot find ebg: Is ebg-config in path?)) -ebg_libs=`ebg-config --libs` -ebg_cflags=`ebg-config --cflags` -AC_SUBST(ebg_libs) -AC_SUBST(ebg_cflags) +PKG_CHECK_MODULES(ENTRANCE, edb >= 1.0.3 ecore >= 0.0.2 evas >= 1.0.0 ebg >= 1.0.0) AC_CHECK_HEADERS(security/pam_appl.h, [ - LIBS="$LIBS -lpam" - VRFY="verify-pam" + LIBS="$LIBS -lpam" + have_pam=yes AC_DEFINE(HAVE_PAM)]) +AC_CHECK_LIB(crypt, crypt, [LIBS="$LIBS -lcrypt"]) +AC_CHECK_HEADERS(crypt.h) + +have_shadow=no +AC_CHECK_LIB(shadow, getspnam, [ + LIBS="$LIBS -lshadow" + AC_DEFINE(HAVE_SHADOW) + have_shadow=yes]) + #AC_CONFIG_FILES([src/daemon/entrance_wrapper:src/daemon/entrance_wrapper.in], # [chmod a+x src/daemon/entrance_wrapper]) @@ -122,5 +81,22 @@ src/daemon/Makefile src/daemon/entrance_wrapper config/init.d/entrance +data/Makefile +data/config/Makefile +data/images/Makefile +data/images/sessions/Makefile +data/themes/Makefile +data/themes/BlueCrystal/Makefile +data/themes/matrix0/Makefile ]) +AC_OUTPUT + +echo +echo "$PACKAGE $VERSION" +echo +echo "Support for shadow authentication... $have_shadow" +echo "Support for PAM authentication...... $have_pam" +echo +echo "Now type 'make' (gmake on some systems) to compile $PACKAGE" +echo |