Enlightenment CVS committal Author : lok Project : e17 Module : apps/emphasis
Dir : e17/apps/emphasis Modified Files: INSTALL configure.in Log Message: Patch from `vko. Use pkg-config and libtool. =================================================================== RCS file: /cvs/e/e17/apps/emphasis/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- INSTALL 6 Jun 2006 11:22:15 -0000 1.1 +++ INSTALL 22 Mar 2007 13:25:26 -0000 1.2 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -78,7 +78,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +87,15 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +188,12 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== =================================================================== RCS file: /cvs/e/e17/apps/emphasis/configure.in,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- configure.in 18 Mar 2007 17:18:17 -0000 1.13 +++ configure.in 22 Mar 2007 13:25:26 -0000 1.14 @@ -21,8 +21,7 @@ AC_HEADER_STDC AC_C_CONST AM_ENABLE_SHARED -#AM_PROG_LIBTOOL -LIBS="" +AM_PROG_LIBTOOL dnl Set PACKAGE_DATA_DIR in config.h. if test "x${prefix}" = "xNONE"; then @@ -72,8 +71,8 @@ m4_include(m4/ac_path_efl.m4) AC_CHECK_FUNCS(strndup) AC_CHECK_LIB(pthread, pthread_create) -AC_PATH_EFL(ecore, 0.9.9.022, [AM_CONDITIONAL(HAVE_ECORE, true)]) -AC_PATH_EFL(etk, 0.1.0.002, [AM_CONDITIONAL(HAVE_ETK, true)]) +PKG_CHECK_MODULES(ECORE, ecore >= 0.9.9.022, [AM_CONDITIONAL(HAVE_ECORE, true)]) +PKG_CHECK_MODULES(ETK, etk >= 0.1.0.002, [AM_CONDITIONAL(HAVE_ETK, true)]) AC_PATH_GENERIC(enhance, 0.0.1, [AM_CONDITIONAL(HAVE_ENHANCE, true)]) AC_PATH_GENERIC(XML2, 2.6.0, [AM_CONDITIONAL(HAVE_XML2, true)]) PKG_CHECK_MODULES(libmpd, libmpd >= 0.12.0, [AM_CONDITIONAL(HAVE_LIBMPD, true)]) ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs