Moved AH top & bottom templates to its own special m4 file so vim syntax

formatting isn't all off.  Changed the way Makefile.in see's LIBLTDL
coming in as well.
IssueID #240

diff --git a/Makefile.in b/Makefile.in
index df217390519bfca18eaf65a0dbac7bf3005a02a5..fa34e7c0df0635a5d54d0196bdfacd26e12eedbd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ SQL_LDFLAGS=@MYSQL_LDFLAGS@ @POSTGRESQL_LDFLAGS@ @SQLITE3_LDFLAGS@
 
 CCFLAGS=@CFLAGS@ -I.. -I../hdrs -I/usr/include/lua5.1 @CPPFLAGS@ @PCRE_CFLAGS@ -Werror
 LDFLAGS=@LDFLAGS@ 
-CLIBS=@LIBS@ @PCRE_LIBS@ -llua5.1
+CLIBS=@LIBS@ @PCRE_LIBS@ @LIBLTDL@ -llua5.1
 INSTALL=@INSTALL@
 INSTALLDIR=$installdir
 CP=@CP@

diff --git a/configure.ac b/configure.ac
index bf467a90dd80f802d8f7ab16603cbdb972fb8cff..7729087b3bae1e83c05fcfd7a1339684f35443a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,46 +9,8 @@
 AC_PREREQ([2.67])
 AC_INIT([CobraMUSH], [0.80], [http://redmine.cobramush.org])
 AC_CONFIG_HEADERS(config.h)
-# Setup some default stuff we need set in config.h
-AC_DEFINE(PACKAGE, ["CobraMUSH"], [Name of package being built])
-AC_DEFINE(WIN32_CDECL, , [Defined as __cdecl if the compiler can handle tat keyword to specify C-style argument passing convetions.])
-AH_TOP([
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-       ])
-AH_BOTTOM([
-#ifdef _MSC_VER
-#define WIN32_CDECL __cdecl
-#else
-#define WIN32_CDECL
-#endif
-#ifdef HAVE_INOTIFY_INIT
-#define HAVE_INOTIFY
-#endif
-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-# if ! HAVE__BOOL
-#  ifdef __cplusplus
-typedef bool _Bool;
-#  else
-#   define _Bool signed char
-#  endif
-# endif
-# define bool _Bool
-# define false 0
-# define true 1
-# define __bool_true_false_are_defined 1
-#endif
-#ifdef HAVE_SSL
-#define HAS_OPENSSL
-#endif
 
-/* Someday work to get rid of these. They're left over from the pre-void days */
-typedef void* Malloc_t;
-typedef void Free_t;
-#endif /* _CONFIG_H_ */
-          ])
+m4_include(m4/confsetup.m4)
 
 AC_CANONICAL_BUILD
 
@@ -66,6 +28,7 @@ AC_CHECK_HEADER([ltdl.h],
                              [LIBLTDL=-lltdl], [LIBLTDL=])],
                              [LIBLTDL=])
 
+AC_SUBST([LIBLTDL])
 
 
 ### Programs
@@ -232,7 +195,6 @@ AC_CHECK_SIZEOF([time_t])
 AC_CHECK_SIZEOF([void *])
 
 ### Libraries
-AC_CHECK_LIB(ltdl, [lt_dlopen])
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(intl, gettext)
 AC_CHECK_LIB(crypt, crypt)

diff --git a/m4/confsetup.m4 b/m4/confsetup.m4
new file mode 100644 (file)
index 0000000..f142a81
--- /dev/null
+++ b/m4/confsetup.m4
@@ -0,0 +1,42 @@
+# Setup some default stuff we need set in config.h
+AC_DEFINE(PACKAGE, ["CobraMUSH"], [Name of package being built])
+AC_DEFINE(WIN32_CDECL, , [Defined as __cdecl if the compiler can handle tat keyword to specify C-style argument passing convetions.])
+AH_TOP([
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+       ])
+AH_BOTTOM([
+#ifdef _MSC_VER
+#define WIN32_CDECL __cdecl
+#else
+#define WIN32_CDECL
+#endif
+#ifdef HAVE_INOTIFY_INIT
+#define HAVE_INOTIFY
+#endif
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# if ! HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif
+#ifdef HAVE_SSL
+#define HAS_OPENSSL
+#endif
+
+/* Someday work to get rid of these. They're left over from the pre-void days */
+typedef void* Malloc_t;
+typedef void Free_t;
+#endif /* _CONFIG_H_ */
+          ])
+
+