Download as
Browse Code »

Commit 8d2d0a07819689cae4d9e4be677444dd71c83321

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

Working on Arch build.

Showing 3 changed files with 60 additions and 5 deletions   Show diff stats
@@ -6,7 +6,14 @@ test -n "$srcdir" || srcdir=. @@ -6,7 +6,14 @@ test -n "$srcdir" || srcdir=.
6 olddir=`pwd` 6 olddir=`pwd`
7 cd "$srcdir" 7 cd "$srcdir"
8 8
9 -# autoreconf -vsi --force 9 +mkdir -p scripts
  10 +automake --add-missing 2> /dev/null | true
  11 +
  12 +libtoolize --force
  13 +if test $? != 0 ; then
  14 + echo "libtoolize failed."
  15 + exit -1
  16 +fi
10 17
11 aclocal 18 aclocal
12 if test $? != 0 ; then 19 if test $? != 0 ; then
@@ -14,14 +21,17 @@ if test $? != 0 ; then @@ -14,14 +21,17 @@ if test $? != 0 ; then
14 exit -1 21 exit -1
15 fi 22 fi
16 23
17 -autoconf 24 +autoheader --force
18 if test $? != 0 ; then 25 if test $? != 0 ; then
19 - echo "autoconf failed." 26 + echo "autoheader failed."
20 exit -1 27 exit -1
21 fi 28 fi
22 29
23 -mkdir -p scripts  
24 -automake --add-missing 2> /dev/null | true 30 +autoconf --force
  31 +if test $? != 0 ; then
  32 + echo "autoconf failed."
  33 + exit -1
  34 +fi
25 35
26 cd "$olddir" 36 cd "$olddir"
27 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" 37 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
@@ -39,6 +39,12 @@ AC_CONFIG_AUX_DIR([scripts]) @@ -39,6 +39,12 @@ AC_CONFIG_AUX_DIR([scripts])
39 dnl Compute the canonical host-system type 39 dnl Compute the canonical host-system type
40 AC_CANONICAL_HOST 40 AC_CANONICAL_HOST
41 41
  42 +AC_CONFIG_MACRO_DIRS([m4])
  43 +
  44 +dnl Initialize libtool.
  45 +LT_INIT
  46 +
  47 +
42 dnl Put macro definitions here (though they aren't used). 48 dnl Put macro definitions here (though they aren't used).
43 AC_CONFIG_HEADERS([src/include/config.h]) 49 AC_CONFIG_HEADERS([src/include/config.h])
44 50
@@ -152,6 +158,20 @@ fi @@ -152,6 +158,20 @@ fi
152 158
153 AC_SUBST(HOST_CC) 159 AC_SUBST(HOST_CC)
154 160
  161 +
  162 +dnl ---------------------------------------------------------------------------
  163 +dnl Compatibility definitions
  164 +dnl ---------------------------------------------------------------------------
  165 +
  166 +AC_DEFINE(UNLOCK_MS, 350, [The delay, in miliseconds, between the host unlocking the keyboard and lib3270 actually performing the unlock])
  167 +
  168 +AC_DEFINE(X3270_TN3270E,[],[X3270 compatibility])
  169 +AC_DEFINE(X3270_ANSI,[],[X3270 compatibility])
  170 +AC_DEFINE(X3270_APL,[],[X3270 compatibility])
  171 +
  172 +AC_DEFINE(X3270_TRACE,[],[X3270 compatibility])
  173 +AC_DEFINE(X3270_FT,[],[X3270 compatibility])
  174 +
155 dnl --------------------------------------------------------------------------- 175 dnl ---------------------------------------------------------------------------
156 dnl Check for other programs 176 dnl Check for other programs
157 dnl --------------------------------------------------------------------------- 177 dnl ---------------------------------------------------------------------------
src/include/config.h.in
  Diff comments   View file @8d2d0a0
@@ -3,6 +3,9 @@ @@ -3,6 +3,9 @@
3 /* The gettext package name. */ 3 /* The gettext package name. */
4 #undef GETTEXT_PACKAGE 4 #undef GETTEXT_PACKAGE
5 5
  6 +/* Define to 1 if you have the <dlfcn.h> header file. */
  7 +#undef HAVE_DLFCN_H
  8 +
6 /* Define to 1 if you have the `getaddrinfo' function. */ 9 /* Define to 1 if you have the `getaddrinfo' function. */
7 #undef HAVE_GETADDRINFO 10 #undef HAVE_GETADDRINFO
8 11
@@ -84,6 +87,9 @@ @@ -84,6 +87,9 @@
84 /* The SDK version number */ 87 /* The SDK version number */
85 #undef LIB3270_SDK_VERSION 88 #undef LIB3270_SDK_VERSION
86 89
  90 +/* Define to the sub-directory where libtool stores uninstalled libraries. */
  91 +#undef LT_OBJDIR
  92 +
87 /* Name of package */ 93 /* Name of package */
88 #undef PACKAGE 94 #undef PACKAGE
89 95
@@ -156,5 +162,24 @@ @@ -156,5 +162,24 @@
156 /* Define to 1 if you have the ANSI C header files. */ 162 /* Define to 1 if you have the ANSI C header files. */
157 #undef STDC_HEADERS 163 #undef STDC_HEADERS
158 164
  165 +/* The delay, in miliseconds, between the host unlocking the keyboard and
  166 + lib3270 actually performing the unlock */
  167 +#undef UNLOCK_MS
  168 +
159 /* Version number of package */ 169 /* Version number of package */
160 #undef VERSION 170 #undef VERSION
  171 +
  172 +/* X3270 compatibility */
  173 +#undef X3270_ANSI
  174 +
  175 +/* X3270 compatibility */
  176 +#undef X3270_APL
  177 +
  178 +/* X3270 compatibility */
  179 +#undef X3270_FT
  180 +
  181 +/* X3270 compatibility */
  182 +#undef X3270_TN3270E
  183 +
  184 +/* X3270 compatibility */
  185 +#undef X3270_TRACE