From 69c7a6c8660a875d13a037524625e4f2d85c3957 Mon Sep 17 00:00:00 2001 From: Fritz Elfert Date: Tue, 16 Jul 2002 23:27:08 +0000 Subject: - More gettext tweaks, moved .in.in files indo conf subdir --- Makefile.am.in | 54 -------- Makefile.cvs | 8 +- conf/Makefile.am.in | 54 ++++++++ conf/configure.in.in | 360 +++++++++++++++++++++++++++++++++++++++++++++++++++ conf/intlclean | 3 +- configure.in.in | 360 --------------------------------------------------- po/de.po | 19 +-- po/sv.po | 2 +- 8 files changed, 432 insertions(+), 428 deletions(-) delete mode 100644 Makefile.am.in create mode 100644 conf/Makefile.am.in create mode 100644 conf/configure.in.in delete mode 100644 configure.in.in diff --git a/Makefile.am.in b/Makefile.am.in deleted file mode 100644 index 64e6cb0..0000000 --- a/Makefile.am.in +++ /dev/null @@ -1,54 +0,0 @@ -# $Id$ -# - -if BUILD_KDE -KDESUB = kde2 -else -KDESUB = -endif - -SUBDIRS = intl po lib ncpd plpnfsd plpftp plpbackup plpprint sisinstall \ - $(KDESUB) doc . - -EXTRA_DIST = CHANGES COPYING README TODO INSTALL ABOUT-NLS include/*.h* \ - etc/*magic etc/*.in etc/*.c etc/psidump* conf/m4/kde/*.m4 \ - conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \ - debian/* patches/* -DISTCLEANFILES = etc/psion etc/psion.SuSE etc/psion.SuSE8 -AUTOMAKE_OPTIONS = foreign - -TMPDEST= - -# -# remove all intermediate files that can be recreated using -# Makefile.cvs -# -maintainer-clean-local: - rm -f configure aclocal.m4 Makefile.in libtool \ - Makefile.am configure.in \ - conf/config.guess conf/config.sub conf/install-sh conf/ltconfig \ - conf/ltmain.sh conf/missing conf/mkinstalldirs \ - etc/*.spec ABOUT-NLS - find . -name "*~" -exec rm -f {} \; - find . -name "\.\#*" -exec rm -f {} \; - sh conf/intlclean - -install-data-local: - test "$(initdir)" != "none" && \ - install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || : - -dist-hook: - $(MAKE) TMPDEST=$(distdir)/ kdoc specfile - $(MAKE) -C $(distdir)/kde2 -f Makefile.am am_edit - test -f CVS/Root && conf/cvs2cl -W 1800 -S --no-wrap --prune \ - --gmt -f $(distdir)/ChangeLog || \ - cp -f ChangeLog $(distdir)/ChangeLog - # remove CVS from debian/ and patches/ subdirs - rm -rf $(distdir)/debian/CVS $(distdir)/patches/CVS - -kdoc: - kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h - -specfile: - sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \ - > $(TMPDEST)etc/plptools.spec diff --git a/Makefile.cvs b/Makefile.cvs index 25f60f5..85761b4 100644 --- a/Makefile.cvs +++ b/Makefile.cvs @@ -44,15 +44,15 @@ $(LIBTOOLFILES): libtoolize --force $(GETTEXT): $(GETTEXTSHIT) -ifeq ($(GV),11) - cp configure.in.in configure.in - cp Makefile.am.in Makefile.am + cp conf/configure.in.in configure.in + cp conf/Makefile.am.in Makefile.am mkdir -p intl +ifeq ($(GV),11) echo n | gettextize --force --intl --no-changelog cp po/Makevars.template po/Makevars rm -f ChangeLog *~ else - echo n | gettextize $(GP) + echo n | gettextize -f endif -test -f po/ChangeLog~ && mv -f po/ChangeLog~ po/ChangeLog diff --git a/conf/Makefile.am.in b/conf/Makefile.am.in new file mode 100644 index 0000000..64e6cb0 --- /dev/null +++ b/conf/Makefile.am.in @@ -0,0 +1,54 @@ +# $Id$ +# + +if BUILD_KDE +KDESUB = kde2 +else +KDESUB = +endif + +SUBDIRS = intl po lib ncpd plpnfsd plpftp plpbackup plpprint sisinstall \ + $(KDESUB) doc . + +EXTRA_DIST = CHANGES COPYING README TODO INSTALL ABOUT-NLS include/*.h* \ + etc/*magic etc/*.in etc/*.c etc/psidump* conf/m4/kde/*.m4 \ + conf/m4/plptools/*.m4 conf/[a-l]* conf/missing conf/mkinstalldirs \ + debian/* patches/* +DISTCLEANFILES = etc/psion etc/psion.SuSE etc/psion.SuSE8 +AUTOMAKE_OPTIONS = foreign + +TMPDEST= + +# +# remove all intermediate files that can be recreated using +# Makefile.cvs +# +maintainer-clean-local: + rm -f configure aclocal.m4 Makefile.in libtool \ + Makefile.am configure.in \ + conf/config.guess conf/config.sub conf/install-sh conf/ltconfig \ + conf/ltmain.sh conf/missing conf/mkinstalldirs \ + etc/*.spec ABOUT-NLS + find . -name "*~" -exec rm -f {} \; + find . -name "\.\#*" -exec rm -f {} \; + sh conf/intlclean + +install-data-local: + test "$(initdir)" != "none" && \ + install -m 755 etc/psion $(DESTDIR)$(initdir)/psion || : + +dist-hook: + $(MAKE) TMPDEST=$(distdir)/ kdoc specfile + $(MAKE) -C $(distdir)/kde2 -f Makefile.am am_edit + test -f CVS/Root && conf/cvs2cl -W 1800 -S --no-wrap --prune \ + --gmt -f $(distdir)/ChangeLog || \ + cp -f ChangeLog $(distdir)/ChangeLog + # remove CVS from debian/ and patches/ subdirs + rm -rf $(distdir)/debian/CVS $(distdir)/patches/CVS + +kdoc: + kdoc -d $(TMPDEST)doc/api -n libplp --strip-h-path $(TMPDEST)lib/*.h + +specfile: + sed -e "s/\@VERSION\@/$(VERSION)/" < $(TMPDEST)etc/plptools.spec.in \ + > $(TMPDEST)etc/plptools.spec diff --git a/conf/configure.in.in b/conf/configure.in.in new file mode 100644 index 0000000..a91ae5f --- /dev/null +++ b/conf/configure.in.in @@ -0,0 +1,360 @@ +AC_REVISION($Revision$)dnl revision of this configure.in script + +AC_INIT(Makefile.am) +AC_CONFIG_AUX_DIR(conf) +AC_AIX +AC_CANONICAL_SYSTEM +AM_CONFIG_HEADER(include/config.h) +AM_INIT_AUTOMAKE(plptools, 0.11) +AM_PROG_LIBTOOL +PLP_SET_LIBVERSION + +dnl Enable Maintainer stuff +AM_MAINTAINER_MODE + +dnl checks for programs +AC_PROG_MAKE_SET +PLP_CHECK_COMPILERS +AC_PROG_AWK +AC_PATH_PROG(SED,sed) + +dnl NLS support +ALL_LINGUAS="de sv" +AM_GNU_GETTEXT +dnl Additional glibc-intl checks +PLP_CHECK_INTL + +dnl This is stupid for two resaons: +dnl +dnl 1. It doesn't save and restore CFLAGS if it's _not_ Sun's cc +dnl (these have been set already in AC_CHECK_COMPILERS +dnl 2. It assumes cc installed at a fixed path which may not be true +dnl pkgadd -r can install anywhere. +dnl +dnl A correct version should check by using cc's _behavior_, not path +dnl and save and restore CFLAGS, if it's not Sun's cc. +dnl +dnl -> Commented out for now because i have gcc on Solaris, no Sun cc. +dnl If somebody complains, (s)he should send me some cc output and i +dnl can add a correct check to AC_CHECK_COMPILERS (where it belongs). +dnl Apart from that, Sun's compiler is crap anyway: It doesn't compile +dnl valid c++ code correctly. +dnl +dnl -Fritz +dnl +dnl test "$GCC" = yes && CFLAGS="-O2 -Wall" +dnl AC_PATH_PROG(CC_PATH, $CC) +dnl test "$CC_PATH" = /opt/SUNWspro/bin/cc && CFLAGS="-xO2 -v" + +dnl checking for aix +AC_MSG_CHECKING(for AIX) +if test "`uname -s 2>/dev/null`" = AIX ; then + AC_MSG_RESULT(yes) + AC_CHECK_LIB(bsd, hostname) + EXTRA_OBJS=mount_aix.o +else + AC_MSG_RESULT(no) +fi +AC_SUBST(EXTRA_OBJS) + +dnl checks for libraries + +dnl readline and history for plpftp +ac_enable_readline=yes +AM_CONDITIONAL(HAVE_LIBREADLINE, false) +AM_CONDITIONAL(ADD_LIBCURSES, false) +AC_ARG_ENABLE(readline, + [ --disable-readline disable libreadline support [no]], + if test "$enableval" = "no" ; then + AC_MSG_RESULT([support for libreadline disabled]) + ac_enable_readline=no + fi +) +if test "x$ac_enable_readline" = "xyes" ; then + PLP_CHECK_READLINE +fi + +ac_enable_history=yes +ac_cv_libhistory= +AC_ARG_ENABLE(history, + [ --disable-history disable libhistory support [no]], + if test "$enableval" = "no" ; then + AC_MSG_RESULT([support for libhistory disabled]) + ac_enable_history=no + fi +) +if test "x$ac_enable_history" = "xyes" ; then + AC_CHECK_LIB(history, add_history, + [ + AC_DEFINE_UNQUOTED(HAVE_LIBHISTORY,1, + [Define this, if you have libhistory]) + ac_cv_libhistory=-lhistory + ]) +fi +LIBHISTORY=${ac_cv_libhistory} +AC_SUBST(LIBHISTORY) + +ac_enable_newt=yes +ac_cv_libnewt= +AC_ARG_ENABLE(newt, + [ --disable-newt disable libnewt support [no]], + if test "$enableval" = "no" ; then + AC_MSG_RESULT([support for libnewt disabled]) + ac_enable_newt=no + fi +) +if test "x$ac_enable_newt" = "xyes" ; then + AC_CHECK_LIB(newt, newtInit, + [ + AC_DEFINE_UNQUOTED(HAVE_LIBNEWT,1, + [Define this, if you have libnewt]) + ac_cv_libnewt=-lnewt + ]) +fi +LIBNEWT=${ac_cv_libnewt} +AC_SUBST(LIBNEWT) + +dnl these three are for solaris +AC_CHECK_LIB(socket, socket) +AC_CHECK_LIB(nsl, gethostbyname) +ac_save_LDFLAGS=$LDFLAGS; LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS" +AC_CHECK_LIB(rpcsoc, svcudp_create,,LDFLAGS=$ac_save_LDFLAGS) + +dnl checks for mount table - if desired +ac_enable_mnttab=yes +AC_ARG_ENABLE(mnttab, + [ --disable-mnttab disable mnttab writing [no]], + if test "$enableval" = "no" ; then + AC_MSG_RESULT([support for mnttab disabled]) + ac_enable_mnttab=no + fi +) +if test "x$ac_enable_mnttab" = "xyes" ; then + AC_MSG_CHECKING(for mount table) + PLP_FIND_FILE(/etc/mnttab /etc/mtab, MTAB) + AC_MSG_RESULT($MTAB) + if test "$MTAB" = "NO" ; then + AC_DEFINE_UNQUOTED(DONT_UPDATE_MTAB,1, + [Define this this if you want to prevent plpnfsd from updating mtab]) + else + AC_DEFINE_UNQUOTED(MTAB_PATH,"$MTAB", + [Define this to your mtab's path]) + ac_cv_mtab_tmp="${MTAB}~" + case "$target_alias" in + *linux*) + ;; + *) + ac_cv_mtab_tmp="${MTAB}.plpnfsd" + ;; + esac + AC_DEFINE_UNQUOTED(MTAB_TMP,"${ac_cv_mtab_tmp}", + [Define this to your temporary mtab's path]) + fi +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 + +dnl Type of sighandlers +AC_TYPE_SIGNAL + +dnl checks for header files +AC_CHECK_HEADERS( + sys/time.h sys/ioctl.h sys/errno.h sys/ttold.h stdlib.h \ + sys/int_types.h stdint.h +) + +PLP_HELP_MSG([Debugging (developer only!):]) +AC_CHECK_CCMALLOC + +dnl special options for customization +PLP_HELP_MSG([Options for overriding builtin defaults:]) + +AC_ARG_WITH(serial, + [ --with-serial=DEV override default serial line], + [ DDEV="$withval" + AC_MSG_RESULT(Overriding serial line: $DDEV) + ], + [ AC_MSG_CHECKING(for default serial line) + PLP_FIND_CDEV(/dev/psion /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1, DDEV) + AC_MSG_RESULT($DDEV) + test "$DDEV" = "NO" && AC_MSG_ERROR(NO serial lines. Use --with-serial.) + ] +) +AC_DEFINE_UNQUOTED(DDEV,"$DDEV",[Define this to your serial device node]) +AC_SUBST(DDEV) + +AC_ARG_WITH(speed, + [ --with-speed=SPEED override default serial speed [auto]], + [ if "$withval" = "auto" ; then + DSNAME=auto + DSPEED=-1 + else + DSPEED="$withval" + DSNAME="$withval" + fi + AC_MSG_RESULT(Overriding serial speed: $DSNAME) ], + [ DSPEED=-1 + DSNAME=auto + AC_MSG_RESULT(Using default serial speed: auto) + ] +) +AC_DEFINE_UNQUOTED(DSPEED,$DSPEED,[Define this to your serial device speed]) +AC_DEFINE_UNQUOTED(DSNAME,$DSNAME, + [Define this to your serial device speed alias]) +AC_SUBST(DSPEED) +AC_SUBST(DSNAME) + +AC_ARG_WITH(port, + [ --with-port=PORT override default port [7501]], + [ DPORT="$withval" + AC_MSG_RESULT(Overriding port: $DPORT) ], + [ DPORT=7501 + AC_MSG_RESULT(Using default port: $DPORT) + ] +) +AC_DEFINE_UNQUOTED(DPORT,$DPORT, + [Define this to the TCP port ncpd should listen on]) +AC_SUBST(DPORT) + +AC_ARG_WITH(drive, + [ --with-drive=DRIVE override default Psion drive [AUTO]], + [ DDRIVE="$withval" + AC_MSG_RESULT(Overriding drive: $DDRIVE) ], + [ DDRIVE='AUTO' + AC_MSG_RESULT(Using default Psion drive: $DDRIVE) + ] +) +AC_DEFINE_UNQUOTED(DDRIVE,"$DDRIVE", + [Define this to your default drive on your Psion]) + +AC_ARG_WITH(basedir, + [ --with-basedir=DIR override default Psion directory [\\\\]], + [ DBASEDIR="$withval" + AC_MSG_RESULT(Overriding directory: $DBASEDIR) ], + [ DBASEDIR='\\' + AC_MSG_RESULT(Using default Psion directory: $DBASEDIR) + ] +) +AC_DEFINE_UNQUOTED(DBASEDIR,"$DBASEDIR", + [Define this to your default directory on your Psion]) + +AC_ARG_WITH(mountdir, + [ --with-mountdir=DIR override default mount point [/mnt/psion]], + [ DMOUNTPOINT="$withval" + AC_MSG_RESULT(Overriding mount point: $DMOUNTPOINT) ], + [ DMOUNTPOINT="/mnt/psion" + AC_MSG_RESULT(Using default mount point: $DMOUNTPOINT) + ] +) +AC_DEFINE_UNQUOTED(DMOUNTPOINT,"$DMOUNTPOINT", + [Define this to your default mountpoint for plpnfsd]) +AC_SUBST(DMOUNTPOINT) +test "x$prefix" = xNONE && prefix="$ac_default_prefix" +eval PKGDATA="${datadir}/${PACKAGE}" +AC_DEFINE_UNQUOTED(PKGDATA,"$PKGDATA",[This defines the dir for support files]) +AC_SUBST(PKGDATA) + +AC_ARG_WITH(initdir, + [ --with-initdir=DIR override default init dir [/etc/rc.d/init.d]], + [ initdir="$withval" + AC_MSG_RESULT(Overriding initdir: $initdir) ], + [ initdir="/etc/rc.d/init.d" + AC_MSG_RESULT(Using default init dir: $initdir) + ] +) +AC_SUBST(initdir) + +dnl KDE stuff +PLP_HELP_MSG([Options for activating sub packages:]) +ac_enable_kde=no +AM_CONDITIONAL(BUILD_KDE, false) +AC_ARG_ENABLE(kde, + [ --enable-kde build KDE stuff [no]], + if test "$enableval" = "yes" ; then + AC_MSG_RESULT([Will build KDE stuff]) + ac_enable_kde=yes + fi +) +PLP_HELP_MSG([Options, only needed when building KDE stuff:]) +if test "x$ac_enable_kde" = "xyes" ; then + AC_PATH_KDE + if test -n "${kde_cv_path_kde_config}" ; then + kde_prefix=`${kde_cv_path_kde_config} --prefix` + kde_exec_prefix=`${kde_cv_path_kde_config} --prefix` + else + if test "${prefix}" != "NONE" ; then + kde_prefix=${prefix} + else + kde_prefix=$ac_default_prefix + fi + if test "${exec_prefix}" != "NONE" ; then + kde_exec_prefix=${exec_prefix} + else + kde_exec_prefix=${kde_prefix} + fi + fi + AC_ARG_WITH(kdedir, + [ --with-kdedir=DIR specify KDE directory [${prefix:-${ac_default_prefix}}]], + [ + kde_prefix=${withval} + kde_exec_prefix=${withval} + ] + ) + AC_MSG_RESULT(KDE stuff will be installed below $kde_prefix) + AC_SUBST(kde_prefix) + AC_SUBST(kde_exec_prefix) + AC_CHECK_KDEMAXPATHLEN + KDE_CHECK_FINAL + AM_KDE_WITH_NLS + KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)" + AC_SUBST(KDE_PLUGIN) + AM_CONDITIONAL(BUILD_KDE, true) +fi + +AC_OUTPUT( + Makefile + intl/Makefile + po/Makefile.in + po/Makefile + lib/Makefile + ncpd/Makefile + plpftp/Makefile + plpnfsd/Makefile + kde2/Makefile + kde2/kioslave/Makefile + kde2/plugins/Makefile + kde2/kpsion/Makefile + kde2/klipsi/Makefile + kde2/po/Makefile + kde2/po/de/Makefile + kde2/mime/Makefile + kde2/mime/icons/Makefile + kde2/doc/Makefile + kde2/doc/en/Makefile + kde2/doc/de/Makefile + kde2/doc/kioslave/Makefile + kde2/doc/kioslave/de/Makefile + kde2/doc/kioslave/en/Makefile + plpbackup/Makefile + plpprint/Makefile + plpprint/prolog.ps + sisinstall/Makefile + doc/Makefile + doc/api/Makefile + etc/psion + etc/psion.SuSE + etc/psion.SuSE8 + etc/plptools.spec + doc/ncpd.man + doc/plpnfsd.man + doc/plpftp.man + doc/sisinstall.man + doc/plpprintd.man + doc/plpbackup.man + debian/kpsion.1.in + debian/klipsi.1.in +) diff --git a/conf/intlclean b/conf/intlclean index f5a7846..6d08e9a 100644 --- a/conf/intlclean +++ b/conf/intlclean @@ -10,8 +10,9 @@ maintainer-clean: cd .. && rm -rf intl EOF -cat<m4/Makefile +test -d m4 && cat<m4/Makefile maintainer-clean: cd .. && rm -rf m4 EOF +exit 0 diff --git a/configure.in.in b/configure.in.in deleted file mode 100644 index a91ae5f..0000000 --- a/configure.in.in +++ /dev/null @@ -1,360 +0,0 @@ -AC_REVISION($Revision$)dnl revision of this configure.in script - -AC_INIT(Makefile.am) -AC_CONFIG_AUX_DIR(conf) -AC_AIX -AC_CANONICAL_SYSTEM -AM_CONFIG_HEADER(include/config.h) -AM_INIT_AUTOMAKE(plptools, 0.11) -AM_PROG_LIBTOOL -PLP_SET_LIBVERSION - -dnl Enable Maintainer stuff -AM_MAINTAINER_MODE - -dnl checks for programs -AC_PROG_MAKE_SET -PLP_CHECK_COMPILERS -AC_PROG_AWK -AC_PATH_PROG(SED,sed) - -dnl NLS support -ALL_LINGUAS="de sv" -AM_GNU_GETTEXT -dnl Additional glibc-intl checks -PLP_CHECK_INTL - -dnl This is stupid for two resaons: -dnl -dnl 1. It doesn't save and restore CFLAGS if it's _not_ Sun's cc -dnl (these have been set already in AC_CHECK_COMPILERS -dnl 2. It assumes cc installed at a fixed path which may not be true -dnl pkgadd -r can install anywhere. -dnl -dnl A correct version should check by using cc's _behavior_, not path -dnl and save and restore CFLAGS, if it's not Sun's cc. -dnl -dnl -> Commented out for now because i have gcc on Solaris, no Sun cc. -dnl If somebody complains, (s)he should send me some cc output and i -dnl can add a correct check to AC_CHECK_COMPILERS (where it belongs). -dnl Apart from that, Sun's compiler is crap anyway: It doesn't compile -dnl valid c++ code correctly. -dnl -dnl -Fritz -dnl -dnl test "$GCC" = yes && CFLAGS="-O2 -Wall" -dnl AC_PATH_PROG(CC_PATH, $CC) -dnl test "$CC_PATH" = /opt/SUNWspro/bin/cc && CFLAGS="-xO2 -v" - -dnl checking for aix -AC_MSG_CHECKING(for AIX) -if test "`uname -s 2>/dev/null`" = AIX ; then - AC_MSG_RESULT(yes) - AC_CHECK_LIB(bsd, hostname) - EXTRA_OBJS=mount_aix.o -else - AC_MSG_RESULT(no) -fi -AC_SUBST(EXTRA_OBJS) - -dnl checks for libraries - -dnl readline and history for plpftp -ac_enable_readline=yes -AM_CONDITIONAL(HAVE_LIBREADLINE, false) -AM_CONDITIONAL(ADD_LIBCURSES, false) -AC_ARG_ENABLE(readline, - [ --disable-readline disable libreadline support [no]], - if test "$enableval" = "no" ; then - AC_MSG_RESULT([support for libreadline disabled]) - ac_enable_readline=no - fi -) -if test "x$ac_enable_readline" = "xyes" ; then - PLP_CHECK_READLINE -fi - -ac_enable_history=yes -ac_cv_libhistory= -AC_ARG_ENABLE(history, - [ --disable-history disable libhistory support [no]], - if test "$enableval" = "no" ; then - AC_MSG_RESULT([support for libhistory disabled]) - ac_enable_history=no - fi -) -if test "x$ac_enable_history" = "xyes" ; then - AC_CHECK_LIB(history, add_history, - [ - AC_DEFINE_UNQUOTED(HAVE_LIBHISTORY,1, - [Define this, if you have libhistory]) - ac_cv_libhistory=-lhistory - ]) -fi -LIBHISTORY=${ac_cv_libhistory} -AC_SUBST(LIBHISTORY) - -ac_enable_newt=yes -ac_cv_libnewt= -AC_ARG_ENABLE(newt, - [ --disable-newt disable libnewt support [no]], - if test "$enableval" = "no" ; then - AC_MSG_RESULT([support for libnewt disabled]) - ac_enable_newt=no - fi -) -if test "x$ac_enable_newt" = "xyes" ; then - AC_CHECK_LIB(newt, newtInit, - [ - AC_DEFINE_UNQUOTED(HAVE_LIBNEWT,1, - [Define this, if you have libnewt]) - ac_cv_libnewt=-lnewt - ]) -fi -LIBNEWT=${ac_cv_libnewt} -AC_SUBST(LIBNEWT) - -dnl these three are for solaris -AC_CHECK_LIB(socket, socket) -AC_CHECK_LIB(nsl, gethostbyname) -ac_save_LDFLAGS=$LDFLAGS; LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS" -AC_CHECK_LIB(rpcsoc, svcudp_create,,LDFLAGS=$ac_save_LDFLAGS) - -dnl checks for mount table - if desired -ac_enable_mnttab=yes -AC_ARG_ENABLE(mnttab, - [ --disable-mnttab disable mnttab writing [no]], - if test "$enableval" = "no" ; then - AC_MSG_RESULT([support for mnttab disabled]) - ac_enable_mnttab=no - fi -) -if test "x$ac_enable_mnttab" = "xyes" ; then - AC_MSG_CHECKING(for mount table) - PLP_FIND_FILE(/etc/mnttab /etc/mtab, MTAB) - AC_MSG_RESULT($MTAB) - if test "$MTAB" = "NO" ; then - AC_DEFINE_UNQUOTED(DONT_UPDATE_MTAB,1, - [Define this this if you want to prevent plpnfsd from updating mtab]) - else - AC_DEFINE_UNQUOTED(MTAB_PATH,"$MTAB", - [Define this to your mtab's path]) - ac_cv_mtab_tmp="${MTAB}~" - case "$target_alias" in - *linux*) - ;; - *) - ac_cv_mtab_tmp="${MTAB}.plpnfsd" - ;; - esac - AC_DEFINE_UNQUOTED(MTAB_TMP,"${ac_cv_mtab_tmp}", - [Define this to your temporary mtab's path]) - fi -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 - -dnl Type of sighandlers -AC_TYPE_SIGNAL - -dnl checks for header files -AC_CHECK_HEADERS( - sys/time.h sys/ioctl.h sys/errno.h sys/ttold.h stdlib.h \ - sys/int_types.h stdint.h -) - -PLP_HELP_MSG([Debugging (developer only!):]) -AC_CHECK_CCMALLOC - -dnl special options for customization -PLP_HELP_MSG([Options for overriding builtin defaults:]) - -AC_ARG_WITH(serial, - [ --with-serial=DEV override default serial line], - [ DDEV="$withval" - AC_MSG_RESULT(Overriding serial line: $DDEV) - ], - [ AC_MSG_CHECKING(for default serial line) - PLP_FIND_CDEV(/dev/psion /dev/tty0p0 /dev/tty00 /dev/ttyS0 /dev/term/a /dev/ttyfa /dev/ttya /dev/tty0 /dev/ttyf1 /dev/cuaa1, DDEV) - AC_MSG_RESULT($DDEV) - test "$DDEV" = "NO" && AC_MSG_ERROR(NO serial lines. Use --with-serial.) - ] -) -AC_DEFINE_UNQUOTED(DDEV,"$DDEV",[Define this to your serial device node]) -AC_SUBST(DDEV) - -AC_ARG_WITH(speed, - [ --with-speed=SPEED override default serial speed [auto]], - [ if "$withval" = "auto" ; then - DSNAME=auto - DSPEED=-1 - else - DSPEED="$withval" - DSNAME="$withval" - fi - AC_MSG_RESULT(Overriding serial speed: $DSNAME) ], - [ DSPEED=-1 - DSNAME=auto - AC_MSG_RESULT(Using default serial speed: auto) - ] -) -AC_DEFINE_UNQUOTED(DSPEED,$DSPEED,[Define this to your serial device speed]) -AC_DEFINE_UNQUOTED(DSNAME,$DSNAME, - [Define this to your serial device speed alias]) -AC_SUBST(DSPEED) -AC_SUBST(DSNAME) - -AC_ARG_WITH(port, - [ --with-port=PORT override default port [7501]], - [ DPORT="$withval" - AC_MSG_RESULT(Overriding port: $DPORT) ], - [ DPORT=7501 - AC_MSG_RESULT(Using default port: $DPORT) - ] -) -AC_DEFINE_UNQUOTED(DPORT,$DPORT, - [Define this to the TCP port ncpd should listen on]) -AC_SUBST(DPORT) - -AC_ARG_WITH(drive, - [ --with-drive=DRIVE override default Psion drive [AUTO]], - [ DDRIVE="$withval" - AC_MSG_RESULT(Overriding drive: $DDRIVE) ], - [ DDRIVE='AUTO' - AC_MSG_RESULT(Using default Psion drive: $DDRIVE) - ] -) -AC_DEFINE_UNQUOTED(DDRIVE,"$DDRIVE", - [Define this to your default drive on your Psion]) - -AC_ARG_WITH(basedir, - [ --with-basedir=DIR override default Psion directory [\\\\]], - [ DBASEDIR="$withval" - AC_MSG_RESULT(Overriding directory: $DBASEDIR) ], - [ DBASEDIR='\\' - AC_MSG_RESULT(Using default Psion directory: $DBASEDIR) - ] -) -AC_DEFINE_UNQUOTED(DBASEDIR,"$DBASEDIR", - [Define this to your default directory on your Psion]) - -AC_ARG_WITH(mountdir, - [ --with-mountdir=DIR override default mount point [/mnt/psion]], - [ DMOUNTPOINT="$withval" - AC_MSG_RESULT(Overriding mount point: $DMOUNTPOINT) ], - [ DMOUNTPOINT="/mnt/psion" - AC_MSG_RESULT(Using default mount point: $DMOUNTPOINT) - ] -) -AC_DEFINE_UNQUOTED(DMOUNTPOINT,"$DMOUNTPOINT", - [Define this to your default mountpoint for plpnfsd]) -AC_SUBST(DMOUNTPOINT) -test "x$prefix" = xNONE && prefix="$ac_default_prefix" -eval PKGDATA="${datadir}/${PACKAGE}" -AC_DEFINE_UNQUOTED(PKGDATA,"$PKGDATA",[This defines the dir for support files]) -AC_SUBST(PKGDATA) - -AC_ARG_WITH(initdir, - [ --with-initdir=DIR override default init dir [/etc/rc.d/init.d]], - [ initdir="$withval" - AC_MSG_RESULT(Overriding initdir: $initdir) ], - [ initdir="/etc/rc.d/init.d" - AC_MSG_RESULT(Using default init dir: $initdir) - ] -) -AC_SUBST(initdir) - -dnl KDE stuff -PLP_HELP_MSG([Options for activating sub packages:]) -ac_enable_kde=no -AM_CONDITIONAL(BUILD_KDE, false) -AC_ARG_ENABLE(kde, - [ --enable-kde build KDE stuff [no]], - if test "$enableval" = "yes" ; then - AC_MSG_RESULT([Will build KDE stuff]) - ac_enable_kde=yes - fi -) -PLP_HELP_MSG([Options, only needed when building KDE stuff:]) -if test "x$ac_enable_kde" = "xyes" ; then - AC_PATH_KDE - if test -n "${kde_cv_path_kde_config}" ; then - kde_prefix=`${kde_cv_path_kde_config} --prefix` - kde_exec_prefix=`${kde_cv_path_kde_config} --prefix` - else - if test "${prefix}" != "NONE" ; then - kde_prefix=${prefix} - else - kde_prefix=$ac_default_prefix - fi - if test "${exec_prefix}" != "NONE" ; then - kde_exec_prefix=${exec_prefix} - else - kde_exec_prefix=${kde_prefix} - fi - fi - AC_ARG_WITH(kdedir, - [ --with-kdedir=DIR specify KDE directory [${prefix:-${ac_default_prefix}}]], - [ - kde_prefix=${withval} - kde_exec_prefix=${withval} - ] - ) - AC_MSG_RESULT(KDE stuff will be installed below $kde_prefix) - AC_SUBST(kde_prefix) - AC_SUBST(kde_exec_prefix) - AC_CHECK_KDEMAXPATHLEN - KDE_CHECK_FINAL - AM_KDE_WITH_NLS - KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_RPATH)" - AC_SUBST(KDE_PLUGIN) - AM_CONDITIONAL(BUILD_KDE, true) -fi - -AC_OUTPUT( - Makefile - intl/Makefile - po/Makefile.in - po/Makefile - lib/Makefile - ncpd/Makefile - plpftp/Makefile - plpnfsd/Makefile - kde2/Makefile - kde2/kioslave/Makefile - kde2/plugins/Makefile - kde2/kpsion/Makefile - kde2/klipsi/Makefile - kde2/po/Makefile - kde2/po/de/Makefile - kde2/mime/Makefile - kde2/mime/icons/Makefile - kde2/doc/Makefile - kde2/doc/en/Makefile - kde2/doc/de/Makefile - kde2/doc/kioslave/Makefile - kde2/doc/kioslave/de/Makefile - kde2/doc/kioslave/en/Makefile - plpbackup/Makefile - plpprint/Makefile - plpprint/prolog.ps - sisinstall/Makefile - doc/Makefile - doc/api/Makefile - etc/psion - etc/psion.SuSE - etc/psion.SuSE8 - etc/plptools.spec - doc/ncpd.man - doc/plpnfsd.man - doc/plpftp.man - doc/sisinstall.man - doc/plpprintd.man - doc/plpbackup.man - debian/kpsion.1.in - debian/klipsi.1.in -) diff --git a/po/de.po b/po/de.po index 8a0a43a..94d10bd 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-16 21:28+0200\n" +"POT-Creation-Date: 2002-07-17 01:06+0200\n" "PO-Revision-Date: 2002-07-16 21:39 CET\n" "Last-Translator: Fritz Elfert \n" "Language-Team: Deutsch \n" @@ -466,12 +466,12 @@ msgstr "Österreichisch" msgid "New Zealand" msgstr "Neuseeländisch" -#. FIXME: not shure about ISO code +# FIXME: not shure about ISO code #: lib/rpcs.cc:90 msgid "International French" msgstr "Internationales Französisch" -#. FIXME: not shure about ISO code +# FIXME: not shure about ISO code #: lib/rpcs.cc:91 msgid "Czech" msgstr "Tschechisch" @@ -1424,8 +1424,10 @@ msgid "Could not run external editor" msgstr "Konnte externen Editor nicht starten" #: plpbackup/plpbackup.cc:794 -msgid "Archive skipped, because it does not contain any files on selected drives" -msgstr "Archiv übersprungen, da es keine Dateien von den gewählten Lauferken enthält" +msgid "" +"Archive skipped, because it does not contain any files on selected drives" +msgstr "" +"Archiv übersprungen, da es keine Dateien von den gewählten Lauferken enthält" #: plpbackup/plpbackup.cc:838 msgid "(O)verwrite, overwrite (A)ll, (S)kip? (O/A/S) " @@ -1774,8 +1776,10 @@ msgid " Default: " msgstr " Vorgabe: " #: ncpd/main.cc:174 -msgid " Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n" -msgstr " Vorgabe: Automatisch 115.2k, 57.6k 38.4k, 19.2k\n" +msgid "" +" Default: Autocycle 115.2k, 57.6k 38.4k, 19.2k\n" +msgstr "" +" Vorgabe: Automatisch 115.2k, 57.6k 38.4k, 19.2k\n" #: ncpd/main.cc:177 msgid "" @@ -1856,4 +1860,3 @@ msgstr "ncpd Version " #: plpprint/plpprintd.cc:1016 msgid "plpprintd: could not connect to ncpd" msgstr "plpprintd: Konnte ncpd nicht kontaktieren." - diff --git a/po/sv.po b/po/sv.po index c4261fb..ee9d359 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: plptools 0.11\n" -"POT-Creation-Date: 2002-07-16 21:28+0200\n" +"POT-Creation-Date: 2002-07-17 01:06+0200\n" "PO-Revision-Date: 2002-07-11 09:10+0200\n" "Last-Translator: Daniel Brahneborg \n" "Language-Team: SWEDISH \n" -- cgit v1.2.3