From: <enl...@li...> - 2002-01-01 14:29:24
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : libs/etox Dir : e17/libs/etox Modified Files: Makefile.am configure.ac Log Message: I appear to have broken configure.ac when adding the doc stuff. I hope this fixes it. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/etox/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 2001/12/27 15:37:53 1.6 +++ Makefile.am 2002/01/01 14:29:22 1.7 @@ -25,3 +25,11 @@ m4datadir = $(datadir)/aclocal m4data_DATA = etox.m4 + +docs: + $(MAKE) -C $(top_srcdir)/doc docs + +if HAVE_JADE +html-docs: + $(MAKE) -C $(top_srcdir)/doc html-docs +endif =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/etox/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.ac 2001/12/27 15:37:53 1.2 +++ configure.ac 2002/01/01 14:29:22 1.3 @@ -1,6 +1,7 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(configure.in) +AC_INIT +AC_CONFIG_SRCDIR([configure.in]) AM_INIT_AUTOMAKE(etox, 0.0.1) AM_CONFIG_HEADER(etox-config.h) @@ -44,181 +45,6 @@ fi changequote([,])dnl -EBITS_CONFIG="ebits-config" -AC_ARG_WITH(ebits, -[ --with-ebits-config=FILE ebits-config script to use (eg /usr/bin/ebits-config)], -[ - EBITS_CONFIG=$withval - AC_CHECK_PROG(EBITS_CONFIG_IN_PATH, $EBITS_CONFIG, yes, no) - if test $EBITS_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The ebits-config development script you specified:" - echo "$EBITS_CONFIG" - echo "was not found. Please check the path and make sure " - echo "the script exists and is executable." - AC_MSG_ERROR([Fatal Error: no ebits-config detected.]) - exit; - fi -], -[ - AC_CHECK_PROG(EBITS_CONFIG_IN_PATH, $EBITS_CONFIG, yes, no) - if test $EBITS_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The ebits-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the ebits-devel (or ebits-dev)" - echo " packages." - echo "2. You may have ebits installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the ebits-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-ebits-config." - AC_MSG_ERROR([Fatal Error: no ebits-config detected.]) - exit; - fi -]) - -EDB_CONFIG="edb-config" -AC_ARG_WITH(edb, -[ --with-edb-config=FILE edb-config script to use (eg /usr/bin/edb-config)], -[ - EDB_CONFIG=$withval - AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no) - if test $EDB_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The edb-config development script you specified:" - echo "$EDB_CONFIG" - echo "was not found. Please check the path and make sure " - echo "the script exists and is executable." - AC_MSG_ERROR([Fatal Error: no edb-config detected.]) - exit; - fi -], -[ - AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no) - if test $EDB_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The edb-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the edb-devel (or edb-dev)" - echo " packages." - echo "2. You may have edb installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the edb-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-edb-config." - AC_MSG_ERROR([Fatal Error: no edb-config detected.]) - exit; - fi -]) - -EVAS_CONFIG="evas-config" -AC_ARG_WITH(evas, -[ --with-evas-config=FILE evas-config script to use (eg /usr/bin/evas-config)], -[ - EVAS_CONFIG=$withval - AC_CHECK_PROG(EVAS_CONFIG_IN_PATH, $EVAS_CONFIG, yes, no) - if test $EVAS_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The evas-config development script you specified:" - echo "$EVAS_CONFIG" - echo "was not found. Please check the path and make sure " - echo "the script exists and is executable." - AC_MSG_ERROR([Fatal Error: no evas-config detected.]) - exit; - fi -], -[ - AC_CHECK_PROG(EVAS_CONFIG_IN_PATH, $EVAS_CONFIG, yes, no) - if test $EVAS_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The evas-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the evas-devel (or evas-dev)" - echo " packages." - echo "2. You may have evas installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the evas-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-evas-config." - AC_MSG_ERROR([Fatal Error: no evas-config detected.]) - exit; - fi -]) - -EWD_CONFIG="ewd-config" -AC_ARG_WITH(ewd, -[ --with-ewd-config=FILE ewd-config script to use (eg /usr/bin/ewd-config)], -[ - EWD_CONFIG=$withval - AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no) - if test $EWD_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The ewd-config development script you specified:" - echo "$EWD_CONFIG" - echo "was not found. Please check the path and make sure " - echo "the script exists and is executable." - AC_MSG_ERROR([Fatal Error: no ewd-config detected.]) - exit; - fi -], -[ - AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no) - if test $EWD_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The ewd-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the ewd-devel (or ewd-dev)" - echo " packages." - echo "2. You may have ewd installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the ewd-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-ewd-config." - AC_MSG_ERROR([Fatal Error: no ewd-config detected.]) - exit; - fi -]) - -IMLIB2_CONFIG="imlib2-config" -AC_ARG_WITH(imlib2, -[ --with-imlib2-config=FILE imlib2-config script to use (eg /usr/bin/imlib2-config)], -[ - IMLIB2_CONFIG=$withval - AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, $IMLIB2_CONFIG, yes, no) - if test $IMLIB2_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The imlib2-config development script you specified:" - echo "$IMLIB2_CONFIG" - echo "was not found. Please check the path and make sure " - echo "the script exists and is executable." - AC_MSG_ERROR([Fatal Error: no imlib2-config detected.]) - exit; - fi -], -[ - AC_CHECK_PROG(IMLIB2_CONFIG_IN_PATH, $IMLIB2_CONFIG, yes, no) - if test $IMLIB2_CONFIG_IN_PATH = no; then - echo "ERROR:" - echo "The imlib2-config development script was not found in your execute" - echo "path. This may mean one of several things" - echo "1. You may not have installed the imlib2-devel (or imlib2-dev)" - echo " packages." - echo "2. You may have imlib2 installed somewhere not covered by your path." - echo "" - echo "If this is the case make sure you have the packages installed, AND" - echo "that the imlib2-config script is in your execute path (see your" - echo "shell's manual page on setting the \$PATH environment variable), OR" - echo "alternatively, specify the script to use with --with-imlib2-config." - AC_MSG_ERROR([Fatal Error: no imlib2-config detected.]) - exit; - fi -]) - AC_SUBST(ebits_cflags) AC_SUBST(ebits_libs) ebits_cflags=`ebits-config --cflags` @@ -249,7 +75,6 @@ imlib2_cflags=`imlib2-config --cflags` imlib2_libs=`imlib2-config --libs` - dnl Checking for Perl: AC_PATH_PROG(PERL,perl,0) AC_SUBST(PERL) @@ -262,8 +87,9 @@ AC_PATH_PROG(JADE, jade) AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS") + -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile etox-config src/Makefile @@ -274,8 +100,10 @@ test/fnt/Makefile test/img/Makefile test/style/Makefile -], [ +]) +AC_CONFIG_COMMANDS([default],[[ chmod +x etox-config chmod +x doc/kernel-doc -] -) + +]],[[]]) +AC_OUTPUT |