- Build system related cleanups and fixes

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5063 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/Makefile.am b/src/Makefile.am
index cc5ba7fae107f0870bb10c57e4ce22e06365a3ec..5ee9f991e539ac69e2ebb5180d01341de6defc28 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
 SUBDIRS = libopm .
 
-bin_PROGRAMS = bopm
+bin_PROGRAMS = hopm
 
 AM_CPPFLAGS = -DBOPM_ETCDIR="\"$(sysconfdir)\"" -DBOPM_LOGDIR="\"$(localstatedir)\""
 AM_YFLAGS = -d
 
-bopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
+hopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
     dnsbl.c dnsbl.h extern.h inet.c inet.h irc.c irc.h log.c log.h main.c match.c \
     match.h misc.c misc.h malloc.c malloc.h list.c list.h negcache.c negcache.h \
     opercmd.c opercmd.h options.h scan.c scan.h setup.h stats.c stats.h firedns.c \
         firedns.h main.h defs.h
 
-bopm_LDADD = libopm/src/.libs/libopm.a @ETR_SOCKET_LIBS@ @LIBOBJS@
+hopm_LDADD = libopm/src/.libs/libopm.a @LIBOBJS@

diff --git a/src/Makefile.in b/src/Makefile.in
index f7d1cdd27ebce79735db3bb402242582160e05d1..5b5f40cc1b263bb09870c356430749a1f0ad32e8 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -78,7 +78,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = bopm$(EXEEXT)
+bin_PROGRAMS = hopm$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(srcdir)/setup.h.in $(top_srcdir)/mkinstalldirs \
@@ -94,14 +94,14 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_bopm_OBJECTS = compat.$(OBJEXT) config-parser.$(OBJEXT) \
+am_hopm_OBJECTS = compat.$(OBJEXT) config-parser.$(OBJEXT) \
        config-lexer.$(OBJEXT) config.$(OBJEXT) dnsbl.$(OBJEXT) \
        inet.$(OBJEXT) irc.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
        match.$(OBJEXT) misc.$(OBJEXT) malloc.$(OBJEXT) list.$(OBJEXT) \
        negcache.$(OBJEXT) opercmd.$(OBJEXT) scan.$(OBJEXT) \
        stats.$(OBJEXT) firedns.$(OBJEXT)
-bopm_OBJECTS = $(am_bopm_OBJECTS)
-bopm_DEPENDENCIES = libopm/src/.libs/libopm.a @LIBOBJS@
+hopm_OBJECTS = $(am_hopm_OBJECTS)
+hopm_DEPENDENCIES = libopm/src/.libs/libopm.a @LIBOBJS@
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -159,8 +159,8 @@ AM_V_YACC = $(am__v_YACC_@AM_V@)
 am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
 am__v_YACC_0 = @echo "  YACC    " $@;
 am__v_YACC_1 = 
-SOURCES = $(bopm_SOURCES)
-DIST_SOURCES = $(bopm_SOURCES)
+SOURCES = $(hopm_SOURCES)
+DIST_SOURCES = $(hopm_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
        ctags-recursive dvi-recursive html-recursive info-recursive \
        install-data-recursive install-dvi-recursive \
@@ -353,13 +353,13 @@ top_srcdir = @top_srcdir@
 SUBDIRS = libopm .
 AM_CPPFLAGS = -DBOPM_ETCDIR="\"$(sysconfdir)\"" -DBOPM_LOGDIR="\"$(localstatedir)\""
 AM_YFLAGS = -d
-bopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
+hopm_SOURCES = compat.c compat.h config-parser.y config-lexer.l config.c config.h \
     dnsbl.c dnsbl.h extern.h inet.c inet.h irc.c irc.h log.c log.h main.c match.c \
     match.h misc.c misc.h malloc.c malloc.h list.c list.h negcache.c negcache.h \
     opercmd.c opercmd.h options.h scan.c scan.h setup.h stats.c stats.h firedns.c \
         firedns.h main.h defs.h
 
-bopm_LDADD = libopm/src/.libs/libopm.a @ETR_SOCKET_LIBS@ @LIBOBJS@
+hopm_LDADD = libopm/src/.libs/libopm.a @LIBOBJS@
 all: setup.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -463,9 +463,9 @@ config-parser.h: config-parser.c
        @if test ! -f $@; then rm -f config-parser.c; else :; fi
        @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) config-parser.c; else :; fi
 
-bopm$(EXEEXT): $(bopm_OBJECTS) $(bopm_DEPENDENCIES) $(EXTRA_bopm_DEPENDENCIES) 
-       @rm -f bopm$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(bopm_OBJECTS) $(bopm_LDADD) $(LIBS)
+hopm$(EXEEXT): $(hopm_OBJECTS) $(hopm_DEPENDENCIES) $(EXTRA_hopm_DEPENDENCIES) 
+       @rm -f hopm$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(hopm_OBJECTS) $(hopm_LDADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)

diff --git a/src/libopm/configure b/src/libopm/configure
index 354b82ae0778bb4b3c7b6fbf4ca9c8d76e24c7a7..47fa1a57441f18e62d3339a9156166eb2ec89fb5 100755 (executable)
--- a/src/libopm/configure
+++ b/src/libopm/configure
@@ -12140,8 +12140,6 @@ CC=$lt_save_CC
 
 
 
-ETR_SOCKET_NSL
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
@@ -12865,7 +12863,6 @@ else
 fi
 
 
-
 LTLIBOBJS=`echo "$LIBOBJS" |
            sed 's,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,'`
 

diff --git a/src/libopm/configure.ac b/src/libopm/configure.ac
index ae9bc228ec504eab4b1c9f91c5902c56c758ec64..87ed759c0da5df25daf757b4cdf4ef772dae3106 100644 (file)
--- a/src/libopm/configure.ac
+++ b/src/libopm/configure.ac
@@ -31,9 +31,6 @@ AS_IF([test "$ac_cv_prog_cc_c99" = "no"],
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
-dnl check if we need -lsocket or -lnsl
-ETR_SOCKET_NSL
-
 dnl Checks for header files.
 AC_HEADER_STDC
 
@@ -67,16 +64,6 @@ AC_CHECK_FUNC(getaddrinfo, [], AC_SEARCH_LIBS(getaddrinfo, nsl))
 AC_CHECK_FUNC(getnameinfo, [], AC_SEARCH_LIBS(getnameinfo, nsl))
 AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([socket library not found])])
 
-dnl teehee - taken from MRTG / Tobias Oetiker
-dnl if test "$with_faldo" != "no"; then
-dnl  echo $ECHO_N "checking for Nick Faldo $ECHO_C"
-dnl  for bleh in 1 2 3; do
-dnl   echo $ECHO_N ".\a"        
-dnl   sleep 1
-dnl  done
-dnl  AC_MSG_RESULT([ http://blitzed.org/advocacy/enjoy.jpg])
-dnl fi
-
 LTLIBOBJS=`echo "$LIB@&t@OBJS" |
            sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
 AC_SUBST(LTLIBOBJS)

diff --git a/src/libopm/src/Makefile.am b/src/libopm/src/Makefile.am
index db793487556b71e83c3d989c5e2719fb19296de6..5fe5538efa294ed419e92ee74cb031b5b0fb36af 100644 (file)
--- a/src/libopm/src/Makefile.am
+++ b/src/libopm/src/Makefile.am
@@ -6,7 +6,7 @@ libopm_la_SOURCES = compat.c compat.h config.c config.h inet.c inet.h \
 
 include_HEADERS = opm.h opm_error.h opm_types.h opm_common.h
 
-libopm_la_LIBADD = @ETR_SOCKET_LIBS@ @LTLIBOBJS@
+libopm_la_LIBADD = @LTLIBOBJS@
 
 noinst_PROGRAMS = test test_debug
 test_SOURCES = test.c

diff --git a/src/libopm/src/Makefile.in b/src/libopm/src/Makefile.in
index 0e7f2fa852a184c889abef17086c422a6838444e..c0d1c4a365267b2cdad9f990d9a2b95b8a4413dc 100644 (file)
--- a/src/libopm/src/Makefile.in
+++ b/src/libopm/src/Makefile.in
@@ -329,7 +329,7 @@ libopm_la_SOURCES = compat.c compat.h config.c config.h inet.c inet.h \
     opm_error.h opm.h opm_types.h proxy.c proxy.h setup.h
 
 include_HEADERS = opm.h opm_error.h opm_types.h opm_common.h
-libopm_la_LIBADD = @ETR_SOCKET_LIBS@ @LTLIBOBJS@
+libopm_la_LIBADD = @LTLIBOBJS@
 test_SOURCES = test.c
 test_LDADD = libopm.la compat.o @LIBOBJS@
 

diff --git a/src/libopm/src/setup.h b/src/libopm/src/setup.h
index 38a4a46abd657b17a0d2e297697db1f6aae1a036..d7cf722774a4127b5c2fd6d8247df8710f235018 100644 (file)
--- a/src/libopm/src/setup.h
+++ b/src/libopm/src/setup.h
@@ -1,5 +1,8 @@
 /* src/setup.h.  Generated from setup.h.in by configure.  */
-/* src/setup.h.in.  Generated from configure.in by autoheader.  */
+/* src/setup.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -28,9 +31,6 @@
 /* Define to 1 if you have the `select' function. */
 /* #undef HAVE_SELECT */
 
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -58,8 +58,8 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
 
 /* Name of package */
 #define PACKAGE "libopm"
@@ -76,12 +76,12 @@
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libopm"
 
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "0.1"
 
-/* "enable replacement (v)snprintf if system (v)snprintf is broken" */
-/* #undef PREFER_PORTABLE_SNPRINTF */
-
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
@@ -91,12 +91,20 @@
 /* Version number of package */
 #define VERSION "0.1"
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */