build: Combine $(CFLAGS) and $(STRICT_CFLAGS).

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 648f2a635bc0e99f50b8c7010ac7106eb62f848d..54a313ad64111e9f8eef02cd175898a9743f6c73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -51,18 +51,10 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([GENGETOPT], [gengetopt])
-test -z "$GENGETOPT" && AC_MSG_ERROR(
-       [gengetopt is required to build this package])
-
 AC_PATH_PROG([M4], [m4])
 test -z "$M4" && AC_MSG_ERROR(
        [The m4 macro processor is required to build this package])
 
-AC_PATH_PROG([HELP2MAN], [help2man])
-test -z "$HELP2MAN" && AC_MSG_ERROR(
-       [help2man is required to build this package])
-
 AC_PATH_PROG([INSTALL], [install])
 test -z "$INSTALL" && AC_MSG_ERROR(
        [The install program is required to build this package])
@@ -202,15 +194,6 @@ AC_MSG_RESULT($have_ucred)
 if test ${have_ucred} = yes; then
        AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
-########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
-AC_CHECK_DECL(
-       [gengetopt_args_info_description],
-       [ggo_descriptions_declared=yes],
-       [ggo_descriptions_declared=no],
-       [#include "conftest-ggo.h"]
-)
-AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
 STASH_FLAGS
 LIB_ARG_WITH([curses], [])
@@ -409,7 +392,6 @@ UNSTASH_FLAGS
 if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
        build_server="yes"
        executables="$executables server"
-       server_cmdline_objs="server"
        server_errlist_objs="
                server
                afh_common
@@ -448,7 +430,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
                wma_common
                sideband
                version
-               ggo
        "
        if test "$CRYPTOLIB" = openssl; then
                server_errlist_objs="$server_errlist_objs crypt"
@@ -463,7 +444,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
        if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
                server_errlist_objs="$server_errlist_objs aac_afh aac_common"
        fi
-       server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
+       server_objs="$server_errlist_objs"
        AC_SUBST(server_objs, add_dot_o($server_objs))
 else
        build_server="no"
@@ -506,9 +487,6 @@ if test -n "$CRYPTOLIB"; then
        build_audiod="yes"
        executables="$executables audiod"
        audiod_audio_formats="wma"
-       audiod_cmdline_objs="$audiod_cmdline_objs
-               audiod
-       "
        audiod_errlist_objs="$audiod_errlist_objs
                audiod
                signal
@@ -535,7 +513,6 @@ if test -n "$CRYPTOLIB"; then
                audiod_command
                fecdec_filter
                client_common
-               ggo
                udp_recv
                color
                fec
@@ -592,7 +569,7 @@ if test -n "$CRYPTOLIB"; then
        if test $HAVE_SAMPLERATE = yes; then
                audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
        fi
-       audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
+       audiod_objs="$audiod_errlist_objs"
        AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
 
        enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
@@ -648,7 +625,6 @@ fi
 if test $HAVE_CURSES = yes; then
        build_gui="yes"
        executables="$executables gui"
-       gui_cmdline_objs="gui"
        gui_errlist_objs="
                exec
                signal
@@ -661,9 +637,8 @@ if test $HAVE_CURSES = yes; then
                time
                sched
                version
-               ggo
        "
-       gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
+       gui_objs="$gui_errlist_objs"
        AC_SUBST(gui_objs, add_dot_o($gui_objs))
 else
        build_gui="no"
@@ -681,7 +656,6 @@ filter_errlist_objs="
        sched
        fd
        amp_filter
-       ggo
        fecdec_filter
        fec
        version
@@ -695,9 +669,6 @@ filter_errlist_objs="
        net
        sync_filter
 "
-filter_cmdline_objs="
-       filter
-"
 NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter"
 NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
 NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
@@ -711,14 +682,10 @@ fi
 if test $HAVE_SAMPLERATE = yes; then
        filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
 fi
-filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+filter_objs="$filter_errlist_objs"
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 ########################################################################## recv
-recv_cmdline_objs="
-       recv
-"
-
 recv_errlist_objs="
        http_recv
        recv_common
@@ -748,11 +715,10 @@ NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
        recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi
-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
+recv_objs="$recv_errlist_objs"
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
-afh_cmdline_objs="afh"
 afh_errlist_objs="
        afh
        string
@@ -763,7 +729,6 @@ afh_errlist_objs="
        wma_afh
        wma_common
        version
-       ggo
 "
 NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -787,7 +752,7 @@ if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
        audio_format_handlers="$audio_format_handlers aac"
 fi
 
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+afh_objs="$afh_errlist_objs"
 
 AC_SUBST(afh_objs, add_dot_o($afh_objs))
 ########################################################################## play
@@ -873,9 +838,6 @@ fi
 play_objs="$play_errlist_objs"
 AC_SUBST(play_objs, add_dot_o($play_objs))
 ######################################################################### write
-write_cmdline_objs="
-       write
-"
 write_errlist_objs="
        write
        write_common
@@ -886,7 +848,6 @@ write_errlist_objs="
        sched
        stdin
        buffer_tree
-       ggo
        check_wav
        version
 "
@@ -903,7 +864,7 @@ fi
 if test $HAVE_ALSA = yes; then
        write_errlist_objs="$write_errlist_objs alsa_write"
 fi
-write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+write_objs="$write_errlist_objs"
 AC_SUBST(write_objs, add_dot_o($write_objs))
 ######################################################################## audioc
 audioc_errlist_objs="