Enlightenment CVS committal Author : monkeyiq Project : misc Module : gevas2
Dir : misc/gevas2 Modified Files: configure.in Added Files: config.h.in Log Message: If you can safely remote config.h.in and still have stuff turn up in config.h that is AC_DEFINE_UNQUOTED()ed in configure.in then I don't mind it being removed from cvs. Otherwise it has to stay around. Also now things should build ok for the nightly system. =================================================================== RCS file: /cvs/e/misc/gevas2/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- configure.in 15 Aug 2007 17:30:23 -0000 1.11 +++ configure.in 18 Aug 2007 01:06:27 -0000 1.12 @@ -49,22 +49,6 @@ AM_CONDITIONAL(HAVE_EDJE, test "$have_edje" = yes) -dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${datarootdir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", 1, [ Where to install data ]) - else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", 1, [ Where to install data ]) - fi -else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datarootdir}/${PACKAGE}", 1, [ Where to install data ]) -fi - - - - -dnl evas_cflags=`evas-config --cflags` -dnl evas_libs=`evas-config --libs` have_evas=no @@ -80,26 +64,16 @@ evas_libs=$EVAS_LIBS -if test "x${prefix}" = 'xNONE'; then - prefix=${ac_default_prefix}; -fi; -if test "x${exec_prefix}" = 'xNONE'; then - exec_prefix=${ac_default_prefix}; -fi; - -PREFIX=${prefix}; -SYSCONFDIR=`eval echo ${sysconfdir}` -EXECPREFIX=`eval echo ${exec_prefix}` -BINDIR=`eval echo ${bindir}` -LIBDIR=`eval echo ${libdir}` -INCLUDEDIR=`eval echo ${includedir}` - -AC_SUBST(PREFIX) -AC_SUBST(SYSCONFDIR) -AC_SUBST(EXECPREFIX) -AC_SUBST(BINDIR) -AC_SUBST(LIBDIR) -AC_SUBST(INCLUDEDIR) +dnl Set PACKAGE_DATA_DIR in config.h. +if test "x${datarootdir}" = '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, "${datarootdir}/${PACKAGE}") +fi ICON_INSTALL_DIR="/usr/local/gevas2/icons" AC_SUBST(ICON_INSTALL_DIR) ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs