]> git.ipfire.org Git - people/ms/mstpd.git/commitdiff
Use autotools. autotools
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 18:29:03 +0000 (20:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 11 Aug 2013 18:29:03 +0000 (20:29 +0200)
39 files changed:
.gitignore
Makefile [deleted file]
Makefile.am [new file with mode: 0644]
autogen.sh [new file with mode: 0755]
configure.ac [new file with mode: 0644]
contrib/bash_completion/mstpctl [moved from lib/bash_completion with 100% similarity]
contrib/ifupdown.sh [moved from lib/ifupdown.sh with 100% similarity]
contrib/mstpctl-utils.sh [moved from lib/mstpctl-utils.sh with 100% similarity]
contrib/mstpctl_restart_config [moved from lib/mstpctl_restart_config with 100% similarity]
m4/.gitignore [new file with mode: 0644]
m4/attributes.m4 [new file with mode: 0644]
man/mstpctl-utils-interfaces.5 [moved from lib/mstpctl-utils-interfaces.5 with 100% similarity]
man/mstpctl.8 [moved from lib/mstpctl.8 with 100% similarity]
src/bridge-stp [moved from bridge-stp with 100% similarity, mode: 0644]
src/bridge_ctl.h [moved from bridge_ctl.h with 100% similarity]
src/bridge_track.c [moved from bridge_track.c with 100% similarity]
src/brmon.c [moved from brmon.c with 100% similarity]
src/ctl_functions.h [moved from ctl_functions.h with 100% similarity]
src/ctl_main.c [moved from ctl_main.c with 100% similarity]
src/ctl_socket_client.c [moved from ctl_socket_client.c with 100% similarity]
src/ctl_socket_client.h [moved from ctl_socket_client.h with 100% similarity]
src/ctl_socket_server.c [moved from ctl_socket_server.c with 100% similarity]
src/ctl_socket_server.h [moved from ctl_socket_server.h with 100% similarity]
src/driver.h [moved from driver.h with 100% similarity]
src/driver_deps.c [moved from driver_deps.c with 100% similarity]
src/epoll_loop.c [moved from epoll_loop.c with 100% similarity]
src/epoll_loop.h [moved from epoll_loop.h with 100% similarity]
src/hmac_md5.c [moved from hmac_md5.c with 100% similarity]
src/libnetlink.c [moved from libnetlink.c with 100% similarity]
src/libnetlink.h [moved from libnetlink.h with 100% similarity]
src/list.h [moved from list.h with 100% similarity]
src/log.h [moved from log.h with 100% similarity]
src/main.c [moved from main.c with 100% similarity]
src/mstp.c [moved from mstp.c with 100% similarity]
src/mstp.h [moved from mstp.h with 100% similarity]
src/netif_utils.c [moved from netif_utils.c with 100% similarity]
src/netif_utils.h [moved from netif_utils.h with 100% similarity]
src/packet.c [moved from packet.c with 100% similarity]
src/packet.h [moved from packet.h with 100% similarity]

index bfa927b40714868c2b59ec3cd19122c078eddaf5..e94a32cae1e6a0f084dc2318d77545cc5ef8712a 100644 (file)
@@ -1,3 +1,26 @@
-mstpctl
-mstpd
+/Makefile
+/build-aux
+/libtool
+/mstpctl
+/mstpd
+/*.tar.bz2
+/*.tar.gz
+/*.tar.xz
+*.cache
+*.log
+*.lo
+*.la
 *.o
+*.stamp
+*~
+.deps/
+.dirstamp
+.libs/
+Makefile.in
+aclocal.m4
+config.h
+config.h.in
+config.log
+config.status
+configure
+stamp-*
diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index dde9f81..0000000
--- a/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-MODE = devel
-version := 0.03
-
-DSOURCES = main.c epoll_loop.c brmon.c bridge_track.c libnetlink.c mstp.c \
-           packet.c netif_utils.c ctl_socket_server.c hmac_md5.c driver_deps.c
-
-DOBJECTS = $(DSOURCES:.c=.o)
-
-CTLSOURCES = ctl_main.c ctl_socket_client.c
-
-CTLOBJECTS = $(CTLSOURCES:.c=.o)
-
-CFLAGS += -O2 -D_REENTRANT -D__LINUX__ -DVERSION=$(version) -I. \
-          -D_GNU_SOURCE -D__LIBC_HAS_VERSIONSORT__
-
-ifeq ($(MODE),devel)
-CFLAGS += -Werror
-endif
-
-all: mstpd mstpctl
-
-mstpd: $(DOBJECTS)
-       $(CC) -o $@ $(DOBJECTS)
-
-mstpctl: $(CTLOBJECTS)
-       $(CC) -o $@ $(CTLOBJECTS)
-
--include .depend
-
-clean:
-       rm -f *.o *~ .depend.bak mstpd mstpctl
-
-install: all
-       -mkdir -pv $(DESTDIR)/sbin
-       install -m 755 mstpd $(DESTDIR)/sbin/mstpd
-       install -m 755 mstpctl $(DESTDIR)/sbin/mstpctl
-       install -m 755 bridge-stp /sbin/bridge-stp
-       -mkdir -pv $(DESTDIR)/lib/mstpctl-utils/
-       cp -rv lib/* $(DESTDIR)/lib/mstpctl-utils/
-       gzip -f $(DESTDIR)/lib/mstpctl-utils/mstpctl.8
-       gzip -f $(DESTDIR)/lib/mstpctl-utils/mstpctl-utils-interfaces.5
-       if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-pre-up.d/mstpctl ; fi
-       if [ -d $(DESTDIR)/etc/network/if-pre-up.d ] ; then ln -sf /lib/mstpctl-utils/ifupdown.sh $(DESTDIR)/etc/network/if-post-down.d/mstpctl ; fi
-       if [ -d $(DESTDIR)/etc/bash_completion.d ] ; then ln -sf /lib/mstpctl-utils/bash_completion $(DESTDIR)/etc/bash_completion.d/mstpctl ; fi
-       ln -sf /lib/mstpctl-utils/mstpctl.8.gz $(DESTDIR)/usr/share/man/man8/mstpctl.8.gz
-       ln -sf /lib/mstpctl-utils/mstpctl-utils-interfaces.5.gz $(DESTDIR)/usr/share/man/man5/mstpctl-utils-interfaces.5.gz
-
-romfs: all
-       $(ROMFSINST) /sbin/mstpd
-       $(ROMFSINST) /sbin/mstpctl
-       $(ROMFSINST) /sbin/bridge-stp
-
-#depend:
-#      makedepend -I. -Y *.c -f .depend
diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..72129dd
--- /dev/null
@@ -0,0 +1,97 @@
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+AM_MAKEFLAGS = --no-print-directory
+
+# remove target if the command fails
+.DELETE_ON_ERROR:
+
+# keep intermediate files
+.SECONDARY:
+
+CLEANFILES =
+
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I $(top_srcdir)/include \
+       $(OUR_CPPFLAGS)
+
+AM_CFLAGS = $(OUR_CFLAGS)
+AM_LDFLAGS = $(OUR_LDFLAGS)
+
+if DEBUG
+AM_CFLAGS += -Werror
+endif
+
+bashcompletiondir = $(sysconfdir)/bash_completion.d
+
+sbin_PROGRAMS =
+dist_sbin_SCRIPTS =
+dist_man_MANS =
+
+# ------------------------------------------------------------------------------
+
+dist_doc_DATA = \
+       LICENSE
+
+# ------------------------------------------------------------------------------
+
+sbin_PROGRAMS += \
+       mstpd
+
+mstpd_SOURCES = \
+       src/bridge_ctl.h \
+       src/bridge_track.c \
+       src/brmon.c \
+       src/ctl_functions.h \
+       src/ctl_socket_server.c \
+       src/ctl_socket_server.h \
+       src/driver.h \
+       src/driver_deps.c \
+       src/epoll_loop.c \
+       src/epoll_loop.h \
+       src/hmac_md5.c \
+       src/libnetlink.c \
+       src/libnetlink.h \
+       src/list.h \
+       src/log.h \
+       src/main.c \
+       src/mstp.c \
+       src/mstp.h \
+       src/netif_utils.c \
+       src/netif_utils.h \
+       src/packet.c \
+       src/packet.h
+
+mstpd_CFLAGS = \
+       $(AM_CFLAGS)
+
+dist_sbin_SCRIPTS += \
+       src/bridge-stp
+
+# ------------------------------------------------------------------------------
+
+sbin_PROGRAMS += \
+       mstpctl
+
+mstpctl_SOURCES = \
+       src/ctl_functions.h \
+       src/ctl_main.c \
+       src/ctl_socket_client.c \
+       src/ctl_socket_client.h \
+       src/log.h
+
+mstpctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+dist_man_MANS += \
+       man/mstpctl.8
+
+dist_bashcompletion_SCRIPTS = \
+       contrib/bash_completion/mstpctl
+
+# ------------------------------------------------------------------------------
+# Debian specific stuff
+
+if DEBIAN
+       dist_man_MANS += man/mstpctl-utils-interfaces.5
+endif
diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..c08fadf
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoreconf --force --install --symlink
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..8c855c3
--- /dev/null
@@ -0,0 +1,96 @@
+
+AC_PREREQ([2.64])
+
+AC_INIT([mstpd],
+       [0.03],
+       [vitas@nppfactor.kiev.ua],
+       [mstpd],
+       [http://sourceforge.net/projects/mstpd/])
+
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AC_USE_SYSTEM_EXTENSIONS
+AC_PREFIX_DEFAULT([/usr])
+
+AM_INIT_AUTOMAKE([
+       foreign
+       1.11
+       -Wall
+       -Wno-portability
+       silent-rules
+       tar-pax
+       subdir-objects
+])
+AM_SILENT_RULES([yes])
+
+LT_PREREQ(2.2)
+LT_INIT([disable-static])
+
+# C compiler
+AC_PROG_CC
+AC_PROG_CC_C99
+AC_PROG_CC_C_O
+AC_PROG_GCC_TRADITIONAL
+
+CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
+       -pipe \
+       -Wall \
+       -Wextra \
+       -Wno-inline \
+       -Wundef \
+       "-Wformat=2 -Wformat-security -Wformat-nonliteral" \
+       -Wno-unused-parameter \
+       -Wno-unused-result \
+       -fno-strict-aliasing \
+       -fdiagnostics-show-option \
+       -fdiagnostics-color \
+       -fstack-protector-all \
+       --param=ssp-buffer-size=4])
+AC_SUBST([OUR_CFLAGS], $with_cflags)
+
+AS_CASE([$CFLAGS], [*-O[[12345g\ ]]*],
+       [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\
+               -Wp,-D_FORTIFY_SOURCE=2])],
+       [AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])])
+AC_SUBST([OUR_CPPFLAGS], $with_cppflags)
+
+CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\
+       -Wl,--as-needed \
+       -Wl,--no-undefined \
+       -Wl,--gc-sections \
+       -Wl,-z,relro \
+       -Wl,-z,now])
+AC_SUBST([OUR_LDFLAGS], $with_ldflags)
+
+AC_ARG_ENABLE([debug],
+       [  --enable-debug    Turn on debugging],
+       [case "${enableval}" in
+               yes)
+                       debug="true"
+                       ;;
+               no)
+                       debug="false"
+                       ;;
+               *)
+                       AC_MSG_ERROR([bad value ${enableval} for --enable-debug])
+                       ;;
+       esac],[debug=false])
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+
+# Easy check if we are running on Debian
+AM_CONDITIONAL([DEBIAN], [test -e /etc/debian_release])
+
+AC_CONFIG_FILES([
+       Makefile
+])
+
+AC_OUTPUT
+AC_MSG_RESULT([
+       $PACKAGE_NAME $VERSION
+
+       CFLAGS:           ${OUR_CFLAGS} ${CFLAGS}
+       CPPFLAGS:         ${OUR_CPPFLAGS} ${CPPFLAGS}
+       LDFLAGS:          ${OUR_LDFLAGS} ${LDFLAGS}
+])
similarity index 100%
rename from lib/ifupdown.sh
rename to contrib/ifupdown.sh
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644 (file)
index 0000000..764b428
--- /dev/null
@@ -0,0 +1,5 @@
+/libtool.m4
+/lt~obsolete.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
diff --git a/m4/attributes.m4 b/m4/attributes.m4
new file mode 100644 (file)
index 0000000..7e080da
--- /dev/null
@@ -0,0 +1,288 @@
+dnl Macros to check the presence of generic (non-typed) symbols.
+dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com>
+dnl Copyright (c) 2006-2008 xine project
+dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+dnl
+dnl As a special exception, the copyright owners of the
+dnl macro gives unlimited permission to copy, distribute and modify the
+dnl configure scripts that are the output of Autoconf when processing the
+dnl Macro. You need not follow the terms of the GNU General Public
+dnl License when using or distributing such scripts, even though portions
+dnl of the text of the Macro appear in them. The GNU General Public
+dnl License (GPL) does govern all other use of the material that
+dnl constitutes the Autoconf Macro.
+dnl
+dnl This special exception to the GPL applies to versions of the
+dnl Autoconf Macro released by this project. When you make and
+dnl distribute a modified version of the Autoconf Macro, you may extend
+dnl this special exception to the GPL to apply to your modified version as
+dnl well.
+
+dnl Check if FLAG in ENV-VAR is supported by compiler and append it
+dnl to WHERE-TO-APPEND variable
+dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
+
+AC_DEFUN([CC_CHECK_FLAG_APPEND], [
+  AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
+                 AS_TR_SH([cc_cv_$2_$3]),
+          [eval "AS_TR_SH([cc_save_$2])='${$2}'"
+           eval "AS_TR_SH([$2])='-Werror $3'"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],
+                                    [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
+                                    [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
+           eval "AS_TR_SH([$2])='$cc_save_$2'"])
+
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
+        [eval "$1='${$1} $3'"])
+])
+
+dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2])
+AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
+  for flag in $3; do
+    CC_CHECK_FLAG_APPEND($1, $2, $flag)
+  done
+])
+
+dnl Check if the flag is supported by linker (cacheable)
+dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+
+AC_DEFUN([CC_CHECK_LDFLAGS], [
+  AC_CACHE_CHECK([if $CC supports $1 flag],
+    AS_TR_SH([cc_cv_ldflags_$1]),
+    [ac_save_LDFLAGS="$LDFLAGS"
+     LDFLAGS="$LDFLAGS $1"
+     AC_LINK_IFELSE([int main() { return 1; }],
+       [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"],
+       [eval "AS_TR_SH([cc_cv_ldflags_$1])="])
+     LDFLAGS="$ac_save_LDFLAGS"
+    ])
+
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes],
+    [$2], [$3])
+])
+
+dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for
+dnl the current linker to avoid undefined references in a shared object.
+AC_DEFUN([CC_NOUNDEFINED], [
+  dnl We check $host for which systems to enable this for.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  case $host in
+     dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads
+     dnl are requested, as different implementations are present; to avoid problems
+     dnl use -Wl,-z,defs only for those platform not behaving this way.
+     *-freebsd* | *-openbsd*) ;;
+     *)
+        dnl First of all check for the --no-undefined variant of GNU ld. This allows
+        dnl for a much more readable commandline, so that people can understand what
+        dnl it does without going to look for what the heck -z defs does.
+        for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do
+           CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"])
+           break
+        done
+     ;;
+  esac
+
+  AC_SUBST([LDFLAGS_NOUNDEFINED])
+])
+
+dnl Check for a -Werror flag or equivalent. -Werror is the GCC
+dnl and ICC flag that tells the compiler to treat all the warnings
+dnl as fatal. We usually need this option to make sure that some
+dnl constructs (like attributes) are not simply ignored.
+dnl
+dnl Other compilers don't support -Werror per se, but they support
+dnl an equivalent flag:
+dnl  - Sun Studio compiler supports -errwarn=%all
+AC_DEFUN([CC_CHECK_WERROR], [
+  AC_CACHE_CHECK(
+    [for $CC way to treat warnings as errors],
+    [cc_cv_werror],
+    [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror],
+      [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])])
+    ])
+])
+
+AC_DEFUN([CC_CHECK_ATTRIBUTE], [
+  AC_REQUIRE([CC_CHECK_WERROR])
+  AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))],
+    AS_TR_SH([cc_cv_attribute_$1]),
+    [ac_save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $cc_cv_werror"
+     AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])],
+       [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"],
+       [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"])
+     CFLAGS="$ac_save_CFLAGS"
+    ])
+
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes],
+    [AC_DEFINE(
+       AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1,
+         [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))]
+         )
+     $4],
+    [$5])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [
+  CC_CHECK_ATTRIBUTE(
+    [constructor],,
+    [void __attribute__((constructor)) ctor() { int a; }],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT], [
+  CC_CHECK_ATTRIBUTE(
+    [format], [format(printf, n, n)],
+    [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [
+  CC_CHECK_ATTRIBUTE(
+    [format_arg], [format_arg(printf)],
+    [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [
+  CC_CHECK_ATTRIBUTE(
+    [visibility_$1], [visibility("$1")],
+    [void __attribute__((visibility("$1"))) $1_function() { }],
+    [$2], [$3])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_NONNULL], [
+  CC_CHECK_ATTRIBUTE(
+    [nonnull], [nonnull()],
+    [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_UNUSED], [
+  CC_CHECK_ATTRIBUTE(
+    [unused], ,
+    [void some_function(void *foo, __attribute__((unused)) void *bar);],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [
+  CC_CHECK_ATTRIBUTE(
+    [sentinel], ,
+    [void some_function(void *foo, ...) __attribute__((sentinel));],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [
+  CC_CHECK_ATTRIBUTE(
+    [deprecated], ,
+    [void some_function(void *foo, ...) __attribute__((deprecated));],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIAS], [
+  CC_CHECK_ATTRIBUTE(
+    [alias], [weak, alias],
+    [void other_function(void *foo) { }
+     void some_function(void *foo) __attribute__((weak, alias("other_function")));],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_MALLOC], [
+  CC_CHECK_ATTRIBUTE(
+    [malloc], ,
+    [void * __attribute__((malloc)) my_alloc(int n);],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_PACKED], [
+  CC_CHECK_ATTRIBUTE(
+    [packed], ,
+    [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_CONST], [
+  CC_CHECK_ATTRIBUTE(
+    [const], ,
+    [int __attribute__((const)) twopow(int n) { return 1 << n; } ],
+    [$1], [$2])
+])
+
+AC_DEFUN([CC_FLAG_VISIBILITY], [
+  AC_REQUIRE([CC_CHECK_WERROR])
+  AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
+    [cc_cv_flag_visibility],
+    [cc_flag_visibility_save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $cc_cv_werror"
+     CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden],
+     cc_cv_flag_visibility='yes',
+     cc_cv_flag_visibility='no')
+     CFLAGS="$cc_flag_visibility_save_CFLAGS"])
+
+  AS_IF([test "x$cc_cv_flag_visibility" = "xyes"],
+    [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1,
+       [Define this if the compiler supports the -fvisibility flag])
+     $1],
+    [$2])
+])
+
+AC_DEFUN([CC_FUNC_EXPECT], [
+  AC_REQUIRE([CC_CHECK_WERROR])
+  AC_CACHE_CHECK([if compiler has __builtin_expect function],
+    [cc_cv_func_expect],
+    [ac_save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $cc_cv_werror"
+     AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+       [int some_function() {
+        int a = 3;
+        return (int)__builtin_expect(a, 3);
+     }])],
+       [cc_cv_func_expect=yes],
+       [cc_cv_func_expect=no])
+     CFLAGS="$ac_save_CFLAGS"
+    ])
+
+  AS_IF([test "x$cc_cv_func_expect" = "xyes"],
+    [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1,
+     [Define this if the compiler supports __builtin_expect() function])
+     $1],
+    [$2])
+])
+
+AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [
+  AC_REQUIRE([CC_CHECK_WERROR])
+  AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported],
+    [cc_cv_attribute_aligned],
+    [ac_save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $cc_cv_werror"
+     for cc_attribute_align_try in 64 32 16 8 4 2; do
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+          int main() {
+            static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0;
+            return c;
+          }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break])
+     done
+     CFLAGS="$ac_save_CFLAGS"
+  ])
+
+  if test "x$cc_cv_attribute_aligned" != "x"; then
+     AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned],
+       [Define the highest alignment supported])
+  fi
+])
similarity index 100%
rename from lib/mstpctl.8
rename to man/mstpctl.8
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from bridge-stp
rename to src/bridge-stp
similarity index 100%
rename from bridge_ctl.h
rename to src/bridge_ctl.h
similarity index 100%
rename from bridge_track.c
rename to src/bridge_track.c
similarity index 100%
rename from brmon.c
rename to src/brmon.c
similarity index 100%
rename from ctl_functions.h
rename to src/ctl_functions.h
similarity index 100%
rename from ctl_main.c
rename to src/ctl_main.c
similarity index 100%
rename from ctl_socket_client.c
rename to src/ctl_socket_client.c
similarity index 100%
rename from ctl_socket_client.h
rename to src/ctl_socket_client.h
similarity index 100%
rename from ctl_socket_server.c
rename to src/ctl_socket_server.c
similarity index 100%
rename from ctl_socket_server.h
rename to src/ctl_socket_server.h
similarity index 100%
rename from driver.h
rename to src/driver.h
similarity index 100%
rename from driver_deps.c
rename to src/driver_deps.c
similarity index 100%
rename from epoll_loop.c
rename to src/epoll_loop.c
similarity index 100%
rename from epoll_loop.h
rename to src/epoll_loop.h
similarity index 100%
rename from hmac_md5.c
rename to src/hmac_md5.c
similarity index 100%
rename from libnetlink.c
rename to src/libnetlink.c
similarity index 100%
rename from libnetlink.h
rename to src/libnetlink.h
similarity index 100%
rename from list.h
rename to src/list.h
diff --git a/log.h b/src/log.h
similarity index 100%
rename from log.h
rename to src/log.h
similarity index 100%
rename from main.c
rename to src/main.c
similarity index 100%
rename from mstp.c
rename to src/mstp.c
similarity index 100%
rename from mstp.h
rename to src/mstp.h
similarity index 100%
rename from netif_utils.c
rename to src/netif_utils.c
similarity index 100%
rename from netif_utils.h
rename to src/netif_utils.h
similarity index 100%
rename from packet.c
rename to src/packet.c
similarity index 100%
rename from packet.h
rename to src/packet.h