Did some regexp nicefications of the code. And added the timeout field.

	* 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

1 files changed, 16 insertions, 3 deletions

diff --git a/macros/gnome-pilot.m4 b/macros/gnome-pilot.m4
index b4e176a46c..0622fd41fe 100644
--- a/macros/gnome-pilot.m4
+++ b/macros/gnome-pilot.m4
@@ -41,8 +41,21 @@ AC_DEFUN([PILOT_LINK_HOOK],[
 	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_MSG_ERROR("Unable to find pi-version.h")) ])
+	                                             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)
@@ -129,7 +142,7 @@ AC_DEFUN([GNOME_PILOT_HOOK],[
 
 AC_DEFUN([GNOME_PILOT_CHECK],[
 	if test x$1 = x; then
-		GNOME_PILOT_HOOK(0.9.3,[],nofailure)
+		GNOME_PILOT_HOOK(0.9.5,[],nofailure)
 	else
 		GNOME_PILOT_HOOK($1,[],nofailure)
 	fi