diff options
-rw-r--r-- | m4/libtool.m4 | 27 | ||||
-rw-r--r-- | src/ext/gnunet-service-ext.c | 39 |
2 files changed, 36 insertions, 30 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ee80844..a6d21ae 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 | |||
@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;} | |||
1041 | _LT_EOF | 1041 | _LT_EOF |
1042 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD | 1042 | echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD |
1043 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD | 1043 | $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD |
1044 | echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD | 1044 | echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD |
1045 | $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD | 1045 | $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD |
1046 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD | 1046 | echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD |
1047 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD | 1047 | $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD |
1048 | cat > conftest.c << _LT_EOF | 1048 | cat > conftest.c << _LT_EOF |
@@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock | |||
1492 | m4_defun([_LT_PROG_AR], | 1492 | m4_defun([_LT_PROG_AR], |
1493 | [AC_CHECK_TOOLS(AR, [ar], false) | 1493 | [AC_CHECK_TOOLS(AR, [ar], false) |
1494 | : ${AR=ar} | 1494 | : ${AR=ar} |
1495 | : ${AR_FLAGS=cru} | 1495 | : ${AR_FLAGS=cr} |
1496 | _LT_DECL([], [AR], [1], [The archiver]) | 1496 | _LT_DECL([], [AR], [1], [The archiver]) |
1497 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) | 1497 | _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) |
1498 | 1498 | ||
@@ -4063,7 +4063,8 @@ _LT_EOF | |||
4063 | if AC_TRY_EVAL(ac_compile); then | 4063 | if AC_TRY_EVAL(ac_compile); then |
4064 | # Now try to grab the symbols. | 4064 | # Now try to grab the symbols. |
4065 | nlist=conftest.nm | 4065 | nlist=conftest.nm |
4066 | if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then | 4066 | $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD |
4067 | if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then | ||
4067 | # Try sorting and uniquifying the output. | 4068 | # Try sorting and uniquifying the output. |
4068 | if sort "$nlist" | uniq > "$nlist"T; then | 4069 | if sort "$nlist" | uniq > "$nlist"T; then |
4069 | mv -f "$nlist"T "$nlist" | 4070 | mv -f "$nlist"T "$nlist" |
@@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [ | |||
4703 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' | 4704 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
4704 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | 4705 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
4705 | ;; | 4706 | ;; |
4707 | # flang / f18. f95 an alias for gfortran or flang on Debian | ||
4708 | flang* | f18* | f95*) | ||
4709 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' | ||
4710 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' | ||
4711 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' | ||
4712 | ;; | ||
4706 | # icc used to be incompatible with GCC. | 4713 | # icc used to be incompatible with GCC. |
4707 | # ICC 10 doesn't accept -KPIC any more. | 4714 | # ICC 10 doesn't accept -KPIC any more. |
4708 | icc* | ifort*) | 4715 | icc* | ifort*) |
@@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
6438 | # Commands to make compiler produce verbose output that lists | 6445 | # Commands to make compiler produce verbose output that lists |
6439 | # what "hidden" libraries, object files and flags are used when | 6446 | # what "hidden" libraries, object files and flags are used when |
6440 | # linking a shared library. | 6447 | # linking a shared library. |
6441 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 6448 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
6442 | 6449 | ||
6443 | else | 6450 | else |
6444 | GXX=no | 6451 | GXX=no |
@@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
6813 | # explicitly linking system object files so we need to strip them | 6820 | # explicitly linking system object files so we need to strip them |
6814 | # from the output so that they don't get included in the library | 6821 | # from the output so that they don't get included in the library |
6815 | # dependencies. | 6822 | # dependencies. |
6816 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 6823 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
6817 | ;; | 6824 | ;; |
6818 | *) | 6825 | *) |
6819 | if test yes = "$GXX"; then | 6826 | if test yes = "$GXX"; then |
@@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
6878 | # explicitly linking system object files so we need to strip them | 6885 | # explicitly linking system object files so we need to strip them |
6879 | # from the output so that they don't get included in the library | 6886 | # from the output so that they don't get included in the library |
6880 | # dependencies. | 6887 | # dependencies. |
6881 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | 6888 | output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' |
6882 | ;; | 6889 | ;; |
6883 | *) | 6890 | *) |
6884 | if test yes = "$GXX"; then | 6891 | if test yes = "$GXX"; then |
@@ -7217,7 +7224,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
7217 | # Commands to make compiler produce verbose output that lists | 7224 | # Commands to make compiler produce verbose output that lists |
7218 | # what "hidden" libraries, object files and flags are used when | 7225 | # what "hidden" libraries, object files and flags are used when |
7219 | # linking a shared library. | 7226 | # linking a shared library. |
7220 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7227 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
7221 | 7228 | ||
7222 | else | 7229 | else |
7223 | # FIXME: insert proper C++ library support | 7230 | # FIXME: insert proper C++ library support |
@@ -7301,7 +7308,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
7301 | # Commands to make compiler produce verbose output that lists | 7308 | # Commands to make compiler produce verbose output that lists |
7302 | # what "hidden" libraries, object files and flags are used when | 7309 | # what "hidden" libraries, object files and flags are used when |
7303 | # linking a shared library. | 7310 | # linking a shared library. |
7304 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7311 | output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
7305 | else | 7312 | else |
7306 | # g++ 2.7 appears to require '-G' NOT '-shared' on this | 7313 | # g++ 2.7 appears to require '-G' NOT '-shared' on this |
7307 | # platform. | 7314 | # platform. |
@@ -7312,7 +7319,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||
7312 | # Commands to make compiler produce verbose output that lists | 7319 | # Commands to make compiler produce verbose output that lists |
7313 | # what "hidden" libraries, object files and flags are used when | 7320 | # what "hidden" libraries, object files and flags are used when |
7314 | # linking a shared library. | 7321 | # linking a shared library. |
7315 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | 7322 | output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' |
7316 | fi | 7323 | fi |
7317 | 7324 | ||
7318 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' | 7325 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' |
diff --git a/src/ext/gnunet-service-ext.c b/src/ext/gnunet-service-ext.c index d434182..6399389 100644 --- a/src/ext/gnunet-service-ext.c +++ b/src/ext/gnunet-service-ext.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #include <gnunet/platform.h> | 26 | #include <gnunet/platform.h> |
27 | #include "gnunet_ext_config.h" | ||
28 | #include <stddef.h> | 27 | #include <stddef.h> |
29 | 28 | ||
30 | #if HAVE_NETINET_IN_H | 29 | #if HAVE_NETINET_IN_H |
@@ -64,8 +63,7 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg; | |||
64 | /** | 63 | /** |
65 | * This structure holds informations about the project. | 64 | * This structure holds informations about the project. |
66 | */ | 65 | */ |
67 | static const struct GNUNET_OS_ProjectData gnunetext_pd = | 66 | static const struct GNUNET_OS_ProjectData gnunetext_pd = { |
68 | { | ||
69 | .libname = "libgnunetext", | 67 | .libname = "libgnunetext", |
70 | .project_dirname = "gnunet-ext", | 68 | .project_dirname = "gnunet-ext", |
71 | .binary_name = "gnunet-service-ext", | 69 | .binary_name = "gnunet-service-ext", |
@@ -95,6 +93,7 @@ project_data_initialize (void) | |||
95 | GNUNET_OS_init (&gnunetext_pd); | 93 | GNUNET_OS_init (&gnunetext_pd); |
96 | } | 94 | } |
97 | 95 | ||
96 | |||
98 | /** | 97 | /** |
99 | * Handle EXT-message. | 98 | * Handle EXT-message. |
100 | * | 99 | * |
@@ -141,8 +140,8 @@ shutdown_task (void *cls) | |||
141 | */ | 140 | */ |
142 | static void | 141 | static void |
143 | run (void *cls, | 142 | run (void *cls, |
144 | struct GNUNET_SERVER_Handle *server, | 143 | const struct GNUNET_CONFIGURATION_Handle *c, |
145 | const struct GNUNET_CONFIGURATION_Handle *c) | 144 | struct GNUNET_SERVICE_Handle *service) |
146 | { | 145 | { |
147 | cfg = c; | 146 | cfg = c; |
148 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, | 147 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, |
@@ -160,8 +159,8 @@ run (void *cls, | |||
160 | */ | 159 | */ |
161 | static void * | 160 | static void * |
162 | client_connect_cb (void *cls, | 161 | client_connect_cb (void *cls, |
163 | struct GNUNET_SERVICE_Client *c, | 162 | struct GNUNET_SERVICE_Client *c, |
164 | struct GNUNET_MQ_Handle *mq) | 163 | struct GNUNET_MQ_Handle *mq) |
165 | { | 164 | { |
166 | struct ClientContext *cc; | 165 | struct ClientContext *cc; |
167 | 166 | ||
@@ -182,8 +181,8 @@ client_connect_cb (void *cls, | |||
182 | */ | 181 | */ |
183 | static void | 182 | static void |
184 | client_disconnect_cb (void *cls, | 183 | client_disconnect_cb (void *cls, |
185 | struct GNUNET_SERVICE_Client *c, | 184 | struct GNUNET_SERVICE_Client *c, |
186 | void *internal_cls) | 185 | void *internal_cls) |
187 | { | 186 | { |
188 | struct ClientContext *cc = internal_cls; | 187 | struct ClientContext *cc = internal_cls; |
189 | 188 | ||
@@ -197,16 +196,16 @@ client_disconnect_cb (void *cls, | |||
197 | * Define "main" method using service macro. | 196 | * Define "main" method using service macro. |
198 | */ | 197 | */ |
199 | GNUNET_SERVICE_MAIN | 198 | GNUNET_SERVICE_MAIN |
200 | ("ext", | 199 | ("ext", |
201 | GNUNET_SERVICE_OPTION_NONE, | 200 | GNUNET_SERVICE_OPTION_NONE, |
202 | &run, | 201 | &run, |
203 | &client_connect_cb, | 202 | &client_connect_cb, |
204 | &client_disconnect_cb, | 203 | &client_disconnect_cb, |
205 | NULL, | 204 | NULL, |
206 | GNUNET_MQ_hd_fixed_size (ext, | 205 | GNUNET_MQ_hd_fixed_size (ext, |
207 | GNUNET_MESSAGE_TYPE_EXT, | 206 | GNUNET_MESSAGE_TYPE_EXT, |
208 | struct GNUNET_MessageHeader, | 207 | struct GNUNET_MessageHeader, |
209 | NULL), | 208 | NULL), |
210 | GNUNET_MQ_handler_end ()); | 209 | GNUNET_MQ_handler_end ()); |
211 | 210 | ||
212 | /* end of gnunet-service-ext.c */ | 211 | /* end of gnunet-service-ext.c */ |