diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..f89104d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +if test -z $1; then + out=`dirname $0` +else + out="$1" +fi + +if test -e revision ; then + . revision +fi + +SVN=`which svn 2> /dev/null` + +if test -x "$SVN" ; then + + TEMPFILE=.bootstrap.tmp + LANG="EN_US" + "$SVN" info > $TEMPFILE 2>&1 + + if [ "$?" == "0" ]; then + PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2) + PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2) + fi + + rm -f $TEMPFILE +fi + +if test -z $PACKAGE_REVISION ; then + echo "Can´t detect package revision, using current date" + PACKAGE_REVISION=`date +%y%m%d` +fi + +if test -z $PACKAGE_SOURCE ; then + echo "Can´t detect package source, using default one" + PACKAGE_SOURCE="http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270" +fi + +echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision +echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision + +echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4 +echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4 + +echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE" +echo "./configure to setup" + diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100755 index 1f00e8f..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -if test -z $1; then - out=`dirname $0` -else - out="$1" -fi - -if test -e revision ; then - . revision -fi - -SVN=`which svn 2> /dev/null` - -if test -x "$SVN" ; then - - TEMPFILE=.bootstrap.tmp - LANG="EN_US" - "$SVN" info > $TEMPFILE 2>&1 - - if [ "$?" == "0" ]; then - PACKAGE_REVISION=$(cat $TEMPFILE | grep "^Revision: " | cut -d" " -f2) - PACKAGE_SOURCE=$(cat $TEMPFILE | grep "^URL: " | cut -d" " -f2) - fi - - rm -f $TEMPFILE -fi - -if test -z $PACKAGE_REVISION ; then - echo "Can´t detect package revision, using current date" - PACKAGE_REVISION=`date +%y%m%d` -fi - -if test -z $PACKAGE_SOURCE ; then - echo "Can´t detect package source, using default one" - PACKAGE_SOURCE="http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270" -fi - -echo "PACKAGE_REVISION=$PACKAGE_REVISION" > $out/revision -echo "PACKAGE_SOURCE=$PACKAGE_SOURCE" >> $out/revision - -echo "m4_define([SVN_REVISION], $PACKAGE_REVISION)" > $out/revision.m4 -echo "m4_define([SVN_URL], $PACKAGE_SOURCE)" >> $out/revision.m4 - diff --git a/configure.ac b/configure.ac index 0c0ca33..494fcfe 100644 --- a/configure.ac +++ b/configure.ac @@ -81,6 +81,7 @@ AC_SUBST(PACKAGE_SOURCE,"SVN_URL") DLL_CFLAGS="" DLL_FLAGS="-shared -Wl,-soname,\$(@F)" SOCKET_LIBS="" +LIB3270_REQUIRES="" DLLEXT=".so" OBJEXT=".o" @@ -208,7 +209,6 @@ AC_SUBST(DLLPREFIX) AC_SUBST(DLLEXT) AC_SUBST(DLL_FLAGS) AC_SUBST(DLL_CFLAGS) -AC_SUBST(SOCKET_LIBS) #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ @@ -234,6 +234,11 @@ AC_SUBST(LIBSSL_CFLAGS) #--[ Libraries ]---------------------------------------------------------------------------------------------------------------------------------------------- AC_SEARCH_LIBS( [sin], [m], AC_DEFINE(HAVE_LIBM), AC_MSG_NOTICE([libm not present.])) +AC_SUBST(SOCKET_LIBS) + +#--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- +AC_SUBST(LIB3270_REQUIRES) + #--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- AC_CONFIG_FILES([ diff --git a/lib3270.pc.in b/lib3270.pc.in index 2aaf7a3..ccbd8c9 100644 --- a/lib3270.pc.in +++ b/lib3270.pc.in @@ -7,5 +7,6 @@ Name: lib3270 Description: TN3270E Library calls used by @PACKAGE@ Version: @PACKAGE_VERSION@ Libs: -L\@libdir@ -l3270 +Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@ @SOCKET_LIBS@ Cflags: -I@includedir@ -- libgit2 0.21.2