configure.in (jpilot-1.8.2) | : | configure.in (jpilot-2_0_1) | ||
---|---|---|---|---|
dnl ############################################################################ | dnl ############################################################################ | |||
dnl Process this file with autoconf to produce a configure script. | dnl Process this file with autoconf to produce a configure script. | |||
dnl ############################################################################ | dnl ############################################################################ | |||
dnl boilerplate to initialize autoconf(AC) and automake(AM) | dnl boilerplate to initialize autoconf(AC) and automake(AM) | |||
AC_PREREQ([2.58]) | AC_PREREQ([2.58]) | |||
AC_INIT(jpilot, 1.8.2) | AC_INIT(jpilot, 2.0.1) | |||
AM_INIT_AUTOMAKE([1.8]) | AM_INIT_AUTOMAKE([1.8]) | |||
dnl use a config.h file rather than string of -DXXX args to compiler | dnl use a config.h file rather than string of -DXXX args to compiler | |||
dnl run autoheader before autoconf to create config.h.in from configure.in | dnl run autoheader before autoconf to create config.h.in from configure.in | |||
AM_CONFIG_HEADER(config.h) | AM_CONFIG_HEADER(config.h) | |||
dnl enable maintainer mode in Makefiles (make dist, distclean) | dnl enable maintainer mode in Makefiles (make dist, distclean) | |||
AM_MAINTAINER_MODE | AM_MAINTAINER_MODE | |||
dnl ############################################################################ | dnl ############################################################################ | |||
dnl Check for programs needed during configure or build | dnl Check for programs needed during configure or build | |||
skipping to change at line 190 | skipping to change at line 190 | |||
AC_DEFINE(ENABLE_STOCK_BUTTONS, 1, [ Use GTK2 stock buttons ]) | AC_DEFINE(ENABLE_STOCK_BUTTONS, 1, [ Use GTK2 stock buttons ]) | |||
AC_MSG_RESULT(stock buttons enabled by configure options) | AC_MSG_RESULT(stock buttons enabled by configure options) | |||
else | else | |||
AC_MSG_RESULT(stock buttons disabled by configure options) | AC_MSG_RESULT(stock buttons disabled by configure options) | |||
fi | fi | |||
dnl ############################################################################ | dnl ############################################################################ | |||
dnl Check for libraries needed | dnl Check for libraries needed | |||
dnl ############################################################################ | dnl ############################################################################ | |||
dnl ****************************** | dnl ****************************** | |||
dnl * GTK2 libraries | dnl * GTK3 libraries | |||
dnl ****************************** | dnl ****************************** | |||
AM_PATH_GTK_2_0(2.0.3, , | AM_PATH_GTK_3_0(3.24.12, , | |||
AC_MSG_ERROR([*** GTK >= 2.0.3 not found ***])) | AC_MSG_ERROR([*** GTK >= 3.24.12 not found ***])) | |||
dnl ****************************** | dnl ****************************** | |||
dnl * pilot-link libs | dnl * pilot-link libs | |||
dnl ****************************** | dnl ****************************** | |||
pilot_prefix="" | pilot_prefix="" | |||
AC_ARG_WITH(pilot_prefix, | AC_ARG_WITH(pilot_prefix, | |||
AC_HELP_STRING([--with-pilot-prefix=PFX],[Prefix to top level of pil ot-link files (e.g., = /usr/local if the pilot-link includes are in /usr/local/i nclude and libs are in /usr/local/lib)])) | AC_HELP_STRING([--with-pilot-prefix=PFX],[Prefix to top level of pil ot-link files (e.g., = /usr/local if the pilot-link includes are in /usr/local/i nclude and libs are in /usr/local/lib)])) | |||
if test "x$with_pilot_prefix" != "x"; then | if test "x$with_pilot_prefix" != "x"; then | |||
pilot_prefix=$with_pilot_prefix | pilot_prefix=$with_pilot_prefix | |||
skipping to change at line 235 | skipping to change at line 235 | |||
AC_MSG_RESULT(found at $pilot_incl) | AC_MSG_RESULT(found at $pilot_incl) | |||
fi | fi | |||
dnl pilot-link headers are installed. Now check for libraries | dnl pilot-link headers are installed. Now check for libraries | |||
AC_MSG_CHECKING(for pilot library files) | AC_MSG_CHECKING(for pilot library files) | |||
pilotlibs=${FORCE_PILOT_LIBS:-no} | pilotlibs=${FORCE_PILOT_LIBS:-no} | |||
PILOT_LIBS="-lpisock" | PILOT_LIBS="-lpisock" | |||
if test "$pilotlibs" = "no" ; then | if test "$pilotlibs" = "no" ; then | |||
for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \ | for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ /usr/local/lib64 \ | |||
/usr/extra/pilot/lib $pilot_prefix/lib64 /usr/lib64 ; do | /usr/extra/pilot/lib $pilot_prefix/lib64 /usr/lib64 ; do | |||
if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then | if test -r $pilot_libs/libpisock.so >/dev/null 2>&1 ; then | |||
pilotlibs=yes | pilotlibs=yes | |||
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS" | PILOT_LIBS="-L$pilot_libs $PILOT_LIBS" | |||
break | break | |||
fi | fi | |||
if test -r "$pilot_libs/libpisock.a" ; then | if test -r "$pilot_libs/libpisock.a" ; then | |||
pilotlibs=yes | pilotlibs=yes | |||
PILOT_LIBS="-L$pilot_libs $PILOT_LIBS" | PILOT_LIBS="-L$pilot_libs $PILOT_LIBS" | |||
break | break | |||
skipping to change at line 358 | skipping to change at line 358 | |||
pl_minor=`$GREP "define PILOT_LINK_MINOR" "$pilot_incl/pi-version.h" | \ | pl_minor=`$GREP "define PILOT_LINK_MINOR" "$pilot_incl/pi-version.h" | \ | |||
$CUT -d " " -f 3` | $CUT -d " " -f 3` | |||
pl_patch=`$GREP "define PILOT_LINK_PATCH" "$pilot_incl/pi-version.h" | \ | pl_patch=`$GREP "define PILOT_LINK_PATCH" "$pilot_incl/pi-version.h" | \ | |||
$CUT -d " " -f 3 | $SED -e 's/"//g'` | $CUT -d " " -f 3 | $SED -e 's/"//g'` | |||
AC_MSG_RESULT([pi-version indicates $pl_version.$pl_major.$pl_minor]) | AC_MSG_RESULT([pi-version indicates $pl_version.$pl_major.$pl_minor]) | |||
dnl *** check for pilot-link 0.12.5 and up | dnl *** check for pilot-link 0.12.5 and up | |||
if test $pl_version -eq 0 ; then | if test $pl_version -eq 0 ; then | |||
if test $pl_major -ge 12 ; then | if test $pl_major -ge 12 ; then | |||
if test $pl_minor -ge 5 ; then | if test $pl_minor -ge 0 ; then | |||
pl_version_check_done=yes; | pl_version_check_done=yes; | |||
AC_MSG_RESULT([pilot-link has USB]) | AC_MSG_RESULT([pilot-link has USB]) | |||
AC_MSG_RESULT([pilot-link has card support (>12.0)]) | AC_MSG_RESULT([pilot-link has card support (>12.0)]) | |||
AC_MSG_RESULT([pilot-link has Calendar support (>12.5)]) | AC_MSG_RESULT([pilot-link has Calendar support (>12.5)]) | |||
fi | fi | |||
fi | fi | |||
fi | fi | |||
if test $pl_version_check_done != yes; then | if test $pl_version_check_done != yes; then | |||
AC_MSG_ERROR([pilot-link version >= 0.12.5 is required]) | AC_MSG_ERROR([pilot-link version >= 0.12.5 is required]) | |||
fi | fi | |||
skipping to change at line 570 | skipping to change at line 570 | |||
AC_MSG_RESULT(Compiling with plugin support.......... $enable_plugins) | AC_MSG_RESULT(Compiling with plugin support.......... $enable_plugins) | |||
AC_MSG_RESULT(Compiling with private record support.. $enable_private) | AC_MSG_RESULT(Compiling with private record support.. $enable_private) | |||
AC_MSG_RESULT(Compiling with Datebk support.......... $enable_datebk) | AC_MSG_RESULT(Compiling with Datebk support.......... $enable_datebk) | |||
AC_MSG_RESULT(Compiling with Manana support.......... $enable_manana) | AC_MSG_RESULT(Compiling with Manana support.......... $enable_manana) | |||
AC_MSG_RESULT(Compiling with Prometheon support...... $enable_prometheon) | AC_MSG_RESULT(Compiling with Prometheon support...... $enable_prometheon) | |||
AC_MSG_RESULT(Compiling Expense plugin............... $plugin_support) | AC_MSG_RESULT(Compiling Expense plugin............... $plugin_support) | |||
AC_MSG_RESULT(Compiling SyncTime plugin.............. $plugin_support) | AC_MSG_RESULT(Compiling SyncTime plugin.............. $plugin_support) | |||
AC_MSG_RESULT(Compiling KeyRing plugin............... $keyring_plugin) | AC_MSG_RESULT(Compiling KeyRing plugin............... $keyring_plugin) | |||
AC_MSG_RESULT(Compiling dialer add-on................ $dialer) | AC_MSG_RESULT(Compiling dialer add-on................ $dialer) | |||
AC_MSG_RESULT(Cryptographic library.................. $crypto_lib) | AC_MSG_RESULT(Cryptographic library.................. $crypto_lib) | |||
AC_MSG_RESULT(GTK-2 support.......................... yes) | AC_MSG_RESULT(GTK-3 support.......................... yes) | |||
AC_MSG_RESULT(Stock buttons (icons on buttons in GUI) $enable_stock_buttons) | AC_MSG_RESULT(Stock buttons (icons on buttons in GUI) $enable_stock_buttons) | |||
AC_MSG_RESULT(NLS support (foreign languages)........ $USE_NLS) | AC_MSG_RESULT(NLS support (foreign languages)........ $USE_NLS) | |||
AC_MSG_RESULT(Compiler Options....................... $CFLAGS) | AC_MSG_RESULT(Compiler Options....................... $CFLAGS) | |||
AC_MSG_RESULT(Prefix directory....................... $prefix) | AC_MSG_RESULT(Prefix directory....................... $prefix) | |||
AC_MSG_RESULT(pilot-link headers..................... $pilot_incl) | AC_MSG_RESULT(pilot-link headers..................... $pilot_incl) | |||
AC_MSG_RESULT(USB support enabled.................... yes) | AC_MSG_RESULT(USB support enabled.................... yes) | |||
AC_MSG_RESULT(pilot-link version found............... $pl_version.$pl_major.$p l_minor$pl_patch) | AC_MSG_RESULT(pilot-link version found............... $pl_version.$pl_major.$p l_minor$pl_patch) | |||
AC_MSG_RESULT() | AC_MSG_RESULT() | |||
AC_MSG_RESULT(Now type make to compile) | AC_MSG_RESULT(Now type make to compile) | |||
AC_MSG_RESULT() | AC_MSG_RESULT() | |||
End of changes. 6 change blocks. | ||||
7 lines changed or deleted | 7 lines changed or added |