From cc52d150eb5b823e1a0f50b27a1611df982ac568 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 6 Dec 2013 11:52:46 +0100 Subject: Modernise autoconf. --- autogen.sh | 91 ++---------------------------------------------------------- configure.ac | 69 +++++++++++++++++++++++++++++++++++++++++++++ configure.in | 70 ---------------------------------------------- 3 files changed, 71 insertions(+), 159 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/autogen.sh b/autogen.sh index 6e23e5b..298a369 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,89 +1,2 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# This was lifted from the Gimp, and adapted slightly by -# Raph Levien, slightly hacked for xine by Daniel Caujolle-Bert. - -DIE=0 - -PROG=anoid - -# Check how echo works in this /bin/sh -case `echo -n` in --n) _echo_n= _echo_c='\c';; -*) _echo_n=-n _echo_c=;; -esac - - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROG." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtool installed to compile $PROG." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROG." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -(aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing aclocal. The version of automake" - echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -if [ "$DIE" -eq 1 ]; then - exit 1 -fi - -# Create testfiles -TESTDIRS="src" -for d in $TESTDIRS -do - if [ ! -f $d/Makefile.am.test ] - then - touch $d/Makefile.am.test - fi -done - -aclocalinclude="$ACLOCAL_FLAGS"; \ -(echo $_echo_n " + Running aclocal: $_echo_c"; \ - aclocal $aclocalinclude; \ - echo "done.") && \ -(echo $_echo_n " + Running libtoolize: $_echo_c"; \ - libtoolize --force --copy >/dev/null 2>&1; \ - echo "done.") && \ -(echo $_echo_n " + Running autoheader: $_echo_c"; \ - autoheader; \ - echo "done.") && \ -(echo $_echo_n " + Running automake: $_echo_c"; \ - automake --gnu --add-missing --copy; \ - echo "done.") && \ -(echo $_echo_n " + Running autoconf: $_echo_c"; \ - autoconf; \ - echo "done.") - -rm -f config.cache - -for d in $TESTDIRS -do - if [ -f $d/Makefile.am.test ] - then - rm $d/Makefile.am.test - fi -done +#!/bin/sh -e +${AUTORECONF:-autoreconf} -fiv diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..01c69b4 --- /dev/null +++ b/configure.ac @@ -0,0 +1,69 @@ +# Filename: configure.in + +AC_INIT([muniad], [0.0.2]) +AC_CONFIG_SRCDIR([src/muniad.cc]) +AM_INIT_AUTOMAKE + +dnl ====================== +dnl Compile with debug options +dnl ====================== +AC_ARG_WITH(debug, + [ --with-debug build with debug support (default=no)], + [], + [with_debug=no]) +if test x$with_debug == xyes; then + AC_MSG_WARN([*** Building with debug support!]) + AC_DEFINE_UNQUOTED(WITH_DEBUG, , [The project is configured to use debug output]) + CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector -Wall -Werror -g -O0" +fi + +dnl ====================== +dnl Init pkg-config +dnl ====================== +PKG_PROG_PKG_CONFIG(0.23) + +AC_PROG_CXX + +AM_CONFIG_HEADER(config.h) +AC_STDC_HEADERS + +dnl ====================== +dnl Check for getopt +dnl ====================== +AC_HAVE_HEADERS(getopt.h) + +dnl ====================== +dnl Check for eXpat library +dnl ====================== +tmp_CXXFLAGS="$CXXFLAGS" +tmp_CPPFLAGS="$CPPFLAGS" +tmp_CFLAGS="$CFLAGS" +tmp_LDFLAGS="$LDFLAGS" +tmp_LIBS="$LIBS" +CXXFLAGS="" +CPPFLAGS="" +CFLAGS="" +LDFLAGS="" +LIBS="" +AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!])) +AC_CHECK_LIB(expat, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!])) +EXPAT_CFLAGS="$CXXFLAGS $CPPFLAGS $CFLAGS" +EXPAT_LIBS="$LDFLAGS $LIBS" +CXXFLAGS="$tmp_CXXFLAGS" +CPPFLAGS="$tmp_CPPFLAGS" +CFLAGS="$tmp_CFLAGS" +LDFLAGS="$tmp_LDFLAGS" +LIBS="$tmp_LIBS" +AC_SUBST(EXPAT_CFLAGS) +AC_SUBST(EXPAT_LIBS) + +dnl ====================== +dnl Check for libwebsockets library +dnl ====================== +PKG_CHECK_MODULES(LIBWEBSOCKETS, libwebsockets >= 1.23) + +AC_OUTPUT( + Makefile + src/Makefile + tools/Makefile) + diff --git a/configure.in b/configure.in deleted file mode 100644 index d4f48f0..0000000 --- a/configure.in +++ /dev/null @@ -1,70 +0,0 @@ -# Filename: configure.in - -AC_INIT(src/muniad.cc) - -VERSION="0.0.1" -AM_INIT_AUTOMAKE( munia, $VERSION ) - -dnl ====================== -dnl Compile with debug options -dnl ====================== -AC_ARG_WITH(debug, - [ --with-debug build with debug support (default=no)], - [], - [with_debug=no]) -if test x$with_debug == xyes; then - AC_MSG_WARN([*** Building with debug support!]) - AC_DEFINE_UNQUOTED(WITH_DEBUG, , [The project is configured to use debug output]) - CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2 -fstack-protector -Wall -Werror -g -O0" -fi - -dnl ====================== -dnl Init pkg-config -dnl ====================== -PKG_PROG_PKG_CONFIG(0.23) - -AC_PROG_CXX - -AM_CONFIG_HEADER(config.h) -AC_STDC_HEADERS - -dnl ====================== -dnl Check for getopt -dnl ====================== -AC_HAVE_HEADERS(getopt.h) - -dnl ====================== -dnl Check for eXpat library -dnl ====================== -tmp_CXXFLAGS="$CXXFLAGS" -tmp_CPPFLAGS="$CPPFLAGS" -tmp_CFLAGS="$CFLAGS" -tmp_LDFLAGS="$LDFLAGS" -tmp_LIBS="$LIBS" -CXXFLAGS="" -CPPFLAGS="" -CFLAGS="" -LDFLAGS="" -LIBS="" -AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!])) -AC_CHECK_LIB(expat, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!])) -EXPAT_CFLAGS="$CXXFLAGS $CPPFLAGS $CFLAGS" -EXPAT_LIBS="$LDFLAGS $LIBS" -CXXFLAGS="$tmp_CXXFLAGS" -CPPFLAGS="$tmp_CPPFLAGS" -CFLAGS="$tmp_CFLAGS" -LDFLAGS="$tmp_LDFLAGS" -LIBS="$tmp_LIBS" -AC_SUBST(EXPAT_CFLAGS) -AC_SUBST(EXPAT_LIBS) - -dnl ====================== -dnl Check for libwebsockets library -dnl ====================== -PKG_CHECK_MODULES(LIBWEBSOCKETS, libwebsockets >= 1.23) - -AC_OUTPUT( - Makefile - src/Makefile - tools/Makefile) - -- cgit v1.2.3