From: Enlightenment C. <no...@cv...> - 2006-08-25 07:13:43
|
Enlightenment CVS committal Author : vapier Project : misc Module : epbb Dir : misc/epbb Modified Files: configure.in Log Message: cleanup configure script so it has a hope of working with autoconf-2.60 =================================================================== RCS file: /cvs/e/misc/epbb/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 20 Jan 2004 10:31:01 -0000 1.2 +++ configure.in 25 Aug 2006 07:13:19 -0000 1.3 @@ -66,11 +66,12 @@ 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."; - echo "FATAL ERROR. ABORT."; - exit -1; +if test -z "$EVAS_CONFIG" ; then + AC_MSG_ERROR([ + $PROG is not in your \$PATH. Please ensure it is. + Read the manual page for you shell as to how to extend your path. + FATAL ERROR. ABORT. + ]) fi evas_cflags=`$EVAS_CONFIG --cflags` evas_libs=`$EVAS_CONFIG --libs` @@ -80,10 +81,11 @@ 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."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR([ + $PROG is not in your \$PATH. Please ensure it is. + Read the manual page for you shell as to how to extend your path. + FATAL ERROR. ABORT. + ]) fi ecore_cflags=`$ECORE_CONFIG --cflags` ecore_libs=`$ECORE_CONFIG --libs` @@ -93,10 +95,11 @@ 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."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR([ + $PROG is not in your \$PATH. Please ensure it is. + Read the manual page for you shell as to how to extend your path. + FATAL ERROR. ABORT. + ]) fi edje_cflags=`$EDJE_CONFIG --cflags` edje_libs=`$EDJE_CONFIG --libs` @@ -112,8 +115,8 @@ PBB_LDADD="-lpbb" echo "Use develpment version of libpbb." else - AC_CHECK_LIB(pbb, init_libpbb,pbb_libs="-lpbb",AC_MSG_ERROR(Cannot find libpbb, please compile and install it first.)) - AC_CHECK_LIB(pbb, taglist_count,,AC_DEFINE_UNQUOTED(HAVE_OLDLIBPBB, 1,[latest libpbb version available])) + AC_CHECK_LIB([pbb], [init_libpbb], [pbb_libs="-lpbb"], [AC_MSG_ERROR([Cannot find libpbb, please compile and install it first.])]) + AC_CHECK_LIB([pbb], [taglist_count], [], [AC_DEFINE_UNQUOTED([HAVE_OLDLIBPBB], [1], [latest libpbb version available])]) fi AC_SUBST(pbb_cflags) AC_SUBST(pbb_libs) |