Michael Jennings wrote:
On Friday, 09 January 2004, at 20:14:33 (+0100),
Kim Woelders wrote:


In the e16 case above config.h.in is generated from configure.in without any acconfig.h being involved.
I believe it does require that the third parameter to AC_DEFINE is used, as in
AC_DEFINE(USE_IMLIB2, 1, [Imlib2 support])
which is just what Ibokun suggested.


[EMAIL PROTECTED] ~/cvs/eterm/libast >> cat acconfig.h #undef LIBAST_VERSION
...
/usr/bin/autoheader: Symbol `LIBAST_X11_SUPPORT' is not covered by /usr/share/autoconf/acconfig.h


/Kim
Index: configure.in
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/configure.in,v
retrieving revision 1.13
diff -u -r1.13 configure.in
--- configure.in        26 Nov 2003 22:19:43 -0000      1.13
+++ configure.in        9 Jan 2004 20:10:50 -0000
@@ -2,12 +2,13 @@
 
 AC_INIT(configure.in)
 AM_INIT_AUTOMAKE(libast, 0.6)
-AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version])
+AM_CONFIG_HEADER(config.h include/libast/sysdefs.h)
 
 dnl# Set some basic variables
 AUTHORS="Michael Jennings ([EMAIL PROTECTED])"
 AC_SUBST(AUTHORS)
-AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS")
+AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS", [Authors])
 
 AC_PROG_CC
 
@@ -38,7 +39,6 @@
 AC_SUBST(LIBS)
 
 basedir=.
-AM_CONFIG_HEADER(config.h include/libast/sysdefs.h)
 AC_OUTPUT(${srcdir}/include/libast/types.h Makefile include/Makefile \
           include/libast/Makefile src/Makefile test/Makefile \
           libast-config)
Index: libast.m4
===================================================================
RCS file: /cvsroot/enlightenment/eterm/libast/libast.m4,v
retrieving revision 1.6
diff -u -r1.6 libast.m4
--- libast.m4   5 Nov 2002 19:58:27 -0000       1.6
+++ libast.m4   9 Jan 2004 20:10:51 -0000
@@ -46,19 +46,19 @@
     if test "${$1}" -eq "1"; then
         if test ! -z "$LIBAST_CONFIG"; then
             $2="-last ${$2}"
-            AC_DEFINE(HAVE_LIBAST)
+            AC_DEFINE(HAVE_LIBAST,, [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)
+                        AC_DEFINE(LIBAST_MMX_SUPPORT,, [LIBAST_MMX_SUPPORT])
                         ;;
                     X11)
-                        AC_DEFINE(LIBAST_X11_SUPPORT)
+                        AC_DEFINE(LIBAST_X11_SUPPORT,, [LIBAST_X11_SUPPORT])
                         ;;
                     Imlib2)
-                        AC_DEFINE(LIBAST_IMLIB2_SUPPORT)
+                        AC_DEFINE(LIBAST_IMLIB2_SUPPORT,, [LIBAST_IMLIB2_SUPPORT])
                         ;;
                 esac
             done
@@ -97,7 +97,7 @@
                              ])
             AC_SEARCH_LIBS(pcre_compile, pcre, [GOT_PCRE_LIB=1])
             if test $GOT_PCRE_HEADER -eq 1 -a $GOT_PCRE_LIB -eq 1 ; then
-                AC_DEFINE(LIBAST_REGEXP_SUPPORT_PCRE)
+                AC_DEFINE(LIBAST_REGEXP_SUPPORT_PCRE,, [LIBAST_REGEXP_SUPPORT_PCRE])
                 LIBAST_REGEXP_SUPPORT="regexp-pcre"
                 $1="pcre"
             else
@@ -113,7 +113,7 @@
                              ])
             AC_SEARCH_LIBS(regcomp, posix regexp regex re, [GOT_POSIXREGEXP_LIB=1])
             if test $GOT_POSIXREGEXP_HEADER -eq 1 -a $GOT_POSIXREGEXP_LIB -eq 1 ; then
-                AC_DEFINE(LIBAST_REGEXP_SUPPORT_POSIX)
+                AC_DEFINE(LIBAST_REGEXP_SUPPORT_POSIX,, [LIBAST_REGEXP_SUPPORT_POSIX])
                 LIBAST_REGEXP_SUPPORT="regexp-posix"
                 $1="posix"
             else
@@ -129,7 +129,7 @@
                              ])
             AC_SEARCH_LIBS(re_comp, bsd ucb regexp regex re, [GOT_BSD_LIB=1])
             if test $GOT_BSD_HEADER -eq 1 -a $GOT_BSD_LIB -eq 1 ; then
-                AC_DEFINE(LIBAST_REGEXP_SUPPORT_BSD)
+                AC_DEFINE(LIBAST_REGEXP_SUPPORT_BSD,, [LIBAST_REGEXP_SUPPORT_BSD])
                 LIBAST_REGEXP_SUPPORT="regexp-bsd"
                 $1="bsd"
             else
@@ -171,7 +171,7 @@
         AC_CHECK_LIB(X11, XOpenDisplay, [
                          LIBAST_X11_SUPPORT="X11"
                          GRLIBS="-lX11"
-                         AC_DEFINE(LIBAST_X11_SUPPORT)
+                         AC_DEFINE(LIBAST_X11_SUPPORT,, [LIBAST_X11_SUPPORT])
                      ])
     fi
     AC_SUBST(LIBAST_X11_SUPPORT)
@@ -203,7 +203,7 @@
         AC_CHECK_LIB(ttf, TT_Init_FreeType, GRLIBS="-lttf $GRLIBS", , $GRLIBS)
         AC_CHECK_LIB(Imlib2, imlib_create_image, [
                          GRLIBS="-lImlib2 $GRLIBS"
-                         AC_DEFINE(LIBAST_IMLIB2_SUPPORT)
+                         AC_DEFINE(LIBAST_IMLIB2_SUPPORT,, [LIBAST_IMLIB2_SUPPORT])
                          LIBAST_IMLIB2_SUPPORT="Imlib2"
                      ], [
                          AC_WARN(*** Imlib2 support has been disabled because Imlib2 
***)
@@ -229,7 +229,7 @@
     LIBAST_MMX_SUPPORT=""
     if test -n "$HAVE_MMX"; then
         AC_MSG_RESULT(yes)
-        AC_DEFINE(LIBAST_MMX_SUPPORT)
+        AC_DEFINE(LIBAST_MMX_SUPPORT,, [LIBAST_MMX_SUPPORT])
         LIBAST_MMX_SUPPORT="MMX"
     else
         AC_MSG_RESULT(no)
@@ -345,16 +345,16 @@
                     fi
                     if test "$withval" != "no"; then 
                         AC_MSG_RESULT($withval)
-                        AC_DEFINE_UNQUOTED($1, $withval)
+                        AC_DEFINE_UNQUOTED($1, $withval, [Blah])
                         $1=$withval
                     else
                         AC_MSG_RESULT(no, disabling all debugging support)
-                        AC_DEFINE_UNQUOTED($1, 0)
+                        AC_DEFINE_UNQUOTED($1, 0, [BlahBlah])
                         $1=0
                     fi
                 ], [
                     AC_MSG_RESULT(4)
-                    AC_DEFINE_UNQUOTED($1, 4)
+                    AC_DEFINE_UNQUOTED($1, 4, [BlahBlahBlah])
                     $1=4
     ])
 ])
@@ -376,12 +376,12 @@
                 $1=no
             else
                 AC_MSG_RESULT(yes)
-                AC_DEFINE($1)
+                AC_DEFINE($1,, [Foo])
                 $1=yes
             fi
         ], [
             AC_MSG_RESULT(yes)
-            AC_DEFINE($1)
+            AC_DEFINE($1,, [Bar])
             $1=yes
         ])
 ])
@@ -456,10 +456,10 @@
         AC_MSG_RESULT([no, snprintf is ok])
     elif test $dps_cv_snprint_bug -eq 1; then
         AC_MSG_RESULT([yes, snprintf is broken])
-        AC_DEFINE(HAVE_SNPRINTF_BUG, 1)
+        AC_DEFINE(HAVE_SNPRINTF_BUG, 1, [HAVE_SNPRINTF_BUG])
     else
         AC_MSG_RESULT([unknown, assuming yes])
-        AC_DEFINE(HAVE_SNPRINTF_BUG, 1)
+        AC_DEFINE(HAVE_SNPRINTF_BUG, 1, [HAVE_SNPRINTF_BUG])
     fi
 ])
 
@@ -502,10 +502,10 @@
         AC_MSG_RESULT([no, vsnprintf is ok])
     elif test $dps_cv_vsnprintf_bug -eq 1; then
         AC_MSG_RESULT([yes, vsnprintf is broken])
-        AC_DEFINE(HAVE_VSNPRINTF_BUG,1)
+        AC_DEFINE(HAVE_VSNPRINTF_BUG,1, [HAVE_VSNPRINTF_BUG])
     else
         AC_MSG_RESULT([unknown, assuming yes])
-        AC_DEFINE(HAVE_VSNPRINTF_BUG,1)
+        AC_DEFINE(HAVE_VSNPRINTF_BUG,1, [HAVE_VSNPRINTF_BUG])
     fi
 ])
 
@@ -571,13 +571,13 @@
     case "$dps_cv_symlink_open_bug" in
         0) AC_MSG_RESULT(secure) ;;
         1) AC_MSG_RESULT(errno wrong but ok)
-           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG) ;;
+           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG,, [HAVE_SYMLINK_OPEN_ERRNO_BUG]) ;;
         2) AC_MSG_RESULT(insecure)
-           AC_DEFINE(HAVE_SYMLINK_OPEN_SECURITY_HOLE)
-           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG) ;;
+           AC_DEFINE(HAVE_SYMLINK_OPEN_SECURITY_HOLE,, 
[HAVE_SYMLINK_OPEN_SECURITY_HOLE])
+           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG,, [HAVE_SYMLINK_OPEN_ERRNO_BUG]) ;;
         3) AC_MSG_RESULT(assuming insecure)
-           AC_DEFINE(HAVE_SYMLINK_OPEN_SECURITY_HOLE)
-           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG) ;;
+           AC_DEFINE(HAVE_SYMLINK_OPEN_SECURITY_HOLE,, 
[HAVE_SYMLINK_OPEN_SECURITY_HOLE])
+           AC_DEFINE(HAVE_SYMLINK_OPEN_ERRNO_BUG,, [HAVE_SYMLINK_OPEN_ERRNO_BUG]) ;;
         *) AC_MSG_RESULT($dps_cv_symlink_open_bug)
            AC_MSG_ERROR(Impossible value of dps_cv_symlink_open_bug) ;;
     esac
@@ -623,7 +623,7 @@
     ])
     if test $dps_cv_rlimit_nproc -eq 0; then
         AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_RLIMIT_NPROC,1)
+        AC_DEFINE(HAVE_RLIMIT_NPROC,1, [HAVE_RLIMIT_NPROC])
     elif test $dps_cv_rlimit_nproc -eq 1; then
         AC_MSG_RESULT([no])
     else
@@ -673,7 +673,7 @@
     ])
     if test $dps_cv_rlimit_memlock -eq 0; then
         AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_RLIMIT_MEMLOCK,1)
+        AC_DEFINE(HAVE_RLIMIT_MEMLOCK,1, [HAVE_RLIMIT_MEMLOCK])
     elif test $dps_cv_rlimit_memlock -eq 1; then
         AC_MSG_RESULT([no])
     else

Reply via email to