E CVS: libast mej

[<enl...@li...>]

Enlightenment CVS committal

Author  : mej
Project : eterm
Module  : libast

Dir     : eterm/libast


Modified Files:
	ChangeLog libast.m4 


Log Message:
Mon Aug 19 21:02:56 2002                        Michael Jennings (mej)

Added a macro to permit client apps a simple way to detect libast.

===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ChangeLog	14 Aug 2002 02:53:29 -0000	1.55
+++ ChangeLog	20 Aug 2002 01:09:46 -0000	1.56
@@ -310,3 +310,7 @@
 
 Oops, disable those old functions for now.
 ----------------------------------------------------------------------
+Mon Aug 19 21:02:56 2002                        Michael Jennings (mej)
+
+Added a macro to permit client apps a simple way to detect libast.
+----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/libast.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- libast.m4	14 Aug 2002 01:45:14 -0000	1.4
+++ libast.m4	20 Aug 2002 01:09:46 -0000	1.5
@@ -1,13 +1,76 @@
 dnl#####################################################################
 dnl# Autoconf m4 macros for LibAST
-dnl# $Id: libast.m4,v 1.4 2002/08/14 01:45:14 mej Exp $
+dnl# $Id: libast.m4,v 1.5 2002/08/20 01:09:46 mej Exp $
 dnl#####################################################################
 
 dnl#
+dnl# Check for LibAST and support components
+dnl#    - arg 1 is the env variable to set
+dnl#    - arg 2 is the LIBS variable to use
+dnl#
+AC_DEFUN(AST_CHECK_LIBAST, [
+    AC_CHECK_PROG(LIBAST_CONFIG, libast-config, libast-config, false)
+    if test "$LIBAST_CONFIG" = "false"; then
+        $1=0
+    else
+        $1=1
+        CPPFLAGS="$CPPFLAGS `$LIBAST_CONFIG --cppflags`"
+        LDFLAGS="$LDFLAGS `$LIBAST_CONFIG --ldflags`"
+    fi
+    AC_CHECK_HEADERS(libast.h, [
+        AC_CHECK_LIB(ast, libast_malloc, $1=1, $1=0, ${$2})
+    ], $1=0)
+
+    if test "${$1}" -ne "1"; then
+        echo "ERROR:  You need the LibAST package to build Eterm.  If you already have it,";
+        echo "        you may have it installed in a strange place, or you may need to run";
+        echo "        /sbin/ldconfig.  If you don't have it, I can download it for you.";
+        echo "        Shall I retrieve and build LibAST now (y/n)?";
+        read ANS
+        if test "x$ANS" = "xy" -o "x$ANS" = "xyes" -o "x$ANS" = "xY" -o "x$ANS" = "xYES"; then
+            # Download from CVS server
+            CVSROOT=":pserver:ano...@cv...:/cvsroot/enlightenment"
+            test -f $HOME/.cvspass || touch $HOME/.cvspass
+            grep $CVSROOT $HOME/.cvspass >/dev/null 2>&1 || cvs -d $CVSROOT login
+            cvs -z3 -d $CVSROOT co -d libast eterm/libast
+            (cd libast && ./autogen.sh $ac_configure_args && make install && cd .. && rm -rf libast)
+            if test $? -ne 0; then
+                echo 'ERROR:  Unable to auto-get libast, sorry.' 1>&2
+                exit 1
+            fi
+            $1=1
+            AC_CHECK_PROG(LIBAST_CONFIG, libast-config, libast-config, false)
+            test "$LIBAST_CONFIG" = "false" && $1=0
+        fi
+    fi
+    if test "${$1}" -eq "1"; then
+        if test ! -z "$LIBAST_CONFIG"; then
+            $2="-last ${$2}"
+            AC_DEFINE(HAVE_LIBAST)
+            test "$prefix" = "NONE" && prefix="`$LIBAST_CONFIG --prefix`"
+            SUPPORT_FLAGS="`$LIBAST_CONFIG --support`"
+            for i in $SUPPORT_FLAGS ; do
+                case $i in
+                    MMX)
+                        AC_DEFINE(LIBAST_MMX_SUPPORT)
+                        ;;
+                    X11)
+                        AC_DEFINE(LIBAST_X11_SUPPORT)
+                        ;;
+                    Imlib2)
+                        AC_DEFINE(LIBAST_IMLIB2_SUPPORT)
+                        ;;
+                esac
+            done
+        fi
+    fi
+])
+
+dnl#
 dnl# LibAST macro for determining integer types by size
 dnl#
-AC_DEFUN(AST_SIZE_TYPE,
-    [BIT_SIZE=[$1]
+AC_DEFUN(AST_SIZE_TYPE, [
+    BIT_SIZE=[$1]
     BYTE_SIZE=`expr $BIT_SIZE '/' 8`
     case $BYTE_SIZE in
         $ac_cv_sizeof_char)       eval INT_${BIT_SIZE}_TYPE=char ;;