E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe Modified Files: configure.in Log Message: switch from -config scripts to pkg-config .pc files === RCS file: /cvs/e/e17/apps/enscribe/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in11 Jun 2006 10:23:44 - 1.6 +++ configure.in26 Aug 2007 22:41:01 - 1.7 @@ -77,59 +77,10 @@ packagesrcdir=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [PACKAGE_SOURCE_DIR]) -# add your required libs / include here -#my_includes=`evas-config --cflags`" "`ecore-config --cflags`" "`edje-config --cflags`" "`esmart-config --cflags` -#my_libs=`evas-config --libs`" "`ecore-config --libs`" "`edje-config --libs`" "`esmart-config --libs`" "${LIBS} -#AC_SUBST(my_includes) -#AC_SUBST(my_libs) - -PROG="esmart-config"; -AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH) -if test -z "$ESMART_CONFIG" ; then - echo $PROG " is not in your \$PATH. Please ensure it is."; - echo "Read the manual page for you shell as to how to extend your path."; - AC_MSG_ERROR(Cannot find $PROG) -fi -esmart_cflags=`$ESMART_CONFIG --cflags` -esmart_libs=`$ESMART_CONFIG --libs` -AC_SUBST(esmart_cflags) -AC_SUBST(esmart_libs) - -PROG="evas-config"; -AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) -if test -z "$EVAS_CONFIG" ; then - echo $PROG " is not in your \$PATH. Please ensure it is."; - echo "Read the manual page for you shell as to how to extend your path."; - AC_MSG_ERROR(Cannot find $PROG) -fi -evas_cflags=`$EVAS_CONFIG --cflags` -evas_libs=`$EVAS_CONFIG --libs` -AC_SUBST(evas_cflags) -AC_SUBST(evas_libs) - -PROG="ecore-config"; -AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH) -if test -z "$ECORE_CONFIG" ; then - echo $PROG " is not in your \$PATH. Please ensure it is."; - echo "Read the manual page for you shell as to how to extend your path."; - AC_MSG_ERROR(Cannot find $PROG) -fi -ecore_cflags=`$ECORE_CONFIG --cflags` -ecore_libs=`$ECORE_CONFIG --libs` -AC_SUBST(ecore_cflags) -AC_SUBST(ecore_libs) - -PROG="edje-config"; -AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) -if test -z "$EDJE_CONFIG" ; then - echo $PROG " is not in your \$PATH. Please ensure it is."; - echo "Read the manual page for you shell as to how to extend your path."; - AC_MSG_ERROR(Cannot find $PROG) -fi -edje_cflags=`$EDJE_CONFIG --cflags` -edje_libs=`$EDJE_CONFIG --libs` -AC_SUBST(edje_cflags) -AC_SUBST(edje_libs) +PKG_CHECK_MODULES(ESMART, [esmart_textarea]) +PKG_CHECK_MODULES(EVAS, [evas]) +PKG_CHECK_MODULES(ECORE, [ecore]) +PKG_CHECK_MODULES(EDJE, [edje]) AC_OUTPUT([ - 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
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe/src/bin Modified Files: Makefile.am Log Message: switch from -config scripts to pkg-config .pc files === RCS file: /cvs/e/e17/apps/enscribe/src/bin/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 29 Mar 2005 21:01:15 - 1.1 +++ Makefile.am 26 Aug 2007 22:41:01 - 1.2 @@ -1,10 +1,9 @@ ## Process this file with automake to produce Makefile.in INCLUDES = \ --I/usr/local/include \ -I$(top_srcdir)/lib \ [EMAIL PROTECTED]@ @ecore_cflags@ @evas_cflags@ \ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @ECORE_CFLAGS@ @EVAS_CFLAGS@ \ [EMAIL PROTECTED]@ bin_PROGRAMS = enscribe @@ -14,6 +13,4 @@ window.c \ main.c -enscribe_LDADD = @edje_libs@ @ecore_libs@ @evas_libs@ \ [EMAIL PROTECTED]@ -lesmart_container -lesmart_textarea - +enscribe_LDADD = @EDJE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @ESMART_LIBS@ - 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
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe/src/bin Modified Files: enscribe.h Log Message: pull in stdlib.h so we get proper prototypes for critical functions like malloc() === RCS file: /cvs/e/e17/apps/enscribe/src/bin/enscribe.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- enscribe.h 29 Mar 2005 21:01:15 - 1.1 +++ enscribe.h 28 Jan 2007 11:59:03 - 1.2 @@ -1,4 +1,5 @@ #include +#include #include #include #include - 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
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe Modified Files: autogen.sh Log Message: use simpler autogen script === RCS file: /cvsroot/enlightenment/e17/apps/enscribe/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 29 Mar 2005 21:01:13 - 1.1 +++ autogen.sh 30 Oct 2005 07:58:24 - 1.2 @@ -1,148 +1,14 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -PKG_NAME="enscribe" +rm -rf autom4te.cache +rm -f aclocal.m4 ltmain.sh -DIE=0 +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"; - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtoolize --version) < /dev/null > /dev/null 2>&1 || { -echo -echo "**Error**: You must have \`libtool' installed." -echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"; -echo "(or a newer version if it is available)" -DIE=1 - } -} - -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { -echo -echo "**Error**: You must have \`gettext' installed." -echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"; -echo "(or a newer version if it is available)" -DIE=1 - } -} - -grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { -echo -echo "**Error**: You must have \`gettext' installed." -echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"; -echo "(or a newer version if it is available)" -DIE=1 - } -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"; - echo "(or a newer version if it is available)" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"; - echo "(or a newer version if it is available)" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then -echo skipping $dr -- flagged as no auto-gen - else -echo processing $dr -macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` -( cd $dr - aclocalinclude="$ACLOCAL_FLAGS" - for k in $macrodirs; do - if test -d $k; then - aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." -fi - done - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then - if grep "sed.*POTFILES" configure.in >/dev/null; then - : do nothing -- we still have an old unmodified configure.in - else - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 -fi - fi - if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy -
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe Modified Files: configure.in Removed Files: acconfig.h Log Message: update autotools === RCS file: /cvsroot/enlightenment/e17/apps/enscribe/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in12 Oct 2005 23:22:34 - 1.4 +++ configure.in30 Oct 2005 07:56:13 - 1.5 @@ -47,39 +47,39 @@ 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}") +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR]) else -AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR]) fi else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [PACKAGE_DATA_DIR]) 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") +AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [PACKAGE_BIN_DIR]) else -AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin") +AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [PACKAGE_BIN_DIR]) fi else - AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}") + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [PACKAGE_BIN_DIR]) 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") +AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [PACKAGE_LIB_DIR]) else -AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib") +AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [PACKAGE_LIB_DIR]) fi else - AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}") + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [PACKAGE_LIB_DIR]) fi dnl Set PACKAGE_SOURCE_DIR in config.h. packagesrcdir=`cd $srcdir && pwd` -AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") +AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [PACKAGE_SOURCE_DIR]) # add your required libs / include here #my_includes=`evas-config --cflags`" "`ecore-config --cflags`" "`edje-config --cflags`" "`esmart-config --cflags` --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe Modified Files: configure.in Log Message: remove pointless [] around if tests and make sure we quote properly for -z tests === RCS file: /cvsroot/enlightenment/e17/apps/enscribe/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in10 Oct 2005 20:20:24 - 1.3 +++ configure.in12 Oct 2005 23:22:34 - 1.4 @@ -89,7 +89,7 @@ PROG="esmart-config"; AC_PATH_PROG(ESMART_CONFIG, $PROG, "", $PATH) -if [ test -z $ESMART_CONFIG ]; then +if test -z "$ESMART_CONFIG" ; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; AC_MSG_ERROR(Cannot find $PROG) @@ -101,7 +101,7 @@ PROG="evas-config"; AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) -if [ test -z $EVAS_CONFIG ]; then +if test -z "$EVAS_CONFIG" ; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; AC_MSG_ERROR(Cannot find $PROG) @@ -113,7 +113,7 @@ PROG="ecore-config"; AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH) -if [ test -z $ECORE_CONFIG ]; then +if test -z "$ECORE_CONFIG" ; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; AC_MSG_ERROR(Cannot find $PROG) @@ -125,7 +125,7 @@ PROG="edje-config"; AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) -if [ test -z $EDJE_CONFIG ]; then +if test -z "$EDJE_CONFIG" ; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; AC_MSG_ERROR(Cannot find $PROG) --- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/enscribe vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : apps/enscribe Dir : e17/apps/enscribe Modified Files: configure.in Log Message: stop running exit since its bad form ... use AC_MSG_ERROR instead === RCS file: /cvsroot/enlightenment/e17/apps/enscribe/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in29 Mar 2005 21:01:13 - 1.1 +++ configure.in29 Apr 2005 02:54:35 - 1.2 @@ -92,8 +92,7 @@ if [ test -z $ESMART_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi esmart_cflags=`$ESMART_CONFIG --cflags` esmart_libs=`$ESMART_CONFIG --libs` @@ -105,8 +104,7 @@ if [ test -z $EVAS_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi evas_cflags=`$EVAS_CONFIG --cflags` evas_libs=`$EVAS_CONFIG --libs` @@ -118,8 +116,7 @@ if [ test -z $ECORE_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi ecore_cflags=`$ECORE_CONFIG --cflags` ecore_libs=`$ECORE_CONFIG --libs` @@ -131,8 +128,7 @@ if [ test -z $EDJE_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi edje_cflags=`$EDJE_CONFIG --cflags` edje_libs=`$EDJE_CONFIG --libs` --- SF.Net email is sponsored by: Tell us your software development plans! Take this survey and enter to win a one-year sub to SourceForge.net Plus IDC's 2005 look-ahead and a copy of this survey Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs