From 02930427b70c08aed36852d8d1d95c0cdb8d8cd8 Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Wed, 18 Feb 2004 20:45:01 +0000
Subject: [PATCH] Changed build system for modern autoconf.

---
 acconfig.h                 | 46 ----------------------------------------------
 config.h.bot               | 10 ----------
 configure.in.mid           | 21 +++++++++++++++++++--
 kdbg/testprogs/Makefile.am |  2 +-
 4 files changed, 20 insertions(+), 59 deletions(-)
 delete mode 100644 acconfig.h
 delete mode 100644 config.h.bot

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index ebcce02..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#undef VERSION
-
-#undef PACKAGE
-
-/* defines if having libz */
-#undef HAVE_LIBZ
-
-/* defines if having libgif (always 1) */
-#undef HAVE_LIBGIF
-
-/* defines if having libjpeg (always 1) */
-#undef HAVE_LIBJPEG
-
-/* defines if having libpng */
-#undef HAVE_LIBPNG
-
-/* defines which to take for ksize_t */
-#undef ksize_t
-
-/* define if you have setenv */
-#undef HAVE_FUNC_SETENV
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES    
-
-/* Define if you need the GNU extensions to compile */
-#undef _GNU_SOURCE
-
-/* Define if you want to see voluminous trace output */
-#undef WANT_TRACE_OUTPUT
-
-/* Define to the name of the file that communication with gdb
-   should be logged to; undefine it for no logging */
-#undef GDB_TRANSCRIPT
-
-/* Define if placement new works */
-#undef HAVE_PLACEMENT_NEW
-
-/* Define how to invoke ps */
-#undef PS_COMMAND
diff --git a/config.h.bot b/config.h.bot
deleted file mode 100644
index 3cf2414..0000000
--- a/config.h.bot
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifdef QT_VERSION
-# if QT_VERSION < 200
-#  define SIZED_QString(name,size) QString name(size)
-#  define FROM_LATIN1(cstr,len) QString(cstr,(len)+1)
-# else
-#  define SIZED_QString(name,size) QString name
-#  define FROM_LATIN1(cstr,len) QString::fromLatin1(cstr,len)
-# endif
-#endif
diff --git a/configure.in.mid b/configure.in.mid
index 33ac46d..6ebc29a 100644
--- a/configure.in.mid
+++ b/configure.in.mid
@@ -23,6 +23,8 @@ AC_SEARCH_LIBS(openpty, util,
   AC_DEFINE_UNQUOTED(HAVE_FUNC_OPENPTY, 1, [Define if you have openpty]))
 
 dnl Check whether we want much debugging output
+AH_TEMPLATE([WANT_TRACE_OUTPUT],
+  [Define if you want to see voluminous trace output])
 AC_MSG_CHECKING([whether kdbg should generate lots of trace output])
 dnl Default is no trace output
 AC_ARG_ENABLE(lots-a-trace,
@@ -56,11 +58,14 @@ if test "x$GDB_TRANSCRIPT" = "xno"; then
 else
   dnl add quotes
   GDB_TRANSCRIPT=\"$GDB_TRANSCRIPT\"
-  AC_DEFINE_UNQUOTED(GDB_TRANSCRIPT, $GDB_TRANSCRIPT)
+  AC_DEFINE_UNQUOTED(GDB_TRANSCRIPT, $GDB_TRANSCRIPT,
+    [Define to the name of the file that communication with gdb
+   should be logged to; undefine it for no logging])
 fi
 AC_MSG_RESULT($GDB_TRANSCRIPT)
 
 dnl Check whether placement new works
+AH_TEMPLATE([HAVE_PLACEMENT_NEW],[Define if placement new works])
 AC_LANG_CPLUSPLUS
 AC_MSG_CHECKING(whether placement new is available)
 AC_CACHE_VAL(ac_cv_have_placement_new,
@@ -101,13 +106,25 @@ if test -n "$PS_COMMAND"; then
   if test -n "$PS_COMMAND"; then
     AC_MSG_RESULT($PS_COMMAND)
     PS_COMMAND="\"`echo $PS_COMMAND | sed -e 's/ /", "/g'`\""
-    AC_DEFINE_UNQUOTED(PS_COMMAND, $PS_COMMAND)
+    AC_DEFINE_UNQUOTED(PS_COMMAND, $PS_COMMAND,
+      [Define how to invoke ps])
   else
     AC_MSG_RESULT([not suitable])
   fi
 fi
 AM_CONDITIONAL(HAVE_PS_COMMAND, test -n "$PS_COMMAND")
 
+AH_VERBATIM([SIZED_QString],
+[#ifdef QT_VERSION
+# if QT_VERSION < 200
+#  define SIZED_QString(name,size) QString name(size)
+#  define FROM_LATIN1(cstr,len) QString(cstr,(len)+1)
+# else
+#  define SIZED_QString(name,size) QString name
+#  define FROM_LATIN1(cstr,len) QString::fromLatin1(cstr,len)
+# endif
+#endif])
+
 dnl -----------------
 AC_MSG_CHECKING(for KDE 3)
 
diff --git a/kdbg/testprogs/Makefile.am b/kdbg/testprogs/Makefile.am
index 5bca10b..1e815a5 100644
--- a/kdbg/testprogs/Makefile.am
+++ b/kdbg/testprogs/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = xsldoc.xsl xsldoc.xml
 # set the include path for X, qt and KDE
 INCLUDES= $(all_includes)
 # always compile with debugging info switched on
-CXXFLAGS = -g
+AM_CXXFLAGS = -g
 
 if BUILDTESTPROGS
 PROGS = testfile locals maths repeats std
-- 
2.11.4.GIT