Download as
Browse Code »

Commit 6465e46c3ca5263b2206f03b50ab74ab0b1beee8

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

Fixing some autoheader warnings.

Showing 2 changed files with 10 additions and 6 deletions   Show diff stats
@@ -6,6 +6,8 @@ test -n "$srcdir" || srcdir=. @@ -6,6 +6,8 @@ test -n "$srcdir" || srcdir=.
6 olddir=`pwd` 6 olddir=`pwd`
7 cd "$srcdir" 7 cd "$srcdir"
8 8
  9 +# autoreconf -vsi --force
  10 +
9 aclocal 11 aclocal
10 if test $? != 0 ; then 12 if test $? != 0 ; then
11 echo "aclocal failed." 13 echo "aclocal failed."
@@ -228,7 +228,7 @@ AC_PATH_TOOL([CONVERT], [convert], [no]) @@ -228,7 +228,7 @@ AC_PATH_TOOL([CONVERT], [convert], [no])
228 AC_PATH_TOOL([OPTIPNG],[optipng],[no]) 228 AC_PATH_TOOL([OPTIPNG],[optipng],[no])
229 229
230 AC_CHECK_HEADER(libintl.h, [ 230 AC_CHECK_HEADER(libintl.h, [
231 - AC_DEFINE(HAVE_LIBINTL, 1) 231 + AC_DEFINE(HAVE_LIBINTL, 1, [Is libintl available])
232 232
233 case "$host" in 233 case "$host" in
234 *-mingw32|*-pc-msys) 234 *-mingw32|*-pc-msys)
@@ -478,7 +478,7 @@ AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], @@ -478,7 +478,7 @@ AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])],
478 AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname) 478 AC_DEFINE_UNQUOTED(LIB3270_NAME,$app_cv_libname)
479 AC_SUBST(LIB3270_NAME,$app_cv_libname) 479 AC_SUBST(LIB3270_NAME,$app_cv_libname)
480 480
481 -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"lib$app_cv_libname") 481 +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"lib$app_cv_libname",[Define to the gettext package name.])
482 AC_SUBST(GETTEXT_PACKAGE,"lib$app_cv_libname") 482 AC_SUBST(GETTEXT_PACKAGE,"lib$app_cv_libname")
483 483
484 dnl --------------------------------------------------------------------------- 484 dnl ---------------------------------------------------------------------------
@@ -514,7 +514,9 @@ AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library @@ -514,7 +514,9 @@ AC_ARG_WITH([sdk-version], [AS_HELP_STRING([--with-sdk-version], [Setup library
514 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion) 514 AC_DEFINE(LIB3270_SDK_VERSION,$app_cv_sdkversion)
515 AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion) 515 AC_SUBST(LIB3270_SDK_VERSION,$app_cv_sdkversion)
516 516
517 -AC_ARG_WITH([default-host], [AS_HELP_STRING([--with-default-host], [Set lib3270 default host url])], [ AC_DEFINE_UNQUOTED(LIB3270_DEFAULT_HOST,"$withval") ],[ AC_MSG_NOTICE(No default host)]) 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"]) ],
  519 + [ AC_MSG_NOTICE(No default host)])
518 520
519 AC_ARG_ENABLE([static], 521 AC_ARG_ENABLE([static],
520 [AS_HELP_STRING([--enable-static], [Enable build and install the static library])], 522 [AS_HELP_STRING([--enable-static], [Enable build and install the static library])],
@@ -561,14 +563,14 @@ if test "$app_cv_inet_ntop" == "auto"; then @@ -561,14 +563,14 @@ if test "$app_cv_inet_ntop" == "auto"; then
561 fi 563 fi
562 564
563 if test "$app_cv_inet_ntop" == "yes"; then 565 if test "$app_cv_inet_ntop" == "yes"; then
564 - AC_DEFINE(HAVE_INET_NTOP) 566 + AC_DEFINE(HAVE_INET_NTOP,[],[True if inet_ntop() is available])
565 fi 567 fi
566 568
567 dnl --------------------------------------------------------------------------- 569 dnl ---------------------------------------------------------------------------
568 dnl Check for SSL 570 dnl Check for SSL
569 dnl --------------------------------------------------------------------------- 571 dnl ---------------------------------------------------------------------------
570 572
571 -PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_ERROR([libssl not present.]) ) 573 +PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL,[],[Is libssl available]), AC_MSG_ERROR([libssl not present.]) )
572 574
573 AC_SUBST(LIBSSL_LIBS) 575 AC_SUBST(LIBSSL_LIBS)
574 AC_SUBST(LIBSSL_CFLAGS) 576 AC_SUBST(LIBSSL_CFLAGS)
@@ -644,7 +646,7 @@ AC_ARG_ENABLE([curl], @@ -644,7 +646,7 @@ AC_ARG_ENABLE([curl],
644 646
645 647
646 if test "x${have_curl}" != xno ; then 648 if test "x${have_curl}" != xno ; then
647 - PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL), AC_MSG_ERROR([libcurl not present.]) ) 649 + PKG_CHECK_MODULES( [LIBCURL], [libcurl], AC_DEFINE(HAVE_LIBCURL,[],[Is the libcurl available]), AC_MSG_ERROR([libcurl not present.]) )
648 fi 650 fi
649 651
650 AC_SUBST(LIBCURL_LIBS) 652 AC_SUBST(LIBCURL_LIBS)