build: Move relevant parts to client section.

These parts belong to the client section at the bottom of configure.ac.
This also gets rid of @client_ldflags@.

diff --git a/Makefile.in b/Makefile.in
index ecfc0249ea7442616e46bffc41824db9fc3a2b25..89eb5bf2b406f9068dd4622cb248f2aad6fa5d38 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -335,7 +335,7 @@ para_filter: $(filter_objs)
 
 para_client: $(client_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
 
 para_client: $(client_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

-       $(Q) $(CC) -o $@ $(client_objs) @client_ldflags@ $(LDFLAGS)
+       $(Q) $(CC) -o $@ $(client_objs) $(LDFLAGS)

 
 para_gui: $(gui_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'
 
 para_gui: $(gui_objs)
        @[ -z "$(Q)" ] || echo 'LD $@'

diff --git a/configure.ac b/configure.ac
index 06ce1c34a8236f04f2465d18297ea024794a64b1..8ac2b2a5549192a255665908c9d0be8953bc67a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,6 @@ if test "$check_openssl" = "yes"; then
                openssl_ldflags="$openssl_libs -lssl -lcrypto"
                AC_SUBST(openssl_ldflags)
 
                openssl_ldflags="$openssl_libs -lssl -lcrypto"
                AC_SUBST(openssl_ldflags)
 

-               client_errlist_objs="$client_errlist_objs crypt"

                audiod_errlist_objs="$audiod_errlist_objs crypt"
 
                check_gcrypt="no"
                audiod_errlist_objs="$audiod_errlist_objs crypt"
 
                check_gcrypt="no"


@@ -232,7 +231,6 @@ if test "$check_gcrypt" = "yes"; then
                gcrypt_ldflags="$gcrypt_libs -lgcrypt"
                AC_SUBST(gcrypt_ldflags)
 
                gcrypt_ldflags="$gcrypt_libs -lgcrypt"
                AC_SUBST(gcrypt_ldflags)
 

-               client_errlist_objs="$client_errlist_objs gcrypt"

                audiod_errlist_objs="$audiod_errlist_objs gcrypt"
        else
                AC_MSG_WARN([gcrypt library not found])
                audiod_errlist_objs="$audiod_errlist_objs gcrypt"
        else
                AC_MSG_WARN([gcrypt library not found])


@@ -802,9 +800,9 @@ if test "$have_readline" = "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then

+       :

        AC_SUBST(readline_cppflags)
        AC_SUBST(readline_ldflags)
        AC_SUBST(readline_cppflags)
        AC_SUBST(readline_ldflags)

-       client_errlist_objs="$client_errlist_objs interactive"

        AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
        AC_MSG_WARN([libreadline not found or unusable])
        AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
        AC_MSG_WARN([libreadline not found or unusable])


@@ -931,7 +929,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
        build_client="yes"
        executables="$executables client"
        client_cmdline_objs="client"
        build_client="yes"
        executables="$executables client"
        client_cmdline_objs="client"

-       client_errlist_objs="$client_errlist_objs
+       client_errlist_objs="

                client
                net
                string
                client
                net
                string


@@ -947,6 +945,19 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
                version
                ggo
        "
                version
                ggo
        "

+       if test "$have_openssl" = "yes"; then
+               client_errlist_objs="$client_errlist_objs crypt"
+       fi
+       if test "$have_gcrypt" = "yes"; then
+               client_errlist_objs="$client_errlist_objs gcrypt"
+       fi
+       if test "$have_readline" = "yes"; then
+               client_errlist_objs="$client_errlist_objs interactive"
+       fi
+       client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
+       AC_SUBST(client_objs, add_dot_o($client_objs))
+       AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
+               objlist_to_errlist($client_errlist_objs), errors used by para_client)

 else
        build_client="no"
 fi
 else
        build_client="no"
 fi


@@ -1486,7 +1497,6 @@ AC_SUBST(executables)
 
 filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
 
 filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
 audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"

-client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"

 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
 
 AC_SUBST(filter_objs, add_dot_o($filter_objs))
 AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,


@@ -1497,11 +1507,6 @@ AC_SUBST(audiod_ldflags, $audiod_ldflags)
 AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
        errors used by para_audiod)
 
 AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
        errors used by para_audiod)
 

-AC_SUBST(client_objs, add_dot_o($client_objs))
-AC_SUBST(client_ldflags, $client_ldflags)
-AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
-       objlist_to_errlist($client_errlist_objs), errors used by para_client)
-

 AC_SUBST(gui_objs, add_dot_o($gui_objs))
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
        objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 AC_SUBST(gui_objs, add_dot_o($gui_objs))
 AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
        objlist_to_errlist($gui_errlist_objs), errors used by para_gui)