Rocco Rutte:

automake f*ckup: don't try to compile debug.c conditionally ;-(((

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@283 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/configure.in b/configure.in
index a64271a..aad23c2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -735,10 +735,8 @@ dnl -- end socket --
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]),
         [ if test x$enableval = xyes ; then
                 AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ])
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]),
         [ if test x$enableval = xyes ; then
                 AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ])

-                want_debug=yes

           fi
          ])
           fi
          ])

-AM_CONDITIONAL(WANT_DEBUG, test x$want_debug = xyes)

 
 AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]),
         [if test $enableval = yes; then
 
 AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]),
         [if test $enableval = yes; then

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8355295..5c0d961 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,9 +9,5 @@ INCLUDES = -I$(top_srcdir) -I../intl
 noinst_LIBRARIES = libsane.a
 noinst_HEADERS = mem.h str.h exit.h intl.h list.h rx.h debug.h
 
 noinst_LIBRARIES = libsane.a
 noinst_HEADERS = mem.h str.h exit.h intl.h list.h rx.h debug.h
 

-libsane_a_SOURCES = mem.c exit.c str.c list.c rx.h \
-                   mem.h exit.h str.h list.h rx.c debug.h intl.h
-
-if WANT_DEBUG
-libsane_a_SOURCES += debug.c
-endif
+libsane_a_SOURCES = mem.c exit.c str.c list.c rx.h debug.h \
+                   mem.h exit.h str.h list.h rx.c debug.c intl.h