diff options
| author | Fritz Elfert <felfert@to.com> | 2001-03-29 15:46:37 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2001-03-29 15:46:37 +0000 |
| commit | 04b269100ef9a0ea09ab6557095b18ccdf168074 (patch) | |
| tree | 28ef682cd560565b9a8b080f8c496b8721339a8f | |
| parent | 63be61f0a1e1e4ea35b2829d5d28af30f38c3e2e (diff) | |
| download | plptools-04b269100ef9a0ea09ab6557095b18ccdf168074.tar.gz plptools-04b269100ef9a0ea09ab6557095b18ccdf168074.tar.bz2 plptools-04b269100ef9a0ea09ab6557095b18ccdf168074.zip | |
Fixed debian compile bug.
Fixed link when libplp is not yet installed.
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | kde2/kioslave/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/kpsion/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/psitime.h | 12 |
6 files changed, 21 insertions, 5 deletions
@@ -3,6 +3,9 @@ @TOP@ +/* Define this, if you have sys/time.h */ +#undef HAVE_SYS_TIME_H + /* Define this, if libc provides bind_textdomain_codeset */ #undef HAVE_BIND_TEXTDOMAIN_CODESET diff --git a/configure.in b/configure.in index fe67737..8fcf601 100644 --- a/configure.in +++ b/configure.in @@ -126,6 +126,9 @@ else AC_DEFINE_UNQUOTED(DONT_UPDATE_MTAB) fi +dnl Check, if bot time.h and sys/time.h may be included +AC_HEADER_TIME + dnl Check, if compiler knows about bool AC_CHECK_BOOL @@ -133,7 +136,7 @@ dnl Type of sighandlers AC_TYPE_SIGNAL dnl checks for header files -AC_CHECK_HEADERS(sys/ioctl.h sys/errno.h sys/ttold.h stdlib.h) +AC_CHECK_HEADERS(sys/time.h sys/ioctl.h sys/errno.h sys/ttold.h stdlib.h) PLP_HELP_MSG([Debugging (developer only!):]) LIBCCMALLOC= diff --git a/kde2/kioslave/Makefile.am b/kde2/kioslave/Makefile.am index 06c3976..2614751 100644 --- a/kde2/kioslave/Makefile.am +++ b/kde2/kioslave/Makefile.am @@ -11,7 +11,7 @@ kio_plp_la_LDFLAGS = -module -avoid-version lib_LTLIBRARIES = kio_plp.la kio_plp_la_SOURCES = kio_plp.cpp -kio_plp_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KIO) +kio_plp_la_LIBADD = -L$(top_srcdir)/lib/.libs -lplp $(LIB_KIO) noinst_HEADERS = kio_plp.h diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am index f9867ec..f728be4 100644 --- a/kde2/kpsion/Makefile.am +++ b/kde2/kpsion/Makefile.am @@ -19,7 +19,7 @@ libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \ kpsionrestoredialog.cpp -libkpsion_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KFILE) +libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs -lplp $(LIB_KFILE) kpsion_SOURCES = main.cpp kpsion_LDFLAGS = $(KDE_RPATH) diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am index d2ccdfa..96e0da1 100644 --- a/kde2/plugins/Makefile.am +++ b/kde2/plugins/Makefile.am @@ -10,7 +10,7 @@ lib_LTLIBRARIES = libplpprops.la libplpprops_la_SOURCES = plpprops.cc plppropsFactory.cc pie3dpiece.cpp \ pie3dwidget.cpp -libplpprops_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KIO) $(LIB_KFILE) +libplpprops_la_LIBADD = -L$(top_srcdir)/lib/.libs -lplp $(LIB_KIO) $(LIB_KFILE) noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h services_DATA = plpprops.desktop diff --git a/lib/psitime.h b/lib/psitime.h index bf5b3cb..ef574f9 100644 --- a/lib/psitime.h +++ b/lib/psitime.h @@ -27,7 +27,17 @@ #include <config.h> #endif -#include <sys/time.h> +#if TIME_WITH_SYS_TIME +# include <sys/time.h> +# include <time.h> +#else +# if HAVE_SYS_TIME_H +# include <sys/time.h> +# else +# include <time.h> +# endif +#endif + #include <unistd.h> #include <sys/types.h> |