Download as
Browse Code »

Commit c673f9d4bb7ac39335dfa972a9aa0ed535aca522

Authored by Perry Werneck
1 parent 6465e46c
Exists in master and in 2 other branches develop, macos

Trying to fix Arch build.

Showing 2 changed files with 187 additions and 127 deletions   Show diff stats
configure.ac
  Diff comments   View file @c673f9d
... ... @@ -167,7 +167,7 @@ dnl ---------------------------------------------------------------------------
167 167  
168 168 AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product="pw3270" ])
169 169  
170   -AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
  170 +AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product, [The product name])
171 171 AC_SUBST(PRODUCT_NAME,$app_cv_product)
172 172  
173 173 AC_SUBST(PACKAGE_DESCRIPTION,"3270 C Access Library")
... ... @@ -175,8 +175,8 @@ AC_SUBST(PACKAGE_DESCRIPTION,"3270 C Access Library")
175 175 app_vrs_major=$(echo $VERSION | cut -d. -f1)
176 176 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
177 177  
178   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
179   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
  178 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major, [The library major version])
  179 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor, [The library minor version])
180 180  
181 181 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
182 182 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
... ... @@ -186,9 +186,9 @@ AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_
186 186 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
187 187 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
188 188  
189   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
190   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
191   -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$app_cv_release")
  189 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major, [The library major release])
  190 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor, [The library minor release])
  191 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$app_cv_release", [The package release])
192 192  
193 193 AC_SUBST(PACKAGE_RELEASE,"$app_cv_release")
194 194 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
... ... @@ -202,13 +202,13 @@ rpq_revision=`$date +"%Y%m%d"`
202 202 sccs_date=`$date +%Y/%m/%d`
203 203 sccs_user=$USER
204 204  
205   -AC_DEFINE_UNQUOTED(RPQ_BUILD_DATE,"$rpq_build_date")
206   -AC_DEFINE_UNQUOTED(RPQ_TIMESTAMP_VALUE,"$rpq_timestamp")
  205 +AC_DEFINE_UNQUOTED(RPQ_BUILD_DATE,"$rpq_build_date",[The RPQ build date])
  206 +AC_DEFINE_UNQUOTED(RPQ_TIMESTAMP_VALUE,"$rpq_timestamp",[The RPQ timestamp])
207 207  
208   -AC_DEFINE_UNQUOTED(SCCS_USER,"$USER")
209   -AC_DEFINE_UNQUOTED(SCCS_DATE,"$sccs_date")
  208 +AC_DEFINE_UNQUOTED(SCCS_USER,"$USER",[The build user])
  209 +AC_DEFINE_UNQUOTED(SCCS_DATE,"$sccs_date",[The build date])
210 210  
211   -AC_DEFINE_UNQUOTED(RPQ_REVISION,"$rpq_revision")
  211 +AC_DEFINE_UNQUOTED(RPQ_REVISION,"$rpq_revision",[The RPQ revision])
212 212 AC_SUBST(RPQ_REVISION,"$rpq_revision")
213 213  
214 214 dnl ---------------------------------------------------------------------------
... ... @@ -228,7 +228,7 @@ AC_PATH_TOOL([CONVERT], [convert], [no])
228 228 AC_PATH_TOOL([OPTIPNG],[optipng],[no])
229 229  
230 230 AC_CHECK_HEADER(libintl.h, [
231   - AC_DEFINE(HAVE_LIBINTL, 1, [Is libintl available])
  231 + AC_DEFINE(HAVE_LIBINTL, 1, [Libintl is available])
232 232  
233 233 case "$host" in
234 234 *-mingw32|*-pc-msys)
... ... @@ -391,7 +391,7 @@ AC_ARG_ENABLE([self-signed-cert-check],
391 391 ])
392 392  
393 393 if test "$app_cv_self_signed_certs" == "yes"; then
394   - AC_DEFINE(SSL_ENABLE_SELF_SIGNED_CERT_CHECK)
  394 + AC_DEFINE(SSL_ENABLE_SELF_SIGNED_CERT_CHECK,[],[Should we accept self signed cert?])
395 395 fi
396 396  
397 397 AC_ARG_ENABLE([ssl-crl-check],
... ... @@ -403,7 +403,7 @@ AC_ARG_ENABLE([ssl-crl-check],
403 403 ])
404 404  
405 405 if test "$app_cv_enable_crl_check" == "yes"; then
406   - AC_DEFINE(SSL_ENABLE_CRL_CHECK)
  406 + AC_DEFINE(SSL_ENABLE_CRL_CHECK,[],[Should we check the CRL?])
407 407 fi
408 408  
409 409 AC_ARG_ENABLE([crl-expiration-check],
... ... @@ -415,14 +415,14 @@ AC_ARG_ENABLE([crl-expiration-check],
415 415 ])
416 416  
417 417 if test "$app_cv_expired_crl" == "yes"; then
418   - AC_DEFINE(SSL_ENABLE_CRL_EXPIRATION_CHECK)
  418 + AC_DEFINE(SSL_ENABLE_CRL_EXPIRATION_CHECK,[],[Should we check the CRL expiration])
419 419 fi
420 420  
421 421  
422 422 AC_ARG_WITH([crl-url],
423 423 [AS_HELP_STRING([--with-crl-url], [Set a hardcoded URL for CRL download])],
424 424 [
425   - AC_DEFINE_UNQUOTED(SSL_CRL_URL,"$withval")
  425 + AC_DEFINE_UNQUOTED(SSL_CRL_URL,"$withval",[The default URL for CRL download])
426 426 ],[
427 427 AC_MSG_NOTICE(No default crl url)
428 428 ])
... ... @@ -436,7 +436,7 @@ AC_ARG_ENABLE([ssl-error-notification],
436 436 ])
437 437  
438 438 if test "$app_cv_enable_ssl_notification" == "yes"; then
439   - AC_DEFINE(SSL_ENABLE_NOTIFICATION_WHEN_FAILED)
  439 + AC_DEFINE(SSL_ENABLE_NOTIFICATION_WHEN_FAILED,[],[Should we emit a notification when ssl validation fails?])
440 440 else
441 441 AC_MSG_NOTICE(No notifications when SSL negotiation fails)
442 442 fi
... ... @@ -475,10 +475,10 @@ dnl ---------------------------------------------------------------------------
475 475  
476 476 AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
477 477  
478   -AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname)
  478 +AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname,[The protocol library name])
479 479 AC_SUBST(LIB3270_NAME,$app_cv_libname)
480 480  
481   -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"lib$app_cv_libname",[Define to the gettext package name.])
  481 +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"lib$app_cv_libname",[The gettext package name.])
482 482 AC_SUBST(GETTEXT_PACKAGE,"lib$app_cv_libname")
483 483  
484 484 dnl ---------------------------------------------------------------------------
... ... @@ -511,11 +511,11 @@ esac
511 511  
512 512 AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library version for SDK])], [ app_cv_sdkversion="$withval" ],[ app_cv_sdkversion=$VERSION ])
513 513  
514   -AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion)
  514 +AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion,[The SDK version number])
515 515 AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion)
516 516  
517 517 AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])],
518   - [ AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST,"$withval",["Define the default tn3270 host"]) ],
  518 + [ AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST,"$withval",["The default tn3270 host"]) ],
519 519 [ AC_MSG_NOTICE(No default host)])
520 520  
521 521 AC_ARG_ENABLE([static],
... ... @@ -527,7 +527,7 @@ AC_ARG_ENABLE([static],
527 527 ])
528 528  
529 529 if test "$app_cv_expired_crl" == "yes"; then
530   - AC_DEFINE(SSL_ENABLE_CRL_EXPIRATION_CHECK)
  530 + AC_DEFINE(SSL_ENABLE_CRL_EXPIRATION_CHECK,[],[Should we check the CRL expiration date?])
531 531 fi
532 532  
533 533 if test "$app_cv_static" == "yes"; then
... ... @@ -542,9 +542,9 @@ AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
542 542 AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG,,[do we have syslog.h?]))
543 543  
544 544 AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) )
545   -AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) )
546   -AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) )
547   -AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R) )
  545 +AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF, [], [Do we have vasprintf?]) )
  546 +AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R, [], [Do we have strtok_r?]) )
  547 +AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, [], [Do we have localtime_r?]) )
548 548  
549 549 AC_ARG_WITH([inet-ntop], [AS_HELP_STRING([--with-inet-ntop], [Assume that inet_nto() is available])], [ app_cv_inet_ntop="$withval" ],[ app_cv_inet_ntop="auto" ])
550 550  
... ... @@ -563,14 +563,14 @@ if test "$app_cv_inet_ntop" == "auto"; then
563 563 fi
564 564  
565 565 if test "$app_cv_inet_ntop" == "yes"; then
566   - AC_DEFINE(HAVE_INET_NTOP,[],[True if inet_ntop() is available])
  566 + AC_DEFINE(HAVE_INET_NTOP,[],[Do we have inet_ntop()?])
567 567 fi
568 568  
569 569 dnl ---------------------------------------------------------------------------
570 570 dnl Check for SSL
571 571 dnl ---------------------------------------------------------------------------
572 572  
573   -PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL,[],[Is libssl available]), AC_MSG_ERROR([libssl not present.]) )
  573 +PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL,[],[Do we have libssl?]), AC_MSG_ERROR([libssl not present.]) )
574 574  
575 575 AC_SUBST(LIBSSL_LIBS)
576 576 AC_SUBST(LIBSSL_CFLAGS)
... ... @@ -646,7 +646,7 @@ AC_ARG_ENABLE([curl],
646 646  
647 647  
648 648 if test "x${have_curl}" != xno ; then
649   - PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Is the libcurl available]), AC_MSG_ERROR([libcurl not present.]) )
  649 + PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Do we have libcurl?]), AC_MSG_ERROR([libcurl not present.]) )
650 650 fi
651 651  
652 652 AC_SUBST(LIBCURL_LIBS)
... ...
src/include/config.h.in
  Diff comments   View file @c673f9d
1   -/*
2   - * Software pw3270, desenvolvido com base nos códigos fontes do C3270 e X3270
3   - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4   - * aplicativos mainframe. Registro no INPI sob o nome G3270.
5   - *
6   - * Copyright (C) <2008> <Banco do Brasil S.A.>
7   - *
8   - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
9   - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
10   - * Free Software Foundation.
11   - *
12   - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
13   - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
14   - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
15   - * obter mais detalhes.
16   - *
17   - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
18   - * programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
19   - * Place, Suite 330, Boston, MA, 02111-1307, USA
20   - *
21   - * Este programa está nomeado como config.h.in e possui - linhas de código.
22   - *
23   - * Contatos:
24   - *
25   - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26   - * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
27   - *
28   - */
29   -
30   -#ifndef LIB3270_CONFIG_INCLUDED
31   -
32   - #define LIB3270_CONFIG_INCLUDED 1
33   -
34   - /* Version info */
35   - #undef PACKAGE_NAME
36   - #undef PRODUCT_NAME
37   - #undef PACKAGE_VERSION
38   - #undef PACKAGE_RELEASE
39   - #undef LIB3270_NAME
40   - #undef GETTEXT_PACKAGE
41   -
42   - #undef RPQ_BUILD_DATE
43   - #undef RPQ_TIMESTAMP_VALUE
44   - #undef RPQ_REVISION
45   - #undef SCCS_USER
46   - #undef SCCS_DATE
47   -
48   - /* Default settings */
49   -
50   - /** @brief The lib3270's default host URL */
51   - #undef LIB3270_DEFAULT_HOST
52   -
53   - #undef LIB3270_DATADIR
54   -
55   - /** @brief the delay, in miliseconds, between the host unlocking the keyboard and lib3270 actually performing the unlock */
56   - #define UNLOCK_MS 350
57   -
58   - /* Library options */
59   - #undef HAVE_GNUC_VISIBILITY
60   - #undef HAVE_LIBINTL
61   - #undef HAVE_GETADDRINFO
62   - #undef HAVE_VASPRINTF
63   - #undef HAVE_INET_NTOP
64   - #undef HAVE_LIBCURL
65   - #undef HAVE_SYSLOG
66   -
67   - #undef HAVE_ICONV
68   - #undef ICONV_CONST
69   -
70   - /* Security options */
71   - #undef HAVE_LDAP
72   - #undef HAVE_LIBSSL
73   -
74   - #undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
75   -
76   - #undef SSL_ENABLE_CRL_CHECK
77   - #undef SSL_ENABLE_CRL_EXPIRATION_CHECK
78   - #undef SSL_ENABLE_NOTIFICATION_WHEN_FAILED
79   -
80   - /* If defined uses a hardcoded CRL path */
81   - #undef SSL_CRL_URL
82   -
83   - /* Optional parts. */
84   - #undef X3270_DBCS
85   - #undef X3270_SCRIPT
86   -
87   - #define X3270_TN3270E
88   - #define X3270_ANSI
89   - #define X3270_APL
90   -
91   - #define X3270_TRACE
92   - #define X3270_FT
93   -
94   - #undef HAVE_PRINTER
95   - #undef HAVE_MALLOC_H
96   - #undef HAVE_STRTOK_R
97   - #undef HAVE_LOCALTIME_R
98   -
99   -#endif /* LIB3270_CONFIG_INCLUDED */
  1 +/* src/include/config.h.in. Generated from configure.ac by autoheader. */
100 2  
  3 +/* The gettext package name. */
  4 +#undef GETTEXT_PACKAGE
  5 +
  6 +/* Define to 1 if you have the `getaddrinfo' function. */
  7 +#undef HAVE_GETADDRINFO
  8 +
  9 +/* supports GCC visibility attributes */
  10 +#undef HAVE_GNUC_VISIBILITY
  11 +
  12 +/* Define if you have the iconv() function and it works. */
  13 +#undef HAVE_ICONV
  14 +
  15 +/* Do we have inet_ntop()? */
  16 +#undef HAVE_INET_NTOP
  17 +
  18 +/* Define to 1 if you have the <inttypes.h> header file. */
  19 +#undef HAVE_INTTYPES_H
  20 +
  21 +/* LDAP is available */
  22 +#undef HAVE_LDAP
  23 +
  24 +/* Define to 1 if you have the <ldap.h> header file. */
  25 +#undef HAVE_LDAP_H
  26 +
  27 +/* Do we have libcurl? */
  28 +#undef HAVE_LIBCURL
  29 +
  30 +/* Libintl is available */
  31 +#undef HAVE_LIBINTL
  32 +
  33 +/* Do we have libssl? */
  34 +#undef HAVE_LIBSSL
  35 +
  36 +/* Do we have localtime_r? */
  37 +#undef HAVE_LOCALTIME_R
  38 +
  39 +/* do we have malloc.h? */
  40 +#undef HAVE_MALLOC_H
  41 +
  42 +/* Define to 1 if you have the <memory.h> header file. */
  43 +#undef HAVE_MEMORY_H
  44 +
  45 +/* Define to 1 if you have the <stdint.h> header file. */
  46 +#undef HAVE_STDINT_H
  47 +
  48 +/* Define to 1 if you have the <stdlib.h> header file. */
  49 +#undef HAVE_STDLIB_H
  50 +
  51 +/* Define to 1 if you have the <strings.h> header file. */
  52 +#undef HAVE_STRINGS_H
  53 +
  54 +/* Define to 1 if you have the <string.h> header file. */
  55 +#undef HAVE_STRING_H
  56 +
  57 +/* Do we have strtok_r? */
  58 +#undef HAVE_STRTOK_R
  59 +
  60 +/* do we have syslog.h? */
  61 +#undef HAVE_SYSLOG
  62 +
  63 +/* Define to 1 if you have the <sys/stat.h> header file. */
  64 +#undef HAVE_SYS_STAT_H
  65 +
  66 +/* Define to 1 if you have the <sys/types.h> header file. */
  67 +#undef HAVE_SYS_TYPES_H
  68 +
  69 +/* Define to 1 if you have the <unistd.h> header file. */
  70 +#undef HAVE_UNISTD_H
  71 +
  72 +/* Do we have vasprintf? */
  73 +#undef HAVE_VASPRINTF
  74 +
  75 +/* Define as const if the declaration of iconv() needs const. */
  76 +#undef ICONV_CONST
  77 +
  78 +/* "The default tn3270 host" */
  79 +#undef LIB3270_DEFAULT_HOST
  80 +
  81 +/* The protocol library name */
  82 +#undef LIB3270_NAME
  83 +
  84 +/* The SDK version number */
  85 +#undef LIB3270_SDK_VERSION
  86 +
  87 +/* Name of package */
  88 +#undef PACKAGE
  89 +
  90 +/* Define to the address where bug reports for this package should be sent. */
  91 +#undef PACKAGE_BUGREPORT
  92 +
  93 +/* The library major release */
  94 +#undef PACKAGE_MAJOR_RELEASE
  95 +
  96 +/* The library major version */
  97 +#undef PACKAGE_MAJOR_VERSION
  98 +
  99 +/* The library minor release */
  100 +#undef PACKAGE_MINOR_RELEASE
  101 +
  102 +/* The library minor version */
  103 +#undef PACKAGE_MINOR_VERSION
  104 +
  105 +/* Define to the full name of this package. */
  106 +#undef PACKAGE_NAME
  107 +
  108 +/* The package release */
  109 +#undef PACKAGE_RELEASE
  110 +
  111 +/* Define to the full name and version of this package. */
  112 +#undef PACKAGE_STRING
  113 +
  114 +/* Define to the one symbol short name of this package. */
  115 +#undef PACKAGE_TARNAME
  116 +
  117 +/* Define to the home page for this package. */
  118 +#undef PACKAGE_URL
  119 +
  120 +/* Define to the version of this package. */
  121 +#undef PACKAGE_VERSION
  122 +
  123 +/* The product name */
  124 +#undef PRODUCT_NAME
  125 +
  126 +/* The RPQ build date */
  127 +#undef RPQ_BUILD_DATE
  128 +
  129 +/* The RPQ revision */
  130 +#undef RPQ_REVISION
  131 +
  132 +/* The RPQ timestamp */
  133 +#undef RPQ_TIMESTAMP_VALUE
  134 +
  135 +/* The build date */
  136 +#undef SCCS_DATE
  137 +
  138 +/* The build user */
  139 +#undef SCCS_USER
  140 +
  141 +/* The default URL for CRL download */
  142 +#undef SSL_CRL_URL
  143 +
  144 +/* Should we check the CRL? */
  145 +#undef SSL_ENABLE_CRL_CHECK
  146 +
  147 +/* Should we check the CRL expiration date? */
  148 +#undef SSL_ENABLE_CRL_EXPIRATION_CHECK
  149 +
  150 +/* Should we emit a notification when ssl validation fails? */
  151 +#undef SSL_ENABLE_NOTIFICATION_WHEN_FAILED
  152 +
  153 +/* Should we accept self signed cert? */
  154 +#undef SSL_ENABLE_SELF_SIGNED_CERT_CHECK
  155 +
  156 +/* Define to 1 if you have the ANSI C header files. */
  157 +#undef STDC_HEADERS
  158 +
  159 +/* Version number of package */
  160 +#undef VERSION
... ...