* capplet/gpilotd-capplet-strings.c:
* capplet/gpilotd-capplet.glade:
* capplet/gpilotd-control-applet.c: (gpilotd_request_completed),
(gpilotd_userinfo_requested), (saveSettingsAndRestartDaemon),
(doTrySettings), (doSaveSettings), (doRevertSettings),
(insert_numeric_callback), (statechange_cb), (insert_syncpc_id),
(insert_username_callback), (insert_device_callback),
(activate_sync_type), (activate_speed), (cancel_sync),
(run_sync_dialog), (run_error_dialog), (run_question_dialog),
(activate_device_menu), (run_choose_dialog), (pick_pilot_device),
(get_from_pilot_cb), (send_to_pilot_cb), (pilots_selection_cb),
(clist_unselection_cb), (devices_selection_cb),
(clist_button_press), (sync_type_int_to_str), (compare_pilot_info),
(compare_device_info), (check_base_directory), (pilots_add_cb),
(pilots_edit_cb), (pilots_delete_cb), (devices_edit_cb),
(devices_add_cb), (devices_delete_cb), (createHostCfgWindow),
(setHostCfg), (readHostCfg), (build_speed_menu),
(configureDeviceDialog), (createDeviceCfgDialog), (setDeviceCfg),
(compare_device_name), (next_cradle_name), (compare_pilot_name),
(next_pilot_name), (setDeviceDialogCfg), (readDeviceDialogCfg),
(configurePilotDialog), (createPilotCfgDialog), (setPilotCfg),
(setPilotDialogCfg), (readPilotDialogCfg),
(pilot_capplet_glade_init), (pilot_capplet_setup),
(monitor_pilots), (main), (druid_gpilotd_userinfo_requested),
(druid_gpilotd_request_completed), (no_button_toggled),
(ask_to_cancel), (druid_canceled), (druid_finished),
(druid_sync_page_back), (druid_presync_page_next),
(druid_pilot2_page_next), (druid_delete_window),
(gpilotd_druid_show):
Did some regexp nicefications of the code. And added the
timeout field.
* capplet/pilot.c: (copy_device), (loadDeviceCfg),
(savePilotState):
Added the timeout field to GPilotDevice
* configure.in:
Requires pilot-link 0.9.5
* gnome-pilot.spec.in:
Add ${prefix}/lib to /etc/ld.so.conf if not there
* gpilotd/gpilot-structures.c: (gpilot_device_init):
* gpilotd/gpilot-structures.h:
* gpilotd/gpilotd.c: (pilot_connect):
Added a timeout-field to the device, which is
passed to pi_accept_to.
* macros/gnome-pilot.m4:
Improved the check for libpisock
Bonged requied pilotlink version to 0.9.5
svn path=/trunk/; revision=6258
151 lines
4.3 KiB
Plaintext
151 lines
4.3 KiB
Plaintext
dnl
|
|
dnl GNOME_PILOT_HOOK(script if found, fail)
|
|
dnl if fail = "failure", abort if gnome-pilot not found
|
|
dnl
|
|
|
|
GNOME_PILOT_CFLAGS=
|
|
GNOME_PILOT_LIBS=
|
|
PISOCK_INCLUDEDIR=
|
|
PISOCK_LIBS=
|
|
PILOT_BINS=
|
|
PILOT_LIBS=
|
|
|
|
AC_SUBST(GNOME_PILOT_CFLAGS)
|
|
AC_SUBST(GNOME_PILOT_LIBS)
|
|
AC_SUBST(PISOCK_INCLUDEDIR)
|
|
AC_SUBST(PISOCK_LIBS)
|
|
AC_SUBST(PILOT_BINS)
|
|
AC_SUBST(PILOT_LIBS)
|
|
|
|
AC_DEFUN([PILOT_LINK_HOOK],[
|
|
AC_ARG_WITH(pisock,
|
|
[ --with-pisock Specify prefix for pisock files],[
|
|
if test x$withval = xyes; then
|
|
dnl Note that an empty true branch is not valid sh syntax.
|
|
ifelse([$1], [], :, [$1])
|
|
else
|
|
PISOCK_INCLUDEDIR="-I$withval/include"
|
|
PISOCK_LIBDIR="-L$withval/lib"
|
|
PISOCK_LIBS="-lpisock"
|
|
AC_MSG_CHECKING("for existance of $withval/lib/libpisock.so")
|
|
if test -r $withval/lib/libpisock.so; then
|
|
AC_MSG_RESULT("yes")
|
|
else
|
|
AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.")
|
|
fi
|
|
AC_SUBST(PISOCK_INCLUDEDIR)
|
|
AC_SUBST(PISOCK_LIBDIR)
|
|
fi
|
|
])
|
|
|
|
if test x$PISOCK_INCLUDEDIR = x; then
|
|
AC_CHECK_HEADER(pi-version.h, [], [
|
|
AC_CHECK_HEADER(libpisock/pi-version.h, [PISOCK_INCLUDEDIR="-I/usr/include/libpisock"
|
|
piversion_include="libpisock/pi-version.h"
|
|
AC_SUBST(PISOCK_INCLUDEDIR)
|
|
], [
|
|
AC_CHECK_HEADER($prefix/include/pi-version.h, [PISOCK_INCLUDEDIR="-I$prefix/include/libpisock"
|
|
piversion_include="$prefix/include/pi-version.h"
|
|
if test x$PISOCK_LIBDIR = x; then
|
|
echo Assuming libpisock in $prefix/lib
|
|
PISOCK_LIBDIR="-L$prefix/lib"
|
|
PISOCK_LIBS="-lpisock"
|
|
AC_SUBST(PISOCK_LIBDIR)
|
|
AC_SUBST(PISOCK_LIBS)
|
|
fi ],
|
|
AC_MSG_ERROR("Unable to find pi-version.h"))
|
|
])
|
|
])
|
|
fi
|
|
|
|
AC_SUBST(PISOCK_INCLUDEDIR)
|
|
|
|
if test x$PISOCK_LIBDIR = x; then
|
|
AC_CHECK_LIB(pisock, pi_accept, [ PISOCK_LIBS=-lpisock ],
|
|
[ AC_MSG_ERROR("Unable to find libpisock. Try ftp://ryeham.ee.ryerson.ca/pub/PalmOS/.") ])
|
|
fi
|
|
|
|
AC_ARG_ENABLE(pilotlinktest,
|
|
[ --enable-pilotlinktest Test for correct version of pilot-link],
|
|
[testplversion=$enableval],
|
|
[ testplversion=yes ]
|
|
)
|
|
|
|
if test x$piversion_include = x; then
|
|
piversion_include="pi-version.h"
|
|
fi
|
|
|
|
if test x$testplversion = xyes; then
|
|
AC_MSG_CHECKING(for pilot-link version >= $1)
|
|
pl_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
|
pl_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
|
pl_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
|
CFLAGS_save="$CFLAGS"
|
|
CFLAGS="$CFLAGS $PISOCK_INCLUDEDIR"
|
|
AC_TRY_RUN(
|
|
[
|
|
#include <$piversion_include>
|
|
int main(int argc,char *argv[]) {
|
|
if (PILOT_LINK_VERSION == $pl_ve) {
|
|
if (PILOT_LINK_MAJOR == $pl_ma) {
|
|
if (PILOT_LINK_MINOR >= $pl_mi) {
|
|
exit(0);
|
|
}
|
|
} else if (PILOT_LINK_MAJOR > $pl_ma) {
|
|
exit(0);
|
|
}
|
|
} else if (PILOT_LINK_VERSION > $pl_ve) {
|
|
exit(0);
|
|
}
|
|
exit(1);
|
|
}
|
|
],
|
|
[AC_MSG_RESULT(yes)],
|
|
[AC_MSG_ERROR("pilot-link >= $1 required")],
|
|
[AC_MSG_WARN("No action taken for crosscompile")]
|
|
)
|
|
CFLAGS="$CFLAGS_save"
|
|
fi
|
|
])
|
|
|
|
AC_DEFUN([PILOT_LINK_CHECK],[
|
|
PILOT_LINK_HOOK($1,[],nofailure)
|
|
])
|
|
|
|
AC_DEFUN([GNOME_PILOT_HOOK],[
|
|
AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
|
|
AC_CACHE_CHECK([for gnome-pilot environment],gnome_cv_pilot_found,[
|
|
if test "x$GNOME_CONFIG" = "xno"; then
|
|
gnome_cv_pilot_found=no
|
|
else
|
|
# gnome-config doesn't return a useful error status,
|
|
# so we check if it outputs anything to stderr
|
|
if test "x`$GNOME_CONFIG gpilot 2>&1 > /dev/null`" = "x"; then
|
|
gnome_cv_pilot_found=yes
|
|
else
|
|
gnome_cv_pilot_found=no
|
|
fi
|
|
fi
|
|
])
|
|
AM_CONDITIONAL(HAVE_GNOME_PILOT,test x$gnome_cv_pilot_found = xyes)
|
|
if test x$gnome_cv_pilot_found = xyes; then
|
|
PILOT_LINK_CHECK($1)
|
|
GNOME_PILOT_CFLAGS=`gnome-config --cflags gpilot`
|
|
GNOME_PILOT_LIBS=`gnome-config --libs gpilot`
|
|
$2
|
|
else
|
|
if test x$3 = xfailure; then
|
|
AC_MSG_ERROR(gnome-pilot development package not installed or installation problem)
|
|
fi
|
|
fi
|
|
])
|
|
|
|
AC_DEFUN([GNOME_PILOT_CHECK],[
|
|
if test x$1 = x; then
|
|
GNOME_PILOT_HOOK(0.9.5,[],nofailure)
|
|
else
|
|
GNOME_PILOT_HOOK($1,[],nofailure)
|
|
fi
|
|
])
|
|
|