Download as
Browse Code »

Commit 7f11a0a33560980a1ad8842d8e24890745fbf55d

Authored by perry.werneck@gmail.com
1 parent aaa5d908
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Pequenos ajustes

Showing 4 changed files with 54 additions and 45 deletions   Show diff stats
autogen.sh 0 → 100755
  Diff comments   View file @7f11a0a
... ... @@ -0,0 +1,47 @@
  1 +#!/bin/bash
  2 +
  3 +if test -z $1; then
  4 + out=`dirname $0`
  5 +else
  6 + out="$1"
  7 +fi
  8 +
  9 +if test -e revision ; then
  10 + . revision
  11 +fi
  12 +
  13 +SVN=`which svn 2> /dev/null`
  14 +
  15 +if test -x "$SVN" ; then
  16 +
  17 + TEMPFILE=.bootstrap.tmp
  18 + LANG="EN_US"
  19 + "$SVN" info > $TEMPFILE 2>&1
  20 +
  21 + if [ "$?" == "0" ]; then
  22 + PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
  23 + PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
  24 + fi
  25 +
  26 + rm -f $TEMPFILE
  27 +fi
  28 +
  29 +if test -z $PACKAGE_REVISION ; then
  30 + echo "Can´t detect package revision, using current date"
  31 + PACKAGE_REVISION=`date +%y%m%d`
  32 +fi
  33 +
  34 +if test -z $PACKAGE_SOURCE ; then
  35 + echo "Can´t detect package source, using default one"
  36 + PACKAGE_SOURCE="http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270"
  37 +fi
  38 +
  39 +echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision
  40 +echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision
  41 +
  42 +echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4
  43 +echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4
  44 +
  45 +echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE"
  46 +echo "./configure to setup"
  47 +
... ...
bootstrap.sh
View file @aaa5d90
... ... @@ -1,44 +0,0 @@
1   -#!/bin/bash
2   -
3   -if test -z $1; then
4   - out=`dirname $0`
5   -else
6   - out="$1"
7   -fi
8   -
9   -if test -e revision ; then
10   - . revision
11   -fi
12   -
13   -SVN=`which svn 2> /dev/null`
14   -
15   -if test -x "$SVN" ; then
16   -
17   - TEMPFILE=.bootstrap.tmp
18   - LANG="EN_US"
19   - "$SVN" info > $TEMPFILE 2>&1
20   -
21   - if [ "$?" == "0" ]; then
22   - PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2)
23   - PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2)
24   - fi
25   -
26   - rm -f $TEMPFILE
27   -fi
28   -
29   -if test -z $PACKAGE_REVISION ; then
30   - echo "Can´t detect package revision, using current date"
31   - PACKAGE_REVISION=`date +%y%m%d`
32   -fi
33   -
34   -if test -z $PACKAGE_SOURCE ; then
35   - echo "Can´t detect package source, using default one"
36   - PACKAGE_SOURCE="http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270"
37   -fi
38   -
39   -echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision
40   -echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision
41   -
42   -echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4
43   -echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4
44   -
configure.ac
  Diff comments   View file @7f11a0a
... ... @@ -81,6 +81,7 @@ AC_SUBST(PACKAGE_SOURCE,"SVN_URL")
81 81 DLL_CFLAGS=""
82 82 DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
83 83 SOCKET_LIBS=""
  84 +LIB3270_REQUIRES=""
84 85  
85 86 DLLEXT=".so"
86 87 OBJEXT=".o"
... ... @@ -208,7 +209,6 @@ AC_SUBST(DLLPREFIX)
208 209 AC_SUBST(DLLEXT)
209 210 AC_SUBST(DLL_FLAGS)
210 211 AC_SUBST(DLL_CFLAGS)
211   -AC_SUBST(SOCKET_LIBS)
212 212  
213 213 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
214 214  
... ... @@ -234,6 +234,11 @@ AC_SUBST(LIBSSL_CFLAGS)
234 234 #--[ Libraries ]----------------------------------------------------------------------------------------------------------------------------------------------
235 235 AC_SEARCH_LIBS( [sin], [m], AC_DEFINE(HAVE_LIBM), AC_MSG_NOTICE([libm not present.]))
236 236  
  237 +AC_SUBST(SOCKET_LIBS)
  238 +
  239 +#--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
  240 +AC_SUBST(LIB3270_REQUIRES)
  241 +
237 242 #--[ Output files ]-------------------------------------------------------------------------------------------------------------------------------------------
238 243  
239 244 AC_CONFIG_FILES([
... ...
lib3270.pc.in
  Diff comments   View file @7f11a0a
... ... @@ -7,5 +7,6 @@ Name: lib3270
7 7 Description: TN3270E Library calls used by @PACKAGE@
8 8 Version: @PACKAGE_VERSION@
9 9 Libs: -L\@libdir@ -l3270
  10 +Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@ @SOCKET_LIBS@
10 11 Cflags: -I@includedir@
11 12  
... ...