diff -Nurb netmrg-0.19/ABOUT-NLS netmrg-0.20/ChangeLog/ABOUT-NLS --- netmrg-0.19/ABOUT-NLS 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/ABOUT-NLS 1970-01-01 05:30:00.000000000 +0530 @@ -1,768 +0,0 @@ -Notes on the Free Translation Project -************************************* - -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that will gradually become able to speak many languages. -A few packages already provide translations for their messages. - - If you found this `ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do _not_ -need to install GNU `gettext' prior to configuring, installing or using -this package with messages translated. - - Installers will find here some useful hints. These notes also -explain how users should proceed for getting the programs to use the -available translations. They tell how people wanting to contribute and -work at translations should contact the appropriate team. - - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -Quick configuration advice -========================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -INSTALL Matters -=============== - -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. - - By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the GNU `gettext' own -library will be used. This library is wholly contained within this -package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is _not_ required. Installers may use -special options at configuration time for changing the default -behaviour. The commands: - - ./configure --with-included-gettext - ./configure --disable-nls - -will respectively bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. - - When you already have GNU `gettext' installed on your system and run -configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might be not what is desirable. You -should use the more recent version of the GNU `gettext' library. I.e. -if the file `intl/VERSION' shows that the library which comes with this -package is more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. - - Internationalized packages have usually many `po/LL.po' files, where -LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at `configure' time by using the -`--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable `LINGUAS' -may be set, prior to configuration, to limit the installed set. -`LINGUAS' should then contain a space separated list of two-letter -codes, stating which languages are allowed. - -Using This Package -================== - -As a user, if your language has been installed for this package, you -only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's -suppose that you speak German and live in Germany. At the shell -prompt, merely execute `setenv LANG de_DE' (in `csh'), -`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). -This can be done from your `.login' or `.profile' file, once and for -all. - - You might think that the country code specification is redundant. -But in fact, some languages have dialects in different countries. For -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The -country code serves to distinguish the dialects. - - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your country by running the command -`locale -a | grep '^LL''. - - Not all programs have translations for all languages. By default, an -English message is shown in place of a nonexistent translation. If you -understand other languages, you can set up a priority list of languages. -This is done through a different environment variable, called -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' -for the purpose of message handling, but you still need to have `LANG' -set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather -read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - - In the `LANGUAGE' environment variable, but not in the `LANG' -environment variable, `LL_CC' combinations can be abbreviated as `LL' -to denote the language's main dialect. For example, `de' is equivalent -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' -(Portuguese as spoken in Portugal) in this context. - -Translating Teams -================= - -For the Free Translation Project to be a success, we need interested -people who like their own language and write it well, and who are also -able to synergize with other translators speaking the same language. -Each translation team has its own mailing list. The up-to-date list of -teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. - - If you'd like to volunteer to _work_ at translating messages, you -should become a member of the translating team for your own language. -The subscribing address is _not_ the same as the list itself, it has -`-request' appended. For example, speakers of Swedish can send a -message to `sv-request@li.org', having this message body: - - subscribe - - Keep in mind that team members are expected to participate -_actively_ in translations, or at solving translational difficulties, -rather than merely lurking around. If your team does not exist yet and -you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. - - The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. - -Available Packages -================== - -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of January -2004. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a -translation percentage of at least 50%. - - Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es - +----------------------------------------------------+ - a2ps | [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | | - ap-utils | | - aspell | [] | - bash | [] [] [] [] | - batchelor | | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - bluez-pin | [] [] [] | - clisp | | - clisp | [] [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - darkstat | [] () [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] () [] [] [] [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] [] | - flex | [] [] [] [] | - fslint | | - gas | [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] [] [] [] | - gliv | | - glunarclock | [] [] | - gnubiff | [] | - gnucash | [] () [] [] | - gnucash-glossary | [] () [] | - gnupg | [] () [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] [] | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] [] | - gpsdrive | () () () | - gramadoir | [] | - grep | [] [] [] [] [] [] | - gretl | [] | - gtick | [] () | - hello | [] [] [] [] [] [] | - id-utils | [] [] | - indent | [] [] [] [] | - iso_3166 | [] [] [] [] [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] | - iso_639 | | - jpilot | [] [] [] | - jtag | | - jwhois | [] | - kbd | [] [] [] [] [] | - latrine | () | - ld | [] [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] | - libiconv | [] [] [] [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lingoteach_lessons | () () | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] | - man-db | [] () [] [] () | - minicom | [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] | - nano_1_0 | [] () [] [] [] | - opcodes | [] | - parted | [] [] [] [] [] | - ptx | [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | | - sharutils | [] [] [] [] [] [] | - silky | () | - skencil | [] () [] | - sketch | [] () [] | - soundtracker | [] [] [] | - sp | [] | - tar | [] [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] [] | - tin | () () | - tp-robot | | - tuxpaint | [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] | - xchat | [] [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs da de el en en_GB eo es - 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 - - et eu fa fi fr ga gl he hr hu id is it ja ko lg - +-------------------------------------------------+ - a2ps | [] [] [] () () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] | - aspell | [] [] | - bash | [] [] | - batchelor | [] [] | - bfd | [] | - binutils | [] [] | - bison | [] [] [] [] | - bluez-pin | [] [] [] [] [] | - clisp | | - clisp | [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] [] | - darkstat | () [] [] [] | - diffutils | [] [] [] [] [] [] [] | - e2fsprogs | | - enscript | [] [] | - error | [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] [] [] [] [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext | [] [] [] | - gettext-examples | [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gliv | () | - glunarclock | [] [] [] [] | - gnubiff | [] | - gnucash | () [] | - gnucash-glossary | [] | - gnupg | [] [] [] [] [] [] [] | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] [] [] | - gpe-clock | [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] [] | - gpe-sketchbook | [] | - gpe-su | [] | - gpe-taskmanager | [] | - gpe-timesheet | [] [] [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] | - gprof | [] [] | - gpsdrive | () () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] | - gtick | [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - indent | [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | | - iso_4217 | [] [] [] [] [] [] | - iso_639 | | - jpilot | [] () | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] | - latrine | [] | - ld | [] | - libc | [] [] [] [] [] [] | - libgpewidget | [] [] [] [] | - libiconv | [] [] [] [] [] [] [] [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] | - lingoteach_lessons | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | | - make | [] [] [] [] [] [] | - man-db | () () | - minicom | [] [] [] [] | - mysecretdiary | [] [] | - nano | [] [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] | - parted | [] [] [] | - ptx | [] [] [] [] [] [] [] | - python | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] | - sharutils | [] [] [] [] [] | - silky | () [] () () | - skencil | [] | - sketch | [] | - soundtracker | [] [] | - sp | [] () | - tar | [] [] [] [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] [] [] [] | - tin | [] () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] () [] | - vorbis-tools | [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] | - xchat | [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] [] | - +-------------------------------------------------+ - et eu fa fi fr ga gl he hr hu id is it ja ko lg - 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 - - lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru - +-----------------------------------------------------+ - a2ps | [] [] () () [] [] [] | - aegis | () () () | - ant-phone | [] [] | - anubis | [] [] [] [] [] [] | - ap-utils | [] () [] | - aspell | [] | - bash | [] [] [] | - batchelor | [] | - bfd | [] | - binutils | [] | - bison | [] [] [] [] [] | - bluez-pin | [] [] [] | - clisp | | - clisp | [] | - console-tools | [] | - coreutils | [] [] | - cpio | [] [] [] [] [] | - darkstat | [] [] [] [] | - diffutils | [] [] [] [] [] [] | - e2fsprogs | [] | - enscript | [] [] [] [] | - error | [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] | - fslint | [] [] | - gas | | - gawk | [] [] [] | - gbiff | [] [] | - gcal | | - gcc | | - gettext | [] [] [] | - gettext-examples | [] [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] | - gliv | [] [] [] | - glunarclock | [] [] [] [] | - gnubiff | [] | - gnucash | [] [] () [] | - gnucash-glossary | [] [] | - gnupg | [] | - gpe-aerial | [] [] [] [] | - gpe-beam | [] [] [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] | - gpe-conf | [] [] [] [] | - gpe-contacts | [] [] [] [] | - gpe-edit | [] [] [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] [] | - gpe-ownerinfo | [] [] [] [] | - gpe-sketchbook | [] [] [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] | - gprof | [] [] | - gpsdrive | () () [] | - gramadoir | () [] | - grep | [] [] [] [] [] | - gretl | | - gtick | [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - indent | [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] [] [] [] [] | - iso_639 | [] | - jpilot | () () | - jtag | | - jwhois | [] [] [] [] () | - kbd | [] [] [] | - latrine | [] | - ld | | - libc | [] [] [] [] | - libgpewidget | [] [] [] | - libiconv | [] [] [] [] [] | - lifelines | | - lilypond | | - lingoteach | | - lingoteach_lessons | | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] | - make | [] [] [] [] | - man-db | [] | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - ptx | [] [] [] [] [] [] [] [] | - python | | - radius | [] [] | - recode | [] [] [] [] | - rpm | [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] | - sharutils | [] [] | - silky | () | - skencil | [] [] | - sketch | [] [] | - soundtracker | | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] | - vorbis-tools | [] [] [] | - wastesedge | | - wdiff | [] [] [] [] [] | - wget | [] [] [] | - xchat | [] [] [] | - xfree86_xkb_xml | [] [] | - xpad | [] [] | - +-----------------------------------------------------+ - lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru - 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 - - sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu - +-----------------------------------------------------+ - a2ps | [] [] [] [] | 16 - aegis | | 0 - ant-phone | | 3 - anubis | [] [] | 9 - ap-utils | () | 3 - aspell | | 4 - bash | | 9 - batchelor | | 3 - bfd | [] [] | 6 - binutils | [] [] [] | 8 - bison | [] [] | 14 - bluez-pin | [] [] [] | 14 - clisp | | 0 - clisp | | 5 - console-tools | | 3 - coreutils | [] [] [] [] | 16 - cpio | [] [] | 14 - darkstat | [] [] [] () () | 12 - diffutils | [] [] [] | 23 - e2fsprogs | [] [] | 6 - enscript | [] [] | 12 - error | [] [] [] | 15 - fetchmail | [] [] | 11 - fileutils | [] [] [] [] [] | 17 - findutils | [] [] [] [] [] [] | 29 - flex | [] [] | 13 - fslint | | 3 - gas | [] | 3 - gawk | [] [] | 12 - gbiff | | 4 - gcal | [] [] | 4 - gcc | [] | 4 - gettext | [] [] [] [] [] | 16 - gettext-examples | [] [] [] [] [] | 14 - gettext-runtime | [] [] [] [] [] [] [] [] | 22 - gettext-tools | [] [] [] [] [] [] | 14 - gimp-print | [] [] | 10 - gliv | | 3 - glunarclock | [] [] [] | 13 - gnubiff | | 3 - gnucash | [] [] | 9 - gnucash-glossary | [] [] [] | 8 - gnupg | [] [] [] [] | 17 - gpe-aerial | [] | 7 - gpe-beam | [] | 8 - gpe-calendar | [] [] [] [] | 13 - gpe-clock | [] [] [] | 10 - gpe-conf | [] [] | 9 - gpe-contacts | [] [] [] | 11 - gpe-edit | [] [] [] [] [] | 12 - gpe-go | | 5 - gpe-login | [] [] [] [] [] | 13 - gpe-ownerinfo | [] [] [] [] | 13 - gpe-sketchbook | [] [] | 9 - gpe-su | [] [] [] | 10 - gpe-taskmanager | [] [] [] | 10 - gpe-timesheet | [] [] [] [] | 12 - gpe-today | [] [] [] [] [] | 13 - gpe-todo | [] [] [] [] | 12 - gphoto2 | [] [] [] | 11 - gprof | [] [] | 9 - gpsdrive | [] [] | 3 - gramadoir | [] | 5 - grep | [] [] [] [] | 26 - gretl | | 3 - gtick | | 7 - hello | [] [] [] [] [] | 34 - id-utils | [] [] | 12 - indent | [] [] [] [] | 21 - iso_3166 | [] [] [] [] [] [] [] | 27 - iso_3166_1 | [] [] [] | 16 - iso_3166_2 | | 0 - iso_3166_3 | | 2 - iso_4217 | [] [] [] [] [] [] | 24 - iso_639 | | 1 - jpilot | [] [] [] [] [] | 9 - jtag | [] | 2 - jwhois | () [] [] | 11 - kbd | [] [] | 11 - latrine | | 2 - ld | [] [] | 5 - libc | [] [] [] [] | 20 - libgpewidget | [] [] [] [] | 13 - libiconv | [] [] [] [] [] [] [] [] | 27 - lifelines | [] | 2 - lilypond | [] | 3 - lingoteach | | 2 - lingoteach_lessons | () | 0 - lynx | [] [] [] | 14 - m4 | [] [] | 15 - mailutils | | 5 - make | [] [] [] | 16 - man-db | [] | 5 - minicom | | 11 - mysecretdiary | [] [] | 10 - nano | [] [] [] [] | 17 - nano_1_0 | [] [] [] | 17 - opcodes | [] [] | 6 - parted | [] [] [] | 15 - ptx | [] [] | 22 - python | | 0 - radius | | 4 - recode | [] [] [] | 20 - rpm | [] [] | 9 - screem | [] [] | 2 - scrollkeeper | [] [] [] | 15 - sed | [] [] [] [] [] [] | 24 - sh-utils | [] [] | 14 - shared-mime-info | [] [] | 7 - sharutils | [] [] [] [] | 17 - silky | () | 3 - skencil | [] | 6 - sketch | [] | 6 - soundtracker | [] [] | 7 - sp | [] | 3 - tar | [] [] [] [] [] | 24 - texinfo | [] [] [] | 14 - textutils | [] [] [] [] | 16 - tin | | 1 - tp-robot | | 2 - tuxpaint | [] [] [] [] [] | 29 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux | [] [] | 15 - vorbis-tools | | 8 - wastesedge | | 0 - wdiff | [] [] [] | 18 - wget | [] [] [] [] [] [] [] [] | 24 - xchat | [] [] [] [] [] | 15 - xfree86_xkb_xml | [] [] [] [] [] | 11 - xpad | | 5 - +-----------------------------------------------------+ - 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu - 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 - - Some counters in the preceding matrix are higher than the number of -visible blocks let us expect. This is because a few extra PO files are -used for implementing regional variants of languages, or language -dialects. - - For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and -distributed as such by its maintainer. There might be an observable -lag between the mere existence a PO file and its wide availability in a -distribution. - - If January 2004 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. - -Using `gettext' in new packages -=============================== - -If you are writing a freely available program and want to -internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -the use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not -developed inside the GNU project. Therefore the information given above -applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. - diff -Nurb netmrg-0.19/aclocal.m4 netmrg-0.20/ChangeLog/aclocal.m4 --- netmrg-0.19/aclocal.m4 2006-02-04 06:41:27.000000000 +0530 +++ netmrg-0.20/ChangeLog/aclocal.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,870 +0,0 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 7 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 3 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) -AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 3 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir - -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -m4_include([m4/gettext.m4]) -m4_include([m4/iconv.m4]) -m4_include([m4/lib-ld.m4]) -m4_include([m4/lib-link.m4]) -m4_include([m4/lib-prefix.m4]) -m4_include([m4/nls.m4]) -m4_include([m4/po.m4]) -m4_include([m4/progtest.m4]) diff -Nurb netmrg-0.19/bin/makedist netmrg-0.20/ChangeLog/bin/makedist --- netmrg-0.19/bin/makedist 2006-02-01 00:28:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/bin/makedist 1970-01-01 05:30:00.000000000 +0530 @@ -1,33 +0,0 @@ -#!/bin/sh -# -# makedist -# -# gets the latest vcs tree and tars it up as $version -# - -progname="netmrg" -version=`cat share/doc/VERSION` -vcsver=`echo $version | sed -e 's/\./_/g'` -this="$progname-$version" -pkgdir="/tmp" - -rm -rf $pkgdir/$this/ -rm -f $pkgdir/$this.tar.* - -#svn export -q http://svn.$progname.net/branches/$progname-$vcsver $pkgdir/$this -svn export -q http://svn.$progname.net/trunk $pkgdir/$this -cd $pkgdir/$this -./bootstrap > /dev/null 2>&1 -rm -rf autom4te.cache/ -cd - - -tar -C $pkgdir -czf $pkgdir/$this.tar.gz $this -tar -C $pkgdir -cjf $pkgdir/$this.tar.bz2 $this - -cd $pkgdir -md5sum $this.tar.gz > $this.tar.gz.md5sum -md5sum $this.tar.bz2 > $this.tar.bz2.md5sum -sha1sum $this.tar.gz > $this.tar.gz.sha1sum -sha1sum $this.tar.bz2 > $this.tar.bz2.sha1sum -cd - - diff -Nurb netmrg-0.19/bin/makedocs netmrg-0.20/ChangeLog/bin/makedocs --- netmrg-0.19/bin/makedocs 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/bin/makedocs 1970-01-01 05:30:00.000000000 +0530 @@ -1,49 +0,0 @@ -#!/bin/sh -# -# makedocs -# -# makes docs and puts them in our doc dir -# and in the root dir for text files -# - - -#HTML -echo "Building HTML docs" -rm -f share/doc/html/*.html -docbook2html -d share/doc/netmrg.dsl#html -o share/doc/html share/doc/netmrg.sgml -find share/doc/html -name \*.html -exec tidy -indent -asxhtml -quiet -modify {} \; -cp share/doc/netmrg-logo-medium.png share/doc/html/ -cp share/doc/netmrg-logo-small.png share/doc/html/ -cp share/doc/netmrgdoc.css share/doc/html/ -echo - -#MAN -echo "Building MAN pages" -rm -f share/doc/man/man1/*.1 -docbook2man -d share/doc/netmrg.dsl#print -o share/doc/man share/doc/netmrg.sgml -mv share/doc/man/*.1 share/doc/man/man1 -find share/doc/man -type f -maxdepth 1 -exec rm -f {} \; -echo - -#TXT -echo "Building TXT files" -docbook2html -d share/doc/netmrg.dsl#html2txt -o share/doc/txt share/doc/netmrg.sgml -txtfiles="install.html revisions.html upgrade.html" -for i in $txtfiles ; do - links -dump -no-numbering share/doc/txt/$i | grep -v ' Link:' > share/doc/txt/$i.txt -done -rm -f share/doc/txt/*.html -mv share/doc/txt/install.html.txt share/doc/txt/INSTALL -cp share/doc/txt/INSTALL INSTALL -mv share/doc/txt/revisions.html.txt share/doc/txt/RELEASE-NOTES -cp share/doc/txt/RELEASE-NOTES RELEASE-NOTES -mv share/doc/txt/upgrade.html.txt share/doc/txt/UPGRADE -cp share/doc/txt/UPGRADE UPGRADE -echo - -#README -echo "Building README" -docbook2txt -d share/doc/netmrg.dsl#html -o share/doc/txt share/doc/netmrg.sgml -cp share/doc/txt/netmrg.txt README -echo - diff -Nurb netmrg-0.19/bin/makedoctree netmrg-0.20/ChangeLog/bin/makedoctree --- netmrg-0.19/bin/makedoctree 2005-02-28 02:07:37.000000000 +0530 +++ netmrg-0.20/ChangeLog/bin/makedoctree 1970-01-01 05:30:00.000000000 +0530 @@ -1,72 +0,0 @@ -#!/usr/bin/perl -# -# makedoctree -# -# makes a directory of all documentation versions -# - - -## libraries -use strict; - - -### variables ### -our $baseurl = 'http://svn.netmrg.net'; -our %docfiles = ( - "netmrg.sgml" => "share/doc/netmrg.sgml", - "netmrg.dsl" => "share/doc/netmrg.dsl", - "netmrgdoc.css" => "share/doc/netmrgdoc.css", - "netmrg-logo-small.png" => "share/doc/netmrg-logo-small.png", - "netmrg-logo-medium.png" => "share/doc/netmrg-logo-medium.png", -); -our $updatever = "trunk"; -my $docfolder = "/tmp"; - - - -### forward declairations ### - - -### main ### - -# accept a new version via command line -$updatever = $ARGV[0] if ($ARGV[0] && $ARGV[0] ne ""); - - -# figure out our pretty version (for directory name) -my $prettyver = $updatever; -if ($updatever eq "trunk") -{ - $prettyver = "Trunk"; -} # end if trunk -elsif ($updatever =~ /netmrg-(\d+)_(\d+\w+?)(_(\d+\w+?))?/) -{ - $prettyver =~ s/netmrg/NetMRG/; - $prettyver =~ s/_/\./g; -} # end if netmrg-(version) -else -{ - exit(1); -} # end if something else we don't recognize - - -# make sure our doc directory exists -my $docdir = "$docfolder/$prettyver"; -`rm -rf $docdir` if ( -d $docdir); -mkdir ($docdir); - - -# co each doc file -for my $shortdocfile (keys(%docfiles)) -{ - my $midurl = ($updatever eq "trunk" ? $updatever : "branches/$updatever"); - my $docfile = $docfiles{$shortdocfile}; - my $doccontents = `svn cat $baseurl/$midurl/$docfile 2> /dev/null`; - open (DOC, ">$docdir/$shortdocfile"); - print DOC $doccontents; - close (DOC); -} # end foreach file - -# run docbook2html on the file -`docbook2html -d $docdir/netmrg.dsl#html $docdir/netmrg.sgml -o $docdir`; - diff -Nurb netmrg-0.19/bin/makesvnsnap netmrg-0.20/ChangeLog/bin/makesvnsnap --- netmrg-0.19/bin/makesvnsnap 2005-02-28 00:43:37.000000000 +0530 +++ netmrg-0.20/ChangeLog/bin/makesvnsnap 1970-01-01 05:30:00.000000000 +0530 @@ -1,21 +0,0 @@ -#!/bin/sh -# -# makecvssnap -# -# gets the latest cvs tree and tars it up as $date -# - -progname="netmrg" -version=`date +'%Y.%m.%d'` -this="$progname-$version" -tmpdir="/tmp" -pkgdir="/tmp" - -rm -rf $tmpdir/$this -rm -f $this.tar.gz - -svn export -q http://svn.$progname.net/trunk $tmpdir/$this -tar -C $tmpdir -czf $pkgdir/$this.tar.gz $this - -rm -rf $tmpdir/$this - diff -Nurb netmrg-0.19/bin/rrdedit.in netmrg-0.20/ChangeLog/bin/rrdedit.in --- netmrg-0.19/bin/rrdedit.in 2004-06-05 06:02:17.000000000 +0530 +++ netmrg-0.20/ChangeLog/bin/rrdedit.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,40 +0,0 @@ -#!/bin/sh - -# Given a .rrd filename, edit it with vi and restore the .rrd after -# finished editing -# -# Written by Ian Berry, idea taken from Brady Alleman -# Re-modified for NetMRG - -prefix="@prefix@" -localstatedir="@localstatedir@" -rrdtool="@RRDTOOL@" -editor="vi" -RRD_DIR="$localstatedir/lib/netmrg/rrd" - -if [ ! -n "$1" ] -then - echo "Usage rrdedit [RRD_FILENAME]" - exit -fi - -if [ ! -f "$RRD_DIR/$1" ] -then - echo "Cannot locate file: '$RRD_DIR/$1'!" - exit -fi - -# dump it to temp -$rrdtool dump $RRD_DIR/$1 > /tmp/$1.xml - -# make a backup -cp $RRD_DIR/$1 /tmp/$1.backup - -# edit the xml -$editor /tmp/$1.xml - -rm -f $RRD_DIR/$1 - -# restore the rrd -$rrdtool restore /tmp/$1.xml $RRD_DIR/$1 - diff -Nurb netmrg-0.19/bootstrap netmrg-0.20/ChangeLog/bootstrap --- netmrg-0.19/bootstrap 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/bootstrap 1970-01-01 05:30:00.000000000 +0530 @@ -1,19 +0,0 @@ -#!/bin/sh - -set -x - -aclocal -I m4 - -autoheader - -automake --foreign --add-missing --copy \ - Makefile \ - etc/Makefile \ - m4/Makefile \ - src/Makefile \ - var/Makefile \ - var/lib/Makefile \ - var/lib/rrd/Makefile \ - www/Makefile - -autoconf diff -Nurb netmrg-0.19/config.guess netmrg-0.20/ChangeLog/config.guess --- netmrg-0.19/config.guess 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/config.guess 1970-01-01 05:30:00.000000000 +0530 @@ -1,1516 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2007-07-22' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nurb netmrg-0.19/config.rpath netmrg-0.20/ChangeLog/config.rpath --- netmrg-0.19/config.rpath 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/config.rpath 1970-01-01 05:30:00.000000000 +0530 @@ -1,548 +0,0 @@ -#! /bin/sh -# Output a system dependent set of variables, describing how to set the -# run time search path of shared libraries in an executable. -# -# Copyright 1996-2003 Free Software Foundation, Inc. -# Taken from GNU libtool, 2001 -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. -# -# The first argument passed to this file is the canonical host specification, -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -# should be set by the caller. -# -# The set of defined variables is at the end of this script. - -# Known limitations: -# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -# than 256 bytes, otherwise the compiler driver will dump core. The only -# known workaround is to choose shorter directory names for the build -# directory and/or the installation directory. - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -shrext=.so - -host="$1" -host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. - -wl= -if test "$GCC" = yes; then - wl='-Wl,' -else - case "$host_os" in - aix*) - wl='-Wl,' - ;; - mingw* | pw32* | os2*) - ;; - hpux9* | hpux10* | hpux11*) - wl='-Wl,' - ;; - irix5* | irix6* | nonstopux*) - wl='-Wl,' - ;; - newsos6) - ;; - linux*) - case $CC in - icc|ecc) - wl='-Wl,' - ;; - ccc) - wl='-Wl,' - ;; - esac - ;; - osf3* | osf4* | osf5*) - wl='-Wl,' - ;; - sco3.2v5*) - ;; - solaris*) - wl='-Wl,' - ;; - sunos4*) - wl='-Qoption ld ' - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - wl='-Wl,' - ;; - sysv4*MP*) - ;; - uts4*) - ;; - esac -fi - -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. - -hardcode_libdir_flag_spec= -hardcode_libdir_separator= -hardcode_direct=no -hardcode_minus_L=no - -case "$host_os" in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; -esac - -ld_shlibs=yes -if test "$with_gnu_ld" = yes; then - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can use - # them. - ld_shlibs=no - ;; - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - cygwin* | mingw* | pw32*) - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - netbsd*) - ;; - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - sunos4*) - hardcode_direct=yes - ;; - *) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; - esac - if test "$ld_shlibs" = yes; then - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - fi -else - case "$host_os" in - aix3*) - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - else - aix_use_runtimelinking=no - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - fi - hardcode_direct=yes - hardcode_libdir_separator=':' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - esac - fi - # Begin _LT_AC_SYS_LIBPATH_AIX. - echo 'int main () { return 0; }' > conftest.c - ${CC} ${LDFLAGS} conftest.c -o conftest - aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` - fi - if test -z "$aix_libpath"; then - aix_libpath="/usr/lib:/lib" - fi - rm -f conftest.c conftest - # End _LT_AC_SYS_LIBPATH_AIX. - if test "$aix_use_runtimelinking" = yes; then - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' - else - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - fi - fi - ;; - amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - bsdi4*) - ;; - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - libext=lib - ;; - darwin* | rhapsody*) - if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then - hardcode_direct=no - fi - ;; - dgux*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - freebsd1*) - ld_shlibs=no - ;; - freebsd2.2*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - freebsd2*) - hardcode_direct=yes - hardcode_minus_L=yes - ;; - freebsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - hpux9*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - hpux10* | hpux11*) - if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=no - ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - irix5* | irix6* | nonstopux*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - netbsd*) - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - ;; - newsos6) - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - osf3*) - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - osf4* | osf5*) - if test "$GCC" = yes; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - # Both cc and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - sco3.2v5*) - ;; - solaris*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - sunos4*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - ;; - sysv4) - case $host_vendor in - sni) - hardcode_direct=yes # is this really true??? - ;; - siemens) - hardcode_direct=no - ;; - motorola) - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - ;; - sysv4.3*) - ;; - sysv4*MP*) - if test -d /usr/nec; then - ld_shlibs=yes - fi - ;; - sysv4.2uw2*) - hardcode_direct=yes - hardcode_minus_L=no - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - ;; - sysv5*) - hardcode_libdir_flag_spec= - ;; - uts4*) - hardcode_libdir_flag_spec='-L$libdir' - ;; - *) - ld_shlibs=no - ;; - esac -fi - -# Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. -libname_spec='lib$name' -case "$host_os" in - aix3*) - ;; - aix4* | aix5*) - ;; - amigaos*) - ;; - beos*) - ;; - bsdi4*) - ;; - cygwin* | mingw* | pw32*) - shrext=.dll - ;; - darwin* | rhapsody*) - shrext=.dylib - ;; - dgux*) - ;; - freebsd1*) - ;; - freebsd*) - ;; - gnu*) - ;; - hpux9* | hpux10* | hpux11*) - case "$host_cpu" in - ia64*) - shrext=.so - ;; - hppa*64*) - shrext=.sl - ;; - *) - shrext=.sl - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case "$host_os" in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; - *) libsuff= shlibsuff= ;; - esac - ;; - esac - ;; - linux*oldld* | linux*aout* | linux*coff*) - ;; - linux*) - ;; - netbsd*) - ;; - newsos6) - ;; - nto-qnx) - ;; - openbsd*) - ;; - os2*) - libname_spec='$name' - shrext=.dll - ;; - osf3* | osf4* | osf5*) - ;; - sco3.2v5*) - ;; - solaris*) - ;; - sunos4*) - ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - ;; - sysv4*MP*) - ;; - uts4*) - ;; -esac - -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` - -sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nurb netmrg-0.19/configure netmrg-0.20/ChangeLog/configure --- netmrg-0.19/configure 2006-02-04 06:41:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/configure 1970-01-01 05:30:00.000000000 +0530 @@ -1,10240 +0,0 @@ -#! /bin/sh -# From configure.ac Revision: 1.37 . -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for NetMRG 0.19. -# -# Copyright (C) 2003 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_config_libobj_dir=. -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME='NetMRG' -PACKAGE_TARNAME='netmrg' -PACKAGE_VERSION='0.19' -PACKAGE_STRING='NetMRG 0.19' -PACKAGE_BUGREPORT='' - -ac_unique_file="src/netmrg.cpp" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RRDTOOL WWWDIR CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXXCPP EGREP LIBOBJS MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LTLIBOBJS' -ac_subst_files='' - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures NetMRG 0.19 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of NetMRG 0.19:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors - --enable-warnings Enable -Wall if using g++ - --disable-nls do not use Native Language Support - --disable-rpath do not hardcode runtime library paths - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-rrdtool=PROGRAM location of the rrdtool binary - --with-mysql-include-dir - MySQL include directory [/usr/(local/)include] - --with-mysql-lib-dir MySQL library directory [/usr/(local/)lib/mysql] - --with-snmp-include-dir SNMP include base directory [/usr/(local/)include] - --with-snmp-lib-dir SNMP library directory [/usr/(local/)lib] - --with-xml2-include-dir XML2 include directory - --with-xml2-lib-dir XML2 library directory - --with-www-dir install directory for web files - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib - --without-libintl-prefix don't search for libintl in includedir and libdir - -Some influential environment variables: - CXX C++ compiler command - CXXFLAGS C++ compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CC C compiler command - CFLAGS C compiler flags - CPP C preprocessor - CXXCPP C++ preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF -NetMRG configure 0.19 -generated by GNU Autoconf 2.59 - -Copyright (C) 2003 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by NetMRG $as_me 0.19, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -am__api_version="1.9" -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftest.file - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed - -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi - -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$AWK" && break -done - -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -all: - @echo 'ac_maketemp="$(MAKE)"' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null - -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi - - -# Define the identity of the package. - PACKAGE='netmrg' - VERSION='0.19' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - -# Some tools Automake needs. - -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} - - -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} - - -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} - - -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -install_sh=${install_sh-"$am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - STRIP=$ac_ct_STRIP -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' - - - - - - ac_config_headers="$ac_config_headers src/include/config.h" - -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -all: - @echo 'ac_maketemp="$(MAKE)"' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - - -# We wanna use C++, not that silly C language ;) -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -# -# Autoconf is dumb and doesn't expand ${prefix} for this variable -# If it does this in the future, this can probably be removed -# -if test "x$exec_prefix" = "xNONE"; then - if test "x$prefix" = "xNONE" ; then - exec_prefix="/usr/local" - else - exec_prefix="$prefix" - fi - ac_configure_args="$ac_configure_args --exec-prefix=$exec_prefix" -fi - -# -# --with configs -# - -# rrdtool - -# Check whether --with-rrdtool or --without-rrdtool was given. -if test "${with_rrdtool+set}" = set; then - withval="$with_rrdtool" - rrdtool_prog=$withval -fi; -# Extract the first word of "rrdtool", so it can be a program name with args. -set dummy rrdtool; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_RRDTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $RRDTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_RRDTOOL="$RRDTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RRDTOOL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_RRDTOOL" && ac_cv_path_RRDTOOL="$rrdtool_prog" - ;; -esac -fi -RRDTOOL=$ac_cv_path_RRDTOOL - -if test -n "$RRDTOOL"; then - echo "$as_me:$LINENO: result: $RRDTOOL" >&5 -echo "${ECHO_T}$RRDTOOL" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - -if test "x$RRDTOOL" = "x"; then - { { echo "$as_me:$LINENO: error: Couldn't find rrdtool. Please verify that it is installed." >&5 -echo "$as_me: error: Couldn't find rrdtool. Please verify that it is installed." >&2;} - { (exit 1); exit 1; }; } -fi - -# mysql - -# Check whether --with-mysql-include-dir or --without-mysql-include-dir was given. -if test "${with_mysql_include_dir+set}" = set; then - withval="$with_mysql_include_dir" - mysql_include_dir=$withval -fi; - -# Check whether --with-mysql-lib-dir or --without-mysql-lib-dir was given. -if test "${with_mysql_lib_dir+set}" = set; then - withval="$with_mysql_lib_dir" - mysql_lib_dir=$withval -fi; - -# snmp - -# Check whether --with-snmp-include-dir or --without-snmp-include-dir was given. -if test "${with_snmp_include_dir+set}" = set; then - withval="$with_snmp_include_dir" - snmp_include_dir=$withval -fi; - -# Check whether --with-snmp-lib-dir or --without-snmp-lib-dir was given. -if test "${with_snmp_lib_dir+set}" = set; then - withval="$with_snmp_lib_dir" - snmp_lib_dir=$withval -fi; - -# xml2 - -# Check whether --with-xml2-include-dir or --without-xml2-include-dir was given. -if test "${with_xml2_include_dir+set}" = set; then - withval="$with_xml2_include_dir" - xml2_include_dir=$withval -fi; - -# Check whether --with-xml2-lib-dir or --without-xml2-lib-dir was given. -if test "${with_xml2_lib_dir+set}" = set; then - withval="$with_xml2_lib_dir" - xml2_lib_dir=$withval -fi; - -# www dir -www_dir="${localstatedir}/www/${PACKAGE}" - -# Check whether --with-www-dir or --without-www-dir was given. -if test "${with_www_dir+set}" = set; then - withval="$with_www_dir" - www_dir=$withval -fi; -WWWDIR=$www_dir - - - -# -# Special hacks for certain operating systems -# - -# if host_alias is empty, ac_cv_host_alias may still have the info -if test -z "$host_alias"; then - host_alias=$ac_cv_host_alias -fi - -# Platform-specific tweaks -case $host_alias in -*solaris*) - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG_SCANF 1 -_ACEOF - - LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib" - LIBS="-lkstat $LIBS";; -*linux*) - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG_SCANF 1 -_ACEOF -;; -*freebsd*) - CPPFLAGS="$CPPFLAGS -I/usr/local/include";; -*openbsd*) - LIBS="-ldes $LIBS";; -esac - - -### Checks for programs. -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - - CXX=$ac_ct_CXX -fi - - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5 -echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5 -echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C++ compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -DEPDIR="${am__leading_dot}deps" - - ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi - - -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 -rm -f confinc confmf - -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" - -fi; -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi - - -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - - - -depcc="$CXX" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CXX_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CXX_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CXX_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= - am__fastdepCXX_FALSE='#' -else - am__fastdepCXX_TRUE='#' - am__fastdepCXX_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -depcc="$CC" am_compiler_list= - -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - case $depmode in - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - none) break ;; - esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. - if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - - -if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -echo "$as_me:$LINENO: checking whether to enable -Wall" >&5 -echo $ECHO_N "checking whether to enable -Wall... $ECHO_C" >&6 -# Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" - if test -n "$GXX"; then - echo "$as_me:$LINENO: result: adding -Wall to CPPFLAGS." >&5 -echo "${ECHO_T}adding -Wall to CPPFLAGS." >&6 - CPPFLAGS="$CPPFLAGS -Wall" - fi -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi; - - -### Checks for libraries. - - -echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char bindtextdomain (); -int -main () -{ -bindtextdomain (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_intl_bindtextdomain=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_intl_bindtextdomain=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 -if test $ac_cv_lib_intl_bindtextdomain = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBINTL 1 -_ACEOF - - LIBS="-lintl $LIBS" - -fi - - -echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF - - LIBS="-ldl $LIBS" - -fi - - -echo "$as_me:$LINENO: checking for compress in -lz" >&5 -echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6 -if test "${ac_cv_lib_z_compress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char compress (); -int -main () -{ -compress (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_z_compress=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_z_compress=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5 -echo "${ECHO_T}$ac_cv_lib_z_compress" >&6 -if test $ac_cv_lib_z_compress = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBS="-lz $LIBS" - -fi - -echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_create (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pthread_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pthread_pthread_create=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -if test $ac_cv_lib_pthread_pthread_create = yes; then - CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" - LIBS="-lpthread $LIBS" -else - echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6 -if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_r $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_create (); -int -main () -{ -pthread_create (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_r_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_c_r_pthread_create=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6 -if test $ac_cv_lib_c_r_pthread_create = yes; then - CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - LIBS="-pthread $LIBS" -else - { { echo "$as_me:$LINENO: error: POSIX threads not found." >&5 -echo "$as_me: error: POSIX threads not found." >&2;} - { (exit 1); exit 1; }; } - -fi - - -fi - - -echo "$as_me:$LINENO: checking for main in -lstdc++" >&5 -echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6 -if test "${ac_cv_lib_stdcpp_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lstdc++ $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_stdcpp_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_stdcpp_main=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_main" >&5 -echo "${ECHO_T}$ac_cv_lib_stdcpp_main" >&6 -if test $ac_cv_lib_stdcpp_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSTDC__ 1 -_ACEOF - - LIBS="-lstdc++ $LIBS" - -fi - - -## Determine XML2 library path -# try and find libs without any additional libraries -echo "$as_me:$LINENO: checking for xmlParseFile in -lxml2" >&5 -echo $ECHO_N "checking for xmlParseFile in -lxml2... $ECHO_C" >&6 -if test "${ac_cv_lib_xml2_xmlParseFile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxml2 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char xmlParseFile (); -int -main () -{ -xmlParseFile (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_xml2_xmlParseFile=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_xml2_xmlParseFile=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlParseFile" >&5 -echo "${ECHO_T}$ac_cv_lib_xml2_xmlParseFile" >&6 -if test $ac_cv_lib_xml2_xmlParseFile = yes; then - XML2_LIBS=" " -else - XML2_LIBS= - -fi - - -# hunt through several directories trying to find the libraries -if test "x$XML2_LIBS" = "x"; then - old_LDFLAGS="$LDFLAGS" - for try in $xml2_lib_dir /usr/lib /usr/local/lib ; do - LDFLAGS="$old_LDFLAGS -L$try" - unset ac_cv_lib_xml2_xmlParseFile - echo "$as_me:$LINENO: checking for xmlParseFile in -lxml2" >&5 -echo $ECHO_N "checking for xmlParseFile in -lxml2... $ECHO_C" >&6 -if test "${ac_cv_lib_xml2_xmlParseFile+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxml2 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char xmlParseFile (); -int -main () -{ -xmlParseFile (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_xml2_xmlParseFile=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_xml2_xmlParseFile=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlParseFile" >&5 -echo "${ECHO_T}$ac_cv_lib_xml2_xmlParseFile" >&6 -if test $ac_cv_lib_xml2_xmlParseFile = yes; then - XML2_LIBS="-L$try" -else - XML2_LIBS= - -fi - - if test "x$XML2_LIBS" != "x"; then - break; - fi - done - LDFLAGS="$old_LDFLAGS $XML2_LIBS" -fi - -if test "x$XML2_LIBS" = "x"; then - { { echo "$as_me:$LINENO: error: XML2 libraries not found. Use --with-xml2-lib-dir=" >&5 -echo "$as_me: error: XML2 libraries not found. Use --with-xml2-lib-dir=" >&2;} - { (exit 1); exit 1; }; } -fi -# don't forget to add xml2 to the list of libraries -LIBS="-lxml2 $LIBS" - -## Determine MySQL library path -# try and find libs without any additional libraries -echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5 -echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6 -if test "${ac_cv_lib_mysqlclient_mysql_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysqlclient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mysql_init (); -int -main () -{ -mysql_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mysqlclient_mysql_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_mysqlclient_mysql_init=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_init" >&5 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_init" >&6 -if test $ac_cv_lib_mysqlclient_mysql_init = yes; then - MYSQL_LIBS=" " -else - MYSQL_LIBS= - -fi - - -# hunt through several directories trying to find the libraries -if test "x$MYSQL_LIBS" = "x"; then - old_LDFLAGS="$LDFLAGS" - for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib /usr/local/mysql/lib /usr/local/lib/mysql /usr/sfw/lib; do - LDFLAGS="$old_LDFLAGS -L$try" - unset ac_cv_lib_mysqlclient_mysql_init - echo "$as_me:$LINENO: checking for mysql_init in -lmysqlclient" >&5 -echo $ECHO_N "checking for mysql_init in -lmysqlclient... $ECHO_C" >&6 -if test "${ac_cv_lib_mysqlclient_mysql_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysqlclient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mysql_init (); -int -main () -{ -mysql_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mysqlclient_mysql_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_mysqlclient_mysql_init=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_init" >&5 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_init" >&6 -if test $ac_cv_lib_mysqlclient_mysql_init = yes; then - MYSQL_LIBS="-L$try" -else - MYSQL_LIBS= - -fi - - if test "x$MYSQL_LIBS" != "x"; then - break; - fi - done - LDFLAGS="$old_LDFLAGS $MYSQL_LIBS" -fi - -if test "x$MYSQL_LIBS" = "x"; then - { { echo "$as_me:$LINENO: error: MySQL libraries not found. Use --with-mysql-lib-dir=" >&5 -echo "$as_me: error: MySQL libraries not found. Use --with-mysql-lib-dir=" >&2;} - { (exit 1); exit 1; }; } -fi -# don't forget to add mysqlclient to the list of libraries -LIBS="-lmysqlclient $LIBS" - -# now that we've found the libraries, check for MySQL < 4.0 - -echo "$as_me:$LINENO: checking for mysql_thread_init in -lmysqlclient" >&5 -echo $ECHO_N "checking for mysql_thread_init in -lmysqlclient... $ECHO_C" >&6 -if test "${ac_cv_lib_mysqlclient_mysql_thread_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmysqlclient $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char mysql_thread_init (); -int -main () -{ -mysql_thread_init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mysqlclient_mysql_thread_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_mysqlclient_mysql_thread_init=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_thread_init" >&5 -echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_thread_init" >&6 -if test $ac_cv_lib_mysqlclient_mysql_thread_init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMYSQLCLIENT 1 -_ACEOF - - LIBS="-lmysqlclient $LIBS" - -else - -cat >>confdefs.h <<\_ACEOF -#define OLD_MYSQL 1 -_ACEOF - -fi - - - -### Checks for header files. -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_sys_wait_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_sys_wait_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -if test $ac_cv_header_sys_wait_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_time=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - -for ac_header in \ - cstdio \ - cstdlib \ - string \ - list \ - unistd.h \ - netinet/in.h - -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## --------------------------------- ## -## Report this to the NetMRG lists. ## -## --------------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -## Determine XML2 include path -echo "$as_me:$LINENO: checking for libxml/xmlmemory.h" >&5 -echo $ECHO_N "checking for libxml/xmlmemory.h... $ECHO_C" >&6 - -# Can we include headers using system include dirs? -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int a = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - XML2_INCLUDE=" " -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -XML2_INCLUDE= - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -# hunt through several directories trying to find the includes -if test "x$XML2_INCLUDE" = "x"; then - old_CPPFLAGS="$CPPFLAGS" - for i in $xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2 ; do - CPPFLAGS="$old_CPPFLAGS -I$i" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int a = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - XML2_INCLUDE="-I$i" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -XML2_INCLUDE= - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$XML2_INCLUDE" != "x"; then - break; - fi - done - CPPFLAGS="$old_CPPFLAGS $XML2_INCLUDE" -fi - -if test "x$XML2_INCLUDE" = "x"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: XML2 headers not found. Use --with-xml2-include-dir=" >&5 -echo "$as_me: error: XML2 headers not found. Use --with-xml2-include-dir=" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -## Determine MySQL include path -echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5 -echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6 - -# Can we include headers using system include dirs? -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int a = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - MYSQL_INCLUDE=" " -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -MYSQL_INCLUDE= - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -# hunt through several directories trying to find the includes -if test "x$MYSQL_INCLUDE" = "x"; then - old_CPPFLAGS="$CPPFLAGS" - for i in $mysql_include_dir /usr/include /usr/local/include /usr/local/mysql/include /usr/local/include/mysql ; do - CPPFLAGS="$old_CPPFLAGS -I$i" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -int a = 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - MYSQL_INCLUDE="-I$i" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -MYSQL_INCLUDE= - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$MYSQL_INCLUDE" != "x"; then - break; - fi - done - CPPFLAGS="$old_CPPFLAGS $MYSQL_INCLUDE" -fi - -if test "x$MYSQL_INCLUDE" = "x"; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: MySQL headers not found. Use --with-mysql-include-dir=" >&5 -echo "$as_me: error: MySQL headers not found. Use --with-mysql-include-dir=" >&2;} - { (exit 1); exit 1; }; } -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - - -### Checks for typedefs, structures, and compiler characteristics. -#AC_CHECK_TYPES([long long]) -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_size_t=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned -_ACEOF - -fi - - - -### Checks for library functions. -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int -main () -{ -int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_signal=int -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - -echo "$as_me:$LINENO: checking for working memcmp" >&5 -echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6 -if test "${ac_cv_func_memcmp_working+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_memcmp_working=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* Some versions of memcmp are not 8-bit clean. */ - char c0 = 0x40, c1 = 0x80, c2 = 0x81; - if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) - exit (1); - - /* The Next x86 OpenStep bug shows up only when comparing 16 bytes - or more and with at least one buffer not starting on a 4-byte boundary. - William Lewis provided this test program. */ - { - char foo[21]; - char bar[21]; - int i; - for (i = 0; i < 4; i++) - { - char *a = foo + i; - char *b = bar + i; - strcpy (a, "--------01111111"); - strcpy (b, "--------10000000"); - if (memcmp (a, b, 16) >= 0) - exit (1); - } - exit (0); - } - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_memcmp_working=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6 -test $ac_cv_func_memcmp_working = no && case $LIBOBJS in - "memcmp.$ac_objext" | \ - *" memcmp.$ac_objext" | \ - "memcmp.$ac_objext "* | \ - *" memcmp.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;; -esac - - -echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6 -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6 - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - case $LIBOBJS in - "lstat.$ac_objext" | \ - *" lstat.$ac_objext" | \ - "lstat.$ac_objext "* | \ - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; -esac - -fi - -echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6 -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_stat_empty_string_bug=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - exit (stat ("", &sbuf) ? 1 : 0); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_stat_empty_string_bug=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_stat_empty_string_bug=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6 -if test $ac_cv_func_stat_empty_string_bug = yes; then - case $LIBOBJS in - "stat.$ac_objext" | \ - *" stat.$ac_objext" | \ - "stat.$ac_objext "* | \ - *" stat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS stat.$ac_objext" ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define HAVE_STAT_EMPTY_STRING_BUG 1 -_ACEOF - -fi - - - - -for ac_func in \ - memmove \ - llround \ - setenv - -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -echo "$as_me:$LINENO: checking for library containing nanosleep" >&5 -echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6 -if test "${ac_cv_search_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_nanosleep=no -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char nanosleep (); -int -main () -{ -nanosleep (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_nanosleep="none required" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_nanosleep" = no; then - for ac_lib in rt posix4; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char nanosleep (); -int -main () -{ -nanosleep (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_search_nanosleep="-l$ac_lib" -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_search_nanosleep" >&5 -echo "${ECHO_T}$ac_cv_search_nanosleep" >&6 -if test "$ac_cv_search_nanosleep" != no; then - test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS" - -else - { { echo "$as_me:$LINENO: error: nanosleep function not found." >&5 -echo "$as_me: error: nanosleep function not found." >&2;} - { (exit 1); exit 1; }; } -fi - - -# Determine UCD or Net-SNMP include path -if test "x$snmp_include_dir" != "x"; then - for i in / /ucd-snmp /include/ucd-snmp; do - test -f $snmp_include_dir/$i/snmp.h && SNMP_INCDIR=$snmp_include_dir/$i - done - for i in / /net-snmp /include/net-snmp; do - test -f $snmp_include_dir/$i/net-snmp-config.h && SNMP_INCDIR=$snmp_include_dir/$i - done -else - for i in /usr/local/include /usr/include; do - test -f $i/snmp.h && SNMP_INCDIR=$i - test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp - test -f $i/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/net-snmp - test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp - test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp - test -f $i/snmp/include/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/snmp/include/net-snmp - done -fi - -# Determine UCD or Net-SNMP library path -if test "x$snmp_lib_dir" != "x"; then - test -f $snmp_lib_dir/libsnmp.a -o -f $snmp_lib_dir/libsnmp.so && SNMP_LIBDIR=$snmp_lib_dir - test -f $snmp_lib_dir/libnetsnmp.a -o -f $snmp_lib_dir/libnetsnmp.so && SNMP_LIBDIR=$snmp_lib_dir -else - for i in /usr/local/lib /usr/lib /usr/sfw/lib; do - test -f $i/libsnmp.a -o -f $i/libsnmp.so && SNMP_LIBDIR=$i - test -f $i/libnetsnmp.a -o -f $i/libnetsnmp.so && SNMP_LIBDIR=$i - done -fi - -if test -z "$SNMP_INCDIR"; then - if test "x$snmp_include_dir" != "x";then - { { echo "$as_me:$LINENO: error: Cannot find SNMP headers under $snmp_include_dir" >&5 -echo "$as_me: error: Cannot find SNMP headers under $snmp_include_dir" >&2;} - { (exit 1); exit 1; }; } - else - { { echo "$as_me:$LINENO: error: Cannot find SNMP headers. Use --with-snmp-include-dir= to specify non-default path." >&5 -echo "$as_me: error: Cannot find SNMP headers. Use --with-snmp-include-dir= to specify non-default path." >&2;} - { (exit 1); exit 1; }; } - fi -fi - -if test -z "$SNMP_LIBDIR"; then - if test "x$snmp_lib_dir" != "x";then - { { echo "$as_me:$LINENO: error: Cannot find SNMP libraries under $snmp_lib_dir" >&5 -echo "$as_me: error: Cannot find SNMP libraries under $snmp_lib_dir" >&2;} - { (exit 1); exit 1; }; } - else - { { echo "$as_me:$LINENO: error: Cannot find SNMP libraries. Use --with-snmp-lib-dir= to specify non-default path." >&5 -echo "$as_me: error: Cannot find SNMP libraries. Use --with-snmp-lib-dir= to specify non-default path." >&2;} - { (exit 1); exit 1; }; } - fi -fi - -LDFLAGS="$LDFLAGS -L$SNMP_LIBDIR" -CPPFLAGS="$CPPFLAGS -I$SNMP_INCDIR" - -# Net/UCD-SNMP includes v3 support and insists on crypto unless -# compiled --without-openssl -SNMP_SSL=no -echo "$as_me:$LINENO: checking if Net-SNMP needs crypto support" >&5 -echo $ECHO_N "checking if Net-SNMP needs crypto support... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -exit(USE_OPENSSL != 1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SNMP_SSL=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: checking if UCD-SNMP needs crypto support" >&5 -echo $ECHO_N "checking if UCD-SNMP needs crypto support... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -exit(USE_OPENSSL != 1); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SNMP_SSL=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test "$SNMP_SSL" = "yes"; then - -echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5 -echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6 -if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char CRYPTO_free (); -int -main () -{ -CRYPTO_free (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_crypto_CRYPTO_free=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_crypto_CRYPTO_free=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6 -if test $ac_cv_lib_crypto_CRYPTO_free = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCRYPTO 1 -_ACEOF - - LIBS="-lcrypto $LIBS" - -else - { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5 -echo "$as_me: error: libcrypto not found!" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -HAVE_NET_SNMP=no -echo "$as_me:$LINENO: checking for snmp_timeout in -lnetsnmp" >&5 -echo $ECHO_N "checking for snmp_timeout in -lnetsnmp... $ECHO_C" >&6 -if test "${ac_cv_lib_netsnmp_snmp_timeout+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnetsnmp $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char snmp_timeout (); -int -main () -{ -snmp_timeout (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_netsnmp_snmp_timeout=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_netsnmp_snmp_timeout=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_netsnmp_snmp_timeout" >&5 -echo "${ECHO_T}$ac_cv_lib_netsnmp_snmp_timeout" >&6 -if test $ac_cv_lib_netsnmp_snmp_timeout = yes; then - LIBS="-lnetsnmp $LIBS" - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NET_SNMP 1 -_ACEOF - - HAVE_NET_SNMP=yes -else - echo "$as_me:$LINENO: result: Cannot find Net-SNMP libraries...checking for UCD-SNMP" >&5 -echo "${ECHO_T}Cannot find Net-SNMP libraries...checking for UCD-SNMP" >&6 -fi - - -if test "$HAVE_NET_SNMP" = "no"; then - -echo "$as_me:$LINENO: checking for snmp_timeout in -lsnmp" >&5 -echo $ECHO_N "checking for snmp_timeout in -lsnmp... $ECHO_C" >&6 -if test "${ac_cv_lib_snmp_snmp_timeout+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsnmp $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char snmp_timeout (); -int -main () -{ -snmp_timeout (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_snmp_snmp_timeout=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_snmp_snmp_timeout=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_snmp_timeout" >&5 -echo "${ECHO_T}$ac_cv_lib_snmp_snmp_timeout" >&6 -if test $ac_cv_lib_snmp_snmp_timeout = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSNMP 1 -_ACEOF - - LIBS="-lsnmp $LIBS" - -else - { { echo "$as_me:$LINENO: error: Cannot find UCD-SNMP libraries" >&5 -echo "$as_me: error: Cannot find UCD-SNMP libraries" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -# Internationalization support - - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - - - - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval -else - USE_NLS=yes -fi; - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - - - - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGFMT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT - -if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$XGETTEXT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; -esac -fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - rm -f messages.po - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_MSGMERGE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case "$MSGMERGE" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" - ;; -esac -fi -MSGMERGE="$ac_cv_path_MSGMERGE" -if test "$MSGMERGE" != ":"; then - echo "$as_me:$LINENO: result: $MSGMERGE" >&5 -echo "${ECHO_T}$MSGMERGE" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - if test "$GMSGFMT" != ":"; then - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6 - GMSGFMT=":" - fi - fi - - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6 - XGETTEXT=":" - fi - rm -f messages.po - fi - - ac_config_commands="$ac_config_commands default-1" - - - - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" - - -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi; -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by GCC" >&5 -echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -fi -if test "${acl_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$acl_cv_path_LD" -if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${acl_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6 -with_gnu_ld=$acl_cv_prog_gnu_ld - - - - echo "$as_me:$LINENO: checking for shared library run path origin" >&5 -echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6 -if test "${acl_cv_rpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - -fi -echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5 -echo "${ECHO_T}$acl_cv_rpath" >&6 - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - # Check whether --enable-rpath or --disable-rpath was given. -if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - : -else - enable_rpath=yes -fi; - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then - withval="$with_libiconv_prefix" - - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi - -fi; - LIBICONV= - LTLIBICONV= - INCICONV= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done - fi - - - - - - - - - - - - - - - - - - - echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 - # Check whether --enable-nls or --disable-nls was given. -if test "${enable_nls+set}" = set; then - enableval="$enable_nls" - USE_NLS=$enableval -else - USE_NLS=yes -fi; - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - - - - - LIBINTL= - LTLIBINTL= - POSUB= - - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - - - - - - - echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5 -echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -gt_cv_func_gnugettext1_libc=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6 - - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then - - - - - - am_save_CPPFLAGS="$CPPFLAGS" - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - - echo "$as_me:$LINENO: checking for iconv" >&5 -echo $ECHO_N "checking for iconv... $ECHO_C" >&6 -if test "${am_cv_func_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_func_iconv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi - -fi -echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5 -echo "${ECHO_T}$am_cv_func_iconv" >&6 - if test "$am_cv_func_iconv" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ICONV 1 -_ACEOF - - fi - if test "$am_cv_lib_iconv" = yes; then - echo "$as_me:$LINENO: checking how to link with libiconv" >&5 -echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $LIBICONV" >&5 -echo "${ECHO_T}$LIBICONV" >&6 - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libintl-prefix or --without-libintl-prefix was given. -if test "${with_libintl_prefix+set}" = set; then - withval="$with_libintl_prefix" - - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi - -fi; - LIBINTL= - LTLIBINTL= - INCINTL= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='intl ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$hardcode_direct" = yes; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" - ;; - esac - done - fi - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" - done - fi - - echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5 -echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6 -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (); -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - gt_cv_func_gnugettext1_libintl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -gt_cv_func_gnugettext1_libintl=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (); -int -main () -{ -bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" -fi -echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5 -echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 - fi - - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF - - else - USE_NLS=no - fi - fi - - echo "$as_me:$LINENO: checking whether to use NLS" >&5 -echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $USE_NLS" >&5 -echo "${ECHO_T}$USE_NLS" >&6 - if test "$USE_NLS" = "yes"; then - echo "$as_me:$LINENO: checking where the gettext function comes from" >&5 -echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6 - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - echo "$as_me:$LINENO: result: $gt_source" >&5 -echo "${ECHO_T}$gt_source" >&6 - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - echo "$as_me:$LINENO: checking how to link with libintl" >&5 -echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6 - echo "$as_me:$LINENO: result: $LIBINTL" >&5 -echo "${ECHO_T}$LIBINTL" >&6 - - for element in $INCINTL; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - fi - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF - - fi - - POSUB=po - fi - - - - INTLLIBS="$LIBINTL" - - - - - - - -# -# Run configure in directories -# -#AC_CONFIG_SUBDIRS(src) - - ac_config_files="$ac_config_files Makefile subst bin/rrdedit etc/Makefile etc/cron.d-netmrg etc/init.d-netmrg etc/netmrg.conf etc/netmrg.xml m4/Makefile po/Makefile.in src/Makefile src/include/netmrg.h var/Makefile var/lib/Makefile var/lib/rrd/Makefile www/Makefile www/include/config.php" - - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by NetMRG $as_me 0.19, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -NetMRG config.status 0.19 -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS section. -# - -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - - -_ACEOF - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "subst" ) CONFIG_FILES="$CONFIG_FILES subst" ;; - "bin/rrdedit" ) CONFIG_FILES="$CONFIG_FILES bin/rrdedit" ;; - "etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;; - "etc/cron.d-netmrg" ) CONFIG_FILES="$CONFIG_FILES etc/cron.d-netmrg" ;; - "etc/init.d-netmrg" ) CONFIG_FILES="$CONFIG_FILES etc/init.d-netmrg" ;; - "etc/netmrg.conf" ) CONFIG_FILES="$CONFIG_FILES etc/netmrg.conf" ;; - "etc/netmrg.xml" ) CONFIG_FILES="$CONFIG_FILES etc/netmrg.xml" ;; - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; - "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/include/netmrg.h" ) CONFIG_FILES="$CONFIG_FILES src/include/netmrg.h" ;; - "var/Makefile" ) CONFIG_FILES="$CONFIG_FILES var/Makefile" ;; - "var/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES var/lib/Makefile" ;; - "var/lib/rrd/Makefile" ) CONFIG_FILES="$CONFIG_FILES var/lib/rrd/Makefile" ;; - "www/Makefile" ) CONFIG_FILES="$CONFIG_FILES www/Makefile" ;; - "www/include/config.php" ) CONFIG_FILES="$CONFIG_FILES www/include/config.php" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@RRDTOOL@,$RRDTOOL,;t t -s,@WWWDIR@,$WWWDIR,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@EGREP@,$EGREP,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -s,@USE_NLS@,$USE_NLS,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@GMSGFMT@,$GMSGFMT,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@MSGMERGE@,$MSGMERGE,;t t -s,@LIBICONV@,$LIBICONV,;t t -s,@LTLIBICONV@,$LTLIBICONV,;t t -s,@INTLLIBS@,$INTLLIBS,;t t -s,@LIBINTL@,$LIBINTL,;t t -s,@LTLIBINTL@,$LTLIBINTL,;t t -s,@POSUB@,$POSUB,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -# Compute $ac_file's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $ac_file | $ac_file:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} - { (exit 1); exit 1; }; }; } - - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -done - ;; - default-1 ) - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done ;; - esac -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - - -perl subst etc/cron.d-netmrg -perl subst etc/init.d-netmrg -perl subst etc/netmrg.conf -perl subst etc/netmrg.xml -perl subst src/include/netmrg.h -perl subst src/include/config.h -perl subst www/Makefile - diff -Nurb netmrg-0.19/configure.ac netmrg-0.20/ChangeLog/configure.ac --- netmrg-0.19/configure.ac 2006-01-10 06:28:13.000000000 +0530 +++ netmrg-0.20/ChangeLog/configure.ac 1970-01-01 05:30:00.000000000 +0530 @@ -1,441 +0,0 @@ -# Process this file with autoconf to produce a configure script. - -############################################################# -# -# Autoconf requirements -# AC_INIT(package, version, bug-report-address) -# information on the package -# checks for programs -# checks for libraries -# checks for header files -# checks for types -# checks for structures -# checks for compiler characteristics -# checks for library functions -# checks for system services -# AC_CONFIG_FILES([file...]) -# AC_OUTPUT -# -############################################################# - -AC_PREREQ(2.53) -AC_INIT(NetMRG,0.19) -AC_REVISION($Revision: 1.37 $) -AC_CONFIG_SRCDIR(src/netmrg.cpp) -AC_CANONICAL_HOST -AM_INIT_AUTOMAKE -AM_CONFIG_HEADER(src/include/config.h) -AC_PROG_MAKE_SET - -# We wanna use C++, not that silly C language ;) -AC_LANG(C++) - -# -# Autoconf is dumb and doesn't expand ${prefix} for this variable -# If it does this in the future, this can probably be removed -# -if test "x$exec_prefix" = "xNONE"; then - if test "x$prefix" = "xNONE" ; then - exec_prefix="/usr/local" - else - exec_prefix="$prefix" - fi - ac_configure_args="$ac_configure_args --exec-prefix=$exec_prefix" -fi - -# -# --with configs -# - -# rrdtool -AC_ARG_WITH(rrdtool, - AC_HELP_STRING( - [--with-rrdtool=PROGRAM], - [location of the rrdtool binary]), - [rrdtool_prog=$withval]) -AC_PATH_PROG(RRDTOOL, rrdtool, $rrdtool_prog) - -if test "x$RRDTOOL" = "x"; then - AC_MSG_ERROR([Couldn't find rrdtool. Please verify that it is installed.]) -fi - -# mysql -AC_ARG_WITH(mysql-include-dir, - AC_HELP_STRING( - [--with-mysql-include-dir], - [MySQL include directory [[/usr/(local/)include]]]), - [mysql_include_dir=$withval]) -AC_ARG_WITH(mysql-lib-dir, - AC_HELP_STRING( - [--with-mysql-lib-dir], - [MySQL library directory [[/usr/(local/)lib/mysql]]]), - [mysql_lib_dir=$withval]) - -# snmp -AC_ARG_WITH(snmp-include-dir, - AC_HELP_STRING( - [--with-snmp-include-dir], - [SNMP include base directory [[/usr/(local/)include]]]), - [snmp_include_dir=$withval]) -AC_ARG_WITH(snmp-lib-dir, - AC_HELP_STRING( - [--with-snmp-lib-dir], - [SNMP library directory [[/usr/(local/)lib]]]), - [snmp_lib_dir=$withval]) - -# xml2 -AC_ARG_WITH(xml2-include-dir, - AC_HELP_STRING( - [--with-xml2-include-dir], - [XML2 include directory]), - [xml2_include_dir=$withval]) -AC_ARG_WITH(xml2-lib-dir, - AC_HELP_STRING( - [--with-xml2-lib-dir], - [XML2 library directory]), - [xml2_lib_dir=$withval]) - -# www dir -www_dir="${localstatedir}/www/${PACKAGE}" -AC_ARG_WITH(www-dir, - AC_HELP_STRING( - [--with-www-dir], - [install directory for web files]), - [www_dir=$withval]) -AC_SUBST(WWWDIR, $www_dir) - - -# -# Special hacks for certain operating systems -# - -# if host_alias is empty, ac_cv_host_alias may still have the info -if test -z "$host_alias"; then - host_alias=$ac_cv_host_alias -fi - -# Platform-specific tweaks -case $host_alias in -*solaris*) - AC_DEFINE(HAVE_LONG_LONG_SCANF, 1, scanf supports long long) - LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib" - LIBS="-lkstat $LIBS";; -*linux*) - AC_DEFINE(HAVE_LONG_LONG_SCANF, 1, scanf supports long long);; -*freebsd*) - CPPFLAGS="$CPPFLAGS -I/usr/local/include";; -*openbsd*) - LIBS="-ldes $LIBS";; -esac - - -### Checks for programs. -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL - -AC_MSG_CHECKING([whether to enable -Wall]) -AC_ARG_ENABLE(warnings, - AC_HELP_STRING( - [--enable-warnings], - [Enable -Wall if using g++]), - [ if test -n "$GXX"; then - AC_MSG_RESULT(adding -Wall to CPPFLAGS.) - CPPFLAGS="$CPPFLAGS -Wall" - fi], - AC_MSG_RESULT(no)) - - -### Checks for libraries. -AC_CHECK_LIB(intl, bindtextdomain) -AC_CHECK_LIB(dl, dlopen) -AC_CHECK_LIB(z, compress) -AC_CHECK_LIB(pthread, pthread_create, - [ CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" - LIBS="-lpthread $LIBS" ], - AC_CHECK_LIB(c_r, pthread_create, - [ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" - LIBS="-pthread $LIBS"], - AC_MSG_ERROR([POSIX threads not found.]) - ) -) -AC_CHECK_LIB(stdc++, main) - -## Determine XML2 library path -# try and find libs without any additional libraries -AC_CHECK_LIB(xml2, xmlParseFile, - XML2_LIBS=" ", - XML2_LIBS= -) - -# hunt through several directories trying to find the libraries -if test "x$XML2_LIBS" = "x"; then - old_LDFLAGS="$LDFLAGS" - for try in $xml2_lib_dir /usr/lib /usr/local/lib ; do - LDFLAGS="$old_LDFLAGS -L$try" - unset ac_cv_lib_xml2_xmlParseFile - AC_CHECK_LIB(xml2, xmlParseFile, - XML2_LIBS="-L$try", - XML2_LIBS= - ) - if test "x$XML2_LIBS" != "x"; then - break; - fi - done - LDFLAGS="$old_LDFLAGS $XML2_LIBS" -fi - -if test "x$XML2_LIBS" = "x"; then - AC_MSG_ERROR([XML2 libraries not found. Use --with-xml2-lib-dir=]) -fi -# don't forget to add xml2 to the list of libraries -LIBS="-lxml2 $LIBS" - -## Determine MySQL library path -# try and find libs without any additional libraries -AC_CHECK_LIB(mysqlclient, mysql_init, - MYSQL_LIBS=" ", - MYSQL_LIBS= -) - -# hunt through several directories trying to find the libraries -if test "x$MYSQL_LIBS" = "x"; then - old_LDFLAGS="$LDFLAGS" - for try in $mysql_lib_dir /usr/lib /usr/lib/mysql /usr/local/lib /usr/local/mysql/lib /usr/local/lib/mysql /usr/sfw/lib; do - LDFLAGS="$old_LDFLAGS -L$try" - unset ac_cv_lib_mysqlclient_mysql_init - AC_CHECK_LIB(mysqlclient, mysql_init, - MYSQL_LIBS="-L$try", - MYSQL_LIBS= - ) - if test "x$MYSQL_LIBS" != "x"; then - break; - fi - done - LDFLAGS="$old_LDFLAGS $MYSQL_LIBS" -fi - -if test "x$MYSQL_LIBS" = "x"; then - AC_MSG_ERROR([MySQL libraries not found. Use --with-mysql-lib-dir=]) -fi -# don't forget to add mysqlclient to the list of libraries -LIBS="-lmysqlclient $LIBS" - -# now that we've found the libraries, check for MySQL < 4.0 -AC_CHECK_LIB(mysqlclient, mysql_thread_init, [], - AC_DEFINE(OLD_MYSQL, 1, [Old MySQL version])) - - -### Checks for header files. -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_HEADER_TIME -AC_CHECK_HEADERS( \ - cstdio \ - cstdlib \ - string \ - list \ - unistd.h \ - netinet/in.h -) - -## Determine XML2 include path -AC_MSG_CHECKING(for libxml/xmlmemory.h) - -# Can we include headers using system include dirs? -AC_TRY_COMPILE([#include ], [int a = 1;], - XML2_INCLUDE=" ", - XML2_INCLUDE= -) - -# hunt through several directories trying to find the includes -if test "x$XML2_INCLUDE" = "x"; then - old_CPPFLAGS="$CPPFLAGS" - for i in $xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2 ; do - CPPFLAGS="$old_CPPFLAGS -I$i" - AC_TRY_COMPILE([#include ], [int a = 1;], - XML2_INCLUDE="-I$i", - XML2_INCLUDE= - ) - if test "x$XML2_INCLUDE" != "x"; then - break; - fi - done - CPPFLAGS="$old_CPPFLAGS $XML2_INCLUDE" -fi - -if test "x$XML2_INCLUDE" = "x"; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([XML2 headers not found. Use --with-xml2-include-dir=]) -fi -AC_MSG_RESULT(yes) - -## Determine MySQL include path -AC_MSG_CHECKING(for mysql/mysql.h) - -# Can we include headers using system include dirs? -AC_TRY_COMPILE([#include ], [int a = 1;], - MYSQL_INCLUDE=" ", - MYSQL_INCLUDE= -) - -# hunt through several directories trying to find the includes -if test "x$MYSQL_INCLUDE" = "x"; then - old_CPPFLAGS="$CPPFLAGS" - for i in $mysql_include_dir /usr/include /usr/local/include /usr/local/mysql/include /usr/local/include/mysql ; do - CPPFLAGS="$old_CPPFLAGS -I$i" - AC_TRY_COMPILE([#include ], [int a = 1;], - MYSQL_INCLUDE="-I$i", - MYSQL_INCLUDE= - ) - if test "x$MYSQL_INCLUDE" != "x"; then - break; - fi - done - CPPFLAGS="$old_CPPFLAGS $MYSQL_INCLUDE" -fi - -if test "x$MYSQL_INCLUDE" = "x"; then - AC_MSG_RESULT(no) - AC_MSG_ERROR([MySQL headers not found. Use --with-mysql-include-dir=]) -fi -AC_MSG_RESULT(yes) - - -### Checks for typedefs, structures, and compiler characteristics. -#AC_CHECK_TYPES([long long]) -AC_C_CONST -AC_TYPE_SIZE_T - - -### Checks for library functions. -AC_TYPE_SIGNAL -AC_FUNC_MEMCMP -AC_FUNC_STAT -AC_CHECK_FUNCS( \ - memmove \ - llround \ - setenv -) -AC_SEARCH_LIBS(nanosleep, rt posix4,, AC_ERROR([nanosleep function not found.])) - -# Determine UCD or Net-SNMP include path -if test "x$snmp_include_dir" != "x"; then - for i in / /ucd-snmp /include/ucd-snmp; do - test -f $snmp_include_dir/$i/snmp.h && SNMP_INCDIR=$snmp_include_dir/$i - done - for i in / /net-snmp /include/net-snmp; do - test -f $snmp_include_dir/$i/net-snmp-config.h && SNMP_INCDIR=$snmp_include_dir/$i - done -else - for i in /usr/local/include /usr/include; do - test -f $i/snmp.h && SNMP_INCDIR=$i - test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp - test -f $i/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/net-snmp - test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp - test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp - test -f $i/snmp/include/net-snmp/net-snmp-config.h && SNMP_INCDIR=$i/snmp/include/net-snmp - done -fi - -# Determine UCD or Net-SNMP library path -if test "x$snmp_lib_dir" != "x"; then - test -f $snmp_lib_dir/libsnmp.a -o -f $snmp_lib_dir/libsnmp.so && SNMP_LIBDIR=$snmp_lib_dir - test -f $snmp_lib_dir/libnetsnmp.a -o -f $snmp_lib_dir/libnetsnmp.so && SNMP_LIBDIR=$snmp_lib_dir -else - for i in /usr/local/lib /usr/lib /usr/sfw/lib; do - test -f $i/libsnmp.a -o -f $i/libsnmp.so && SNMP_LIBDIR=$i - test -f $i/libnetsnmp.a -o -f $i/libnetsnmp.so && SNMP_LIBDIR=$i - done -fi - -if test -z "$SNMP_INCDIR"; then - if test "x$snmp_include_dir" != "x";then - AC_MSG_ERROR(Cannot find SNMP headers under $snmp_include_dir) - else - AC_MSG_ERROR(Cannot find SNMP headers. Use --with-snmp-include-dir= to specify non-default path.) - fi -fi - -if test -z "$SNMP_LIBDIR"; then - if test "x$snmp_lib_dir" != "x";then - AC_MSG_ERROR(Cannot find SNMP libraries under $snmp_lib_dir) - else - AC_MSG_ERROR(Cannot find SNMP libraries. Use --with-snmp-lib-dir= to specify non-default path.) - fi -fi - -LDFLAGS="$LDFLAGS -L$SNMP_LIBDIR" -CPPFLAGS="$CPPFLAGS -I$SNMP_INCDIR" - -# Net/UCD-SNMP includes v3 support and insists on crypto unless -# compiled --without-openssl -SNMP_SSL=no -AC_MSG_CHECKING([if Net-SNMP needs crypto support]) -AC_TRY_COMPILE([#include ], - [exit(USE_OPENSSL != 1);], - [AC_MSG_RESULT(yes) - SNMP_SSL=yes ], - AC_MSG_RESULT(no)) -AC_MSG_CHECKING([if UCD-SNMP needs crypto support]) -AC_TRY_COMPILE([#include ], - [exit(USE_OPENSSL != 1);], - [AC_MSG_RESULT(yes) - SNMP_SSL=yes ], - AC_MSG_RESULT(no)) - -if test "$SNMP_SSL" = "yes"; then - AC_CHECK_LIB(crypto, CRYPTO_free,,AC_MSG_ERROR(libcrypto not found!)) -fi - -HAVE_NET_SNMP=no -AC_CHECK_LIB(netsnmp, snmp_timeout, - [LIBS="-lnetsnmp $LIBS" - AC_DEFINE(HAVE_NET_SNMP, 1, Net-SNMP Version) - HAVE_NET_SNMP=yes ], - AC_MSG_RESULT(Cannot find Net-SNMP libraries...checking for UCD-SNMP)) - -if test "$HAVE_NET_SNMP" = "no"; then - AC_CHECK_LIB(snmp, snmp_timeout,, - AC_MSG_ERROR(Cannot find UCD-SNMP libraries)) -fi - -# Internationalization support -AM_GNU_GETTEXT([external]) - -# -# Run configure in directories -# -#AC_CONFIG_SUBDIRS(src) - -AC_CONFIG_FILES( \ - Makefile \ - subst \ - bin/rrdedit \ - etc/Makefile \ - etc/cron.d-netmrg \ - etc/init.d-netmrg \ - etc/netmrg.conf \ - etc/netmrg.xml \ - m4/Makefile \ - po/Makefile.in \ - src/Makefile \ - src/include/netmrg.h \ - var/Makefile \ - var/lib/Makefile \ - var/lib/rrd/Makefile \ - www/Makefile \ - www/include/config.php - -) - -AC_OUTPUT - -perl subst etc/cron.d-netmrg -perl subst etc/init.d-netmrg -perl subst etc/netmrg.conf -perl subst etc/netmrg.xml -perl subst src/include/netmrg.h -perl subst src/include/config.h -perl subst www/Makefile - diff -Nurb netmrg-0.19/contrib/apachestats/apachestats netmrg-0.20/ChangeLog/contrib/apachestats/apachestats --- netmrg-0.19/contrib/apachestats/apachestats 2005-03-30 00:46:06.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/apachestats/apachestats 1970-01-01 05:30:00.000000000 +0530 @@ -1,276 +0,0 @@ -#!/usr/bin/perl -# -# apachestats -# -# read in an apache log from stdin or a file and -# keep stats on # of responses per type (2xx, 3xx, etc) and total bytes -# per server in a database -# - - -##### -# LIBRARIES -##### - -use strict; -use DBI; -use Getopt::Long; -use Date::Parse; -use POSIX qw(strftime pow); - - -##### -# VARIABLES -##### - -## program variables -our $progname = "apachestats"; -our $version = "0.1"; -our $mysql = { - "host" => "localhost", - "user" => "root", - "pass" => "", - "dbname" => "apachestats", -}; -# %typestats = ( -# "www.silfreed.net" => ( -# "2xx" => 349303, -# "3xx" => 9332, -# "bytes" => 392343, -# ), -our %typestats; -our $dbh; -my $logline; -my $linenum = 0; -my $logat = 100; -my $getopt_result; - -## args -our $input = "STDIN"; -our $hostname = ""; -our $hostnamere = qr{.*}; # ^ns\d+\.pa\.net$ - - -##### -# FORWARD DECLAIRATIONS -##### -sub Usage(); -sub Stop(); -sub MySQLConnect(); -sub ReadStats(); -sub StatsLog(); - -### -## Sig Handlers -### -$SIG{INT} = sub { close(LOG); StatsLog(); Stop(); }; - - - -##### -# MAIN -##### - -$getopt_result = GetOptions( - "i|input=s" => \$input, - "h|hostname=s" => \$hostname, - "r|hostnamere=s" => sub { $hostnamere = qr{$_[1]}; }, -); - -Usage() if (!$getopt_result); - -## check to see if input method works -if ($input eq "STDIN") -{ - open(LOG, "-"); -} # end if stdin -else -{ - # if the file is readable - if (-r $input) - { - open(LOG, $input); - } # end if file readable - else - { - print "File '$input' not readable\n\n"; - Usage(); - } # end if file not readable -} # end if not stdin - - -## Connect to database -MySQLConnect(); - -## read in old stats -ReadStats(); - -## read in the log and do stuff -while (chomp($logline = )) -{ - # info we're interested in - my $type; - my $size; - - # keep track of # of lines seen - $linenum++; - - # this is a combined log - # 127.0.0.1 - - [04/Mar/2005:11:20:32 -0500] "GET /netmrg/img/show.gif HTTP/1.1" 200 67 "http://localhost.localdomain/netmrg/device_tree.php" "Mozilla/5.0 (compatible; Konqueror/3.3; Linux) (KHTML, like Gecko)" - if ($logline =~ /^(\S+)\s+\S+\s+(\S+)\s+\[(.+?)\]\s+"(\S+)\s+(\S+)\s+(\S+)"\s+(\S+)\s+(\S+)\s+"(.*?)"\s+"(.*?)"$/) - { - #$loghash{remote_host} = $1; - #$loghash{remote_user} = $2; - #$loghash{request_time} = $3; - #$loghash{request_method} = $4; - #$loghash{request_uri} = $5; - #$loghash{request_protocol} = $6; - #$loghash{status} = $7; - #$loghash{bytes_sent} = $8; - #$loghash{referer} = $9; - #$loghash{agent} = $10; - $type = $7; - $size = $8; - - # if we don't have a hostname for the log - if ($hostname eq "") - { - print "Hostname needed for combined log\n\n"; - Usage(); - } # end if no hostname - } # end if combined log - - # this is a combined log w/ vhost - # vhost.name 127.0.0.1 - - [04/Mar/2005:11:20:32 -0500] "GET /netmrg/img/show.gif HTTP/1.1" 200 67 "http://localhost.localdomain/netmrg/device_tree.php" "Mozilla/5.0 (compatible; Konqueror/3.3; Linux) (KHTML, like Gecko)" - if ($logline =~ /^(\S+)\s+(\S+)\s+\S+\s+(\S+)\s+\[(.+?)\]\s+"(\S+)\s+(\S+)\s+(\S+)"\s+(\S+)\s+(\S+)\s+"(.*?)"\s+"(.*?)"$/) - { - $hostname = $1; - $type = $8; - $size = $9; - } # end if vhost combined log - - # log info to a file - if (defined($type) && $hostname =~ $hostnamere) - { - # increment stats for this type on this host - $typestats{$hostname}{$type}++; - $typestats{$hostname}{"bytes"} += $size; - } # end if we have data to log - - # if we've seen enough log lines, dump the info to database - &StatsLog() if ($linenum % $logat == 0); -} # end while log left - -close (LOG); - -## make sure we log some stats -StatsLog(); - -# exit nicely -Stop(); - - -##### -# SUBROUTINES -##### - -### -# Usage(); -# -# howto use this program -# -sub Usage() -{ - print <|STDIN)] - [(-h|--hostname) ] [(-r|--hostnamere) ] - - --input specify the file to read in or STDIN if input is on - the command line - [STDIN] - --hostname needed when log is a named query log - specifies the host to - log stats for in the database and to use as the 'host' in the - apache log - --hostnamere regex for the hostnames to match - -END - Stop(); -} # end Usage(); - - -### -# Stop(); -# -# exits nicely -# -sub Stop() -{ - exit(); -} # end Stop(); - - -### -# MySQLConnect() -# -# connects to database -# -sub MySQLConnect() -{ - $dbh = DBI->connect("DBI:mysql:database=$mysql->{dbname};host=$mysql->{host}", - $mysql->{user}, $mysql->{pass}); - - if (!$dbh) - { - print "MySQLConnect: ERROR: couldn't connect to database\n\n"; - Stop(); - } # end if we didn't connect -} # end MySQLConnect(); - - -### -# ReadStats() -# -# read in old stats from database -# -sub ReadStats() -{ - my $db_stats = $dbh->prepare("SELECT host, type, counter FROM apachestats"); - $db_stats->{'PrintError'} = 0; - $db_stats->execute(); - - while (my $r = $db_stats->fetchrow_hashref()) - { - $typestats{$r->{host}}{$r->{type}} = $r->{counter}; - } # end while each row - - $db_stats->finish(); -} # end ReadStats(); - - -### -# StatsLog() -# -# logs statistics for $host of $type -# -sub StatsLog() -{ - my $maxval = pow(2,31); - - # foreach host - foreach my $host (keys(%typestats)) - { - # foreach type - foreach my $type (keys(%{$typestats{$host}})) - { - # wrap counters around if they're too big - $typestats{$host}{$type} = $typestats{$host}{$type} - $maxval if ($typestats{$host}{$type} > $maxval); - # insert into database - $dbh->do("REPLACE INTO apachestats SET - host = '$host', - type = '$type', - counter = '$typestats{$host}{$type}'"); - } # end foreach type - } # end foreach host -} # end StatsLog(); - diff -Nurb netmrg-0.19/contrib/apachestats/apachestats.mysql netmrg-0.20/ChangeLog/contrib/apachestats/apachestats.mysql --- netmrg-0.19/contrib/apachestats/apachestats.mysql 2005-03-09 01:24:56.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/apachestats/apachestats.mysql 1970-01-01 05:30:00.000000000 +0530 @@ -1,7 +0,0 @@ -create table apachestats ( - host varchar(64) not null, - type varchar(16) not null, - counter int not null, - primary key (host, type) -); - diff -Nurb netmrg-0.19/contrib/apachestats/README netmrg-0.20/ChangeLog/contrib/apachestats/README --- netmrg-0.19/contrib/apachestats/README 2005-03-09 01:24:56.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/apachestats/README 1970-01-01 05:30:00.000000000 +0530 @@ -1,43 +0,0 @@ -==== apachestats v0.1 ==== -Usage: apachestats [(-i|--input) (|STDIN)] - [(-h|--hostname) ] [(-r|--hostnamere) ] - - --input specify the file to read in or STDIN if input is on - the command line - [STDIN] - --hostname needed when log is a named query log - specifies the host to - log stats for in the database and to use as the 'host' in the - apache log - --hostnamere regex for the hostnames to match - - -This program is a direct rip from dnsstats. -This program takes an apache log in and puts some nifty stats back out. -The apache log can either be in combined log format or combined log with -virtualhost. -It's probably easiest to pipe the combined log w/ vhost directly to this -script from apache so you get logs for all hosts without any post-processing -and without setting it up in each virtualhost. - -Make sure you setup your mysql database with the table in apachestats.mysql. - -To setup the NetMRG side of things, you'll need to add an SQL test. The test -I commonly use uses this query (be sure to fill in the rest of the info): - -SELECT counter FROM apachestats.apachestats WHERE host like "%apachehost%" AND type like "%parameters%" - -Then, I create a sub-device for the device that I want to monitor with a -parameter named 'apachehost' and the hostname that shows up in your tables. -When you add your monitors to this sub-device, add a parameters field for each -type of stat you want to monitor; I usually monitor these, but there are many more: -2% -3% -4% -5% -bytes - -Next, you'll want to create a template graph out of these using whatever colors, -etc that you want (see http://demo.netmrg.net/ for an example). - -If you experience any problems, be sure to demand your money back. - diff -Nurb netmrg-0.19/contrib/bindstats/dnsstats netmrg-0.20/ChangeLog/contrib/bindstats/dnsstats --- netmrg-0.19/contrib/bindstats/dnsstats 2005-04-25 18:34:21.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/bindstats/dnsstats 1970-01-01 05:30:00.000000000 +0530 @@ -1,283 +0,0 @@ -#!/usr/bin/perl -# -# dnsstats.pl -# -# read in a query log from stdin or a file and -# keep stats on # of types of queries per server in a database -# and rewrite the query log to a file in apache common log format -# to be parsed later by something like webalizer -# - - -##### -# LIBRARIES -##### - -use strict; -use DBI; -use Getopt::Long; -use Date::Parse; -use POSIX qw(pow strftime); - - -##### -# VARIABLES -##### - -## program variables -our $progname = "dnsstats"; -our $version = "0.1"; -our $mysql = { - "host" => "localhost", - "user" => "root", - "pass" => "", - "dbname" => "dnsstats", -}; -our $dnslog = "dns-apache.log"; -# %typestats = ( -# "ns1.pa.net" => ( -# "IN A" => 349303, -# "IN PTR" => 9332, -# ), -our %typestats; -our $dbh; -my $logline; -my $linenum = 0; -my $logat = 100; -my $getopt_result; - -## args -our $input = "STDIN"; -our $hostname = ""; -our $hostnamere = qr{.*}; # ^ns\d+\.pa\.net$ - - -##### -# FORWARD DECLAIRATIONS -##### -sub Usage(); -sub Stop(); -sub MySQLConnect(); -sub ReadStats(); -sub StatsLog(); - -### -## Sig Handlers -### -$SIG{HUP} = sub { close(APLOG); open(APLOG, ">>$dnslog")}; -$SIG{INT} = sub {close (LOG); close (APLOG); StatsLog(); Stop(); }; - - - -##### -# MAIN -##### - -$getopt_result = GetOptions( - "i|input=s" => \$input, - "o|output=s" => \$dnslog, - "h|hostname=s" => \$hostname, - "r|hostnamere=s" => sub { $hostnamere = qr{$_[1]}; }, -); - -Usage() if (!$getopt_result); - -## check to see if input method works -if ($input eq "STDIN") -{ - open(LOG, "-"); -} # end if stdin -else -{ - # if the file is readable - if (-r $input) - { - open(LOG, $input); - } # end if file readable - else - { - print "File '$input' not readable\n\n"; - Usage(); - } # end if file not readable -} # end if not stdin - -## open the apache log file -unless (open(APLOG, ">>$dnslog")) -{ - print "Could not open '$dnslog' for apache logfile\n\n"; - Usage(); -} # end if we couldn't open the apache log - - -## Connect to database -MySQLConnect(); - -## read in old stats -ReadStats(); - -## read in the log and do stuff -while (chomp($logline = )) -{ - # info we're interested in - my $time; - my $client; - my $query; - my $type; - - # keep track of # of lines seen - $linenum++; - - # this is a named query log - # Aug 22 19:53:31.963 queries: client 199.224.127.102#33132: query: www.pa.net IN A - if ($logline =~ /^(\w+\s+\d+\s+\S+)\s+queries:\s+client\s+(\S+)#\S+:\s+query:\s+(\S+)\s+(\S+\s+\S+)$/) - { - $time = $1; - $client = $2; - $query = $3; - $type = $4; - - # if we don't have a hostname for the named query log - if ($hostname eq "") - { - print "Hostname needed for named query log\n\n"; - Usage(); - } # end if no hostname - } # end if named query log - # this is a syslog query log - # Aug 23 11:08:43 ns1.pa.net named[24527]: Aug 23 11:08:41.181queries: client 209.12.32.106#39468: query: ns1.pa.net IN A - elsif ($logline =~ /^(\w+\s+\d+\s+\S+)\s+(\S+).*?client\s+(\S+)#\S+:\s+query:\s+(\S+)\s+(\S+\s+\S+)\s*$/) - { - $time = $1; - $hostname = $2; - $client = $3; - $query = $4; - $type = $5; - } # end if syslog query log - - # log info to a file - if (defined($client) && $hostname =~ $hostnamere) - { - # increment stats for this type on this host - $typestats{$hostname}{$type}++; - $typestats{$hostname}{$type} = 1 if ($typestats{$hostname}{$type} > pow(2,31)); - - my $fmttime = strftime("[%d/%b/%Y:%H:%M:%S %z]", localtime(str2time($time))); - my $get = "$query $type"; - $get =~ s/\s+/\//g; - print APLOG "$hostname $client - - $fmttime \"GET /$get HTTP/1.0\" 200 100\n"; - } # end if we have data to log - - # if we've seen enough log lines, dump the info to database - &StatsLog() if ($linenum % $logat == 0); -} # end while log left - -close (LOG); -close (APLOG); - -## make sure we log some stats -StatsLog(); - -# exit nicely -Stop(); - - -##### -# SUBROUTINES -##### - -### -# Usage(); -# -# howto use this program -# -sub Usage() -{ - print <|STDIN)] [(-o|--ouput) ] - [(-h|--hostname) ] [(-r|--hostnamere) ] - - --input specify the file to read in or STDIN if input is on - the command line - [STDIN] - --output specify the file to write the apache log file to - --hostname needed when log is a named query log - specifies the host to - log stats for in the database and to use as the 'host' in the - apache log - --hostnamere regex for the hostnames to match - -END - Stop(); -} # end Usage(); - - -### -# Stop(); -# -# exits nicely -# -sub Stop() -{ - exit(); -} # end Stop(); - - -### -# MySQLConnect() -# -# connects to database -# -sub MySQLConnect() -{ - $dbh = DBI->connect("DBI:mysql:database=$mysql->{dbname};host=$mysql->{host}", - $mysql->{user}, $mysql->{pass}); - - if (!$dbh) - { - print "MySQLConnect: ERROR: couldn't connect to database\n\n"; - Stop(); - } # end if we didn't connect -} # end MySQLConnect(); - - -### -# ReadStats() -# -# read in old stats from database -# -sub ReadStats() -{ - my $db_stats = $dbh->prepare("SELECT host, type, counter FROM dnsstats"); - $db_stats->{'PrintError'} = 0; - $db_stats->execute(); - - while (my $r = $db_stats->fetchrow_hashref()) - { - $typestats{$r->{host}}{$r->{type}} = $r->{counter}; - } # end while each row - - $db_stats->finish(); -} # end ReadStats(); - - -### -# StatsLog() -# -# logs statistics for $host of $type -# -sub StatsLog() -{ - # foreach host - foreach my $host (keys(%typestats)) - { - # foreach type - foreach my $type (keys(%{$typestats{$host}})) - { - $dbh->do("REPLACE INTO dnsstats SET - host = '$host', - type = '$type', - counter = '$typestats{$host}{$type}'"); - } # end foreach type - } # end foreach host -} # end StatsLog(); - diff -Nurb netmrg-0.19/contrib/bindstats/dnsstats.mysql netmrg-0.20/ChangeLog/contrib/bindstats/dnsstats.mysql --- netmrg-0.19/contrib/bindstats/dnsstats.mysql 2004-05-29 02:30:27.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/bindstats/dnsstats.mysql 1970-01-01 05:30:00.000000000 +0530 @@ -1,7 +0,0 @@ -create table dnsstats ( - host varchar(64) not null, - type varchar(16) not null, - counter int not null, - primary key (host, type) -); - diff -Nurb netmrg-0.19/contrib/bindstats/README netmrg-0.20/ChangeLog/contrib/bindstats/README --- netmrg-0.19/contrib/bindstats/README 2004-08-14 18:57:54.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/bindstats/README 1970-01-01 05:30:00.000000000 +0530 @@ -1,73 +0,0 @@ -==== dnsstats v0.1 ==== -Usage: dnsstats [(-i|--input) (|STDIN)] [(-o|--ouput) ] - [(-h|--hostname) ] [(-r|--hostnamere) ] - - --input specify the file to read in or STDIN if input is on - the command line - [STDIN] - --output specify the file to write the apache log file to - --hostname needed when log is a named query log - specifies the host to - log stats for in the database and to use as the 'host' in the - apache log - --hostnamere regex for the hostnames to match - - -This program takes a syslog feed or named query log in, and puts some nifty -stats back out. -You'll need to make a fifo (`mkfifo /var/log/querylog-pipe.log` - probably -`chmod 600 /var/log/querylog-pipe.log` also), and send your syslog feed to it; -with a line similar to this: ---- syslog.conf start --- -local3.info |/var/log/named/querylog-pipe.log ---- syslog.conf stop --- - -You'll also need to setup Bind to send its query logs to syslog, so add something -similar to this to you named.conf: ---- named.conf start --- -logging { - channel query_log { - syslog local3; - severity info; - print-category yes; - print-time yes; - }; - category queries { query_log; }; -}; ---- named.conf stop --- - -And you'll have to toggle query logging on using rndc: -$ rndc querylog -$ rndc status - -It's very useful to put this into your inittab, with a line similar to this: ---- inittab start --- -ds:3:respawn:/usr/local/bin/bindstats/dnsstats -i /var/log/named/querylog-pipe.log -o /dev/null -r '^localhost$' ---- inittab stop --- - -make sure you setup your mysql database with the table in dnsstats.mysql. - -To setup the NetMRG side of things, you'll need to add an SQL test. The test -I commonly use uses this query (be sure to fill in the rest of the info): - -SELECT counter FROM dnsstats.dnsstats WHERE host = "%dnshost%" AND type = "%parameters%" - -Then, I create a sub-device for the device that I want to monitor with a -parameter named 'dnshost' and the hostname that shows up in your tables. -When you add your monitors to this sub-device, add a parameters field for each -type of stat you want to monitor; I usually monitor these, but there are many more: -IN A -IN MX -IN PTR -IN TXT -IN A6 -IN AAAA -IN SOA -IN SRV -IN LOC -IN AXFR - -Next, you'll want to create a template graph out of these using whatever colors, -etc that you want (see http://demo.netmrg.net/ for an example). - -If you experience any problems, be sure to demand your money back. - diff -Nurb netmrg-0.19/contrib/killspike2 netmrg-0.20/ChangeLog/contrib/killspike2 --- netmrg-0.19/contrib/killspike2 2005-12-16 03:37:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/killspike2 1970-01-01 05:30:00.000000000 +0530 @@ -1,67 +0,0 @@ -#!/bin/sh - -# -# killspike2 -# Remove (presumably erroneous) peaks from RRD files -# -# Matt Zimmerman , 05/2002 -# - -set -e - -usage() { - >&2 echo "Usage: $0 ..." - >&2 echo - >&2 echo "Remove all peaks above from in the RRDs ..." - exit $1 -} - -backupdir=/tmp/backup.killspike2 - -ds=$1 -max=$2 - -if [ -z "$ds" -o -z "$max" ]; then - usage 1 -fi - -shift 2 - -rrds=$* - -if [ "$ds" = "-h" -o -z "$rrds" ]; then - usage 1 -fi - -if [ ! -e "$backupdir" ] ; then - mkdir $backupdir 2> /dev/null - echo "Making backups in $backupdir" -fi - -if type tempfile >/dev/null 2>&1; then - tempfile=`tempfile` -else - tempfile=killspike2.$$ -fi - -for rrd in $rrds; do - echo $rrd - - oldmax=`rrdtool info "$rrd" | awk '$1 == "ds['$ds'].max" { print $3 }'` - if [ -z "$oldmax" ]; then - >&2 echo "Could not determine current max for DS '$ds' in $rrd" - exit 1 - elif [ "$oldmax" = "NaN" ]; then - oldmax=U - fi - - cp "$rrd" "$backupdir" - rrdtool tune "$rrd" --maximum "$ds:$max" - rrdtool dump "$rrd" > "$tempfile" - rm -f "$rrd" - rrdtool restore -r "$tempfile" "$rrd" - rrdtool tune "$rrd" --maximum "$ds:$oldmax" -done - -rm -f "$tempfile" - diff -Nurb netmrg-0.19/contrib/maillogstats/CHANGELOG netmrg-0.20/ChangeLog/contrib/maillogstats/CHANGELOG --- netmrg-0.19/contrib/maillogstats/CHANGELOG 2004-07-17 03:25:39.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/maillogstats/CHANGELOG 1970-01-01 05:30:00.000000000 +0530 @@ -1,21 +0,0 @@ -2004.07.15 silfreed - - changed name from 'maillogfilter' to 'maillogstats' - -2004.06.23 dwarner - updated imap connection logging - -2004.03.30 dwarner - added `connect` column to table - renamed `postfix` table to `stats` - add support for imap/postfix/tpop3d connections - -2003.07.03 dwarner - 'from=<' counts too many things for Received; trying 'message-id=<' instead - -2002.11.21 dwarner - wrap counters manually by doing this: - if ($i > pow(2, 31)) { $i = $i - pow(2,31); } - add mailscanner processing - OutputCounters() - - change to a 'REPLACE INTO' - diff -Nurb netmrg-0.19/contrib/maillogstats/maillog.mysql netmrg-0.20/ChangeLog/contrib/maillogstats/maillog.mysql --- netmrg-0.19/contrib/maillogstats/maillog.mysql 2004-07-17 03:25:39.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/maillogstats/maillog.mysql 1970-01-01 05:30:00.000000000 +0530 @@ -1,26 +0,0 @@ --- MySQL dump 9.10 --- --- Host: localhost Database: maillog --- ------------------------------------------------------ --- Server version 4.0.17-Max - --- --- Table structure for table `stats` --- - -CREATE TABLE stats ( - hostname varchar(128) NOT NULL default '', - connect int(11) default NULL, - received int(11) default NULL, - delivered int(11) default NULL, - forwarded int(11) default NULL, - deferred int(11) default NULL, - bounced int(11) default NULL, - rejected int(11) default NULL, - rbld int(11) default NULL, - spamcount int(11) default NULL, - spamscore int(11) default NULL, - viri int(11) default NULL, - PRIMARY KEY (hostname) -) TYPE=MyISAM; - diff -Nurb netmrg-0.19/contrib/maillogstats/maillogstats netmrg-0.20/ChangeLog/contrib/maillogstats/maillogstats --- netmrg-0.19/contrib/maillogstats/maillogstats 2005-10-14 07:38:50.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/maillogstats/maillogstats 1970-01-01 05:30:00.000000000 +0530 @@ -1,481 +0,0 @@ -#!/usr/bin/php -q - - */ - - - -/********** Config **********/ -//error_reporting(E_ALL); -error_reporting(E_WARNING | E_ERROR); -set_time_limit(0); - -// make a new $CFG object -class object {}; -$CFG = new object; - -$CFG->dbhost = "localhost"; -$CFG->dbuser = "maillog"; -$CFG->dbpass = "maillog"; -$CFG->dbname = "maillog"; - -$CFG->errorlog = "/var/log/maillogerror"; - -## check arguments -if ($argc == 2 && ($argv[1] == '-h' || $argv[1] == '-?' || $argv[1] == '--help')) { - Usage(); - exit(); -} // end if not enough command line args - -/* the stats array will look like this: - * array("host" => array( - * "connect" => value, - * "received" => value, - * "delivered" => value, - * "forwarded" => value, - * "deferred" => value, - * "bounced" => value, - * "rejected" => value, - * "rbld" => value, - * "spamcount" => value, - * "spamscore" => value, - * "viri" => value - * )); - * where host is the hostname and the array is all counters - */ -$stats = array(); - -// a counter for the number of relevant mail log lines parsed -$mailloglines = 0; - -// after how many lines should we flush the counters -$flushnumlines = 50; - -// connect to mysql -mysql_connect($CFG->dbhost, $CFG->dbuser, $CFG->dbpass) - or die("ERROR: cannot connect to server\n"); -mysql_select_db($CFG->dbname) - or die("ERROR: cannot connect to database\n"); - - - -/********** Core **********/ -if ($argc == 1) { - $logfile = "php://stdin"; // set the logfile as stdin -} elseif ($argc == 2) { - $logfile = $argv[1]; // set the logfile as the second parameter -} // end which logfile to use - -// initializes the $stats array w/ any old counter values that exist -CheckOldCounters($stats); - -// try to open the file -$logptr = fopen($logfile, "r"); -if (!$logptr) { - Error("ERROR: File Not Found '$logfile'"); - exit(); -} // end if file not found - -// lets do some parsing! -while (!feof ($logptr)) { - $line = fgets($logptr, 4096); - - // if this line is about postfix, do stuff w/ it - if (preg_match("/postfix/", $line)) { - $mailloglines++; - $linehalves = preg_split("/\[\d*\]: /U", $line); - // $basicinfo will have the following: - // month, day, time, host, "postfix" - $basicinfo = split("[ ]+", $linehalves[0]); - $statusinfo = $linehalves[1]; - unset($linehalves); - - // check to see if the $basicinfo section has - // the correct # of items in it - if (count($basicinfo) != 5) { - Error("POSTFIX: $line"); - } else { - if (!HostInStats($basicinfo[3], $stats)) { - AddHostToStats($basicinfo[3], $stats); - Error("POSTFIX ADDHOST: $line"); - } // end if host in stats or not - PostfixStats($basicinfo[3], $statusinfo, $stats); - - } // end if line is okay - - } else if(preg_match("/spamd/", $line)) { - $mailloglines++; - $linehalves = preg_split("/\[\d*\]: /U", $line); - // $basicinfo will have the following: - // month, day, time, host, "spamd" - $basicinfo = split("[ ]+", $linehalves[0]); - $statusinfo = $linehalves[1]; - unset($linehalves); - - // check to see if the $basicinfo section has - // the correct # of items in it - if (count($basicinfo) != 5) { - Error("SPAMD: $line"); - } else { - if (!HostInStats($basicinfo[3], $stats)) { - AddHostToStats($basicinfo[3], $stats); - Error("SPAMD ADDHOST: $line"); - } // end if host in stats or not - spamdScannerStats($basicinfo[3], $statusinfo, $stats); - - } // end if line is okay - - } else if(preg_match("/MailScanner/", $line)) { - $mailloglines++; - $linehalves = preg_split("/\[\d*\]: /U", $line); - // $basicinfo will have the following: - // month, day, time, host, "MailScanner" - $basicinfo = split("[ ]+", $linehalves[0]); - $statusinfo = $linehalves[1]; - unset($linehalves); - - // check to see if the $basicinfo section has - // the correct # of items in it - if (count($basicinfo) != 5) { - Error("MAILSCANNER: $line"); - } else { - if (!HostInStats($basicinfo[3], $stats)) { - AddHostToStats($basicinfo[3], $stats); - Error("MAILSCANNER ADDHOST: $line"); - } // end if host in stats or not - MailScannerStats($basicinfo[3], $statusinfo, $stats); - - } // end if line is okay - - // if imap log line - } else if(preg_match("/imapd/", $line)) { - $mailloglines++; - $linehalves = preg_split("/imapd: /U", $line); - // $basicinfo will have the following: - // month, day, time, host, "MailScanner" - $basicinfo = split("[ ]+", $linehalves[0]); - $statusinfo = $linehalves[1]; - unset($linehalves); - - // check to see if the $basicinfo section has - // the correct # of items in it - if (count($basicinfo) != 5) { - Error("IMAPD: $line"); - } else { - if (!HostInStats($basicinfo[3], $stats)) { - AddHostToStats($basicinfo[3], $stats); - Error("IMAPD ADDHOST: $line"); - } // end if host in stats or not - ImapScannerStats($basicinfo[3], $statusinfo, $stats); - - } // end if line is okay - - // if tpop3d log line - } else if(preg_match("/tpop3d/", $line)) { - $mailloglines++; - $linehalves = preg_split("/\[\d*\]: /U", $line); - // $basicinfo will have the following: - // month, day, time, host, "MailScanner" - $basicinfo = split("[ ]+", $linehalves[0]); - $statusinfo = $linehalves[1]; - unset($linehalves); - - // check to see if the $basicinfo section has - // the correct # of items in it - if (count($basicinfo) != 5) { - Error("TPOP3D: $line"); - } else { - if (!HostInStats($basicinfo[3], $stats)) { - AddHostToStats($basicinfo[3], $stats); - Error("TPOP3D ADDHOST: $line"); - } // end if host in stats or not - tpop3dScannerStats($basicinfo[3], $statusinfo, $stats); - - } // end if line is okay - - } // end if line is relevant - - // if we've seen enough log lines, flush them - if ($mailloglines % $flushnumlines == 0) { - OutputAllStats($stats); - } // end if it's time to output stats - -} // end for each line in maillog -fclose ($logptr); - -OutputAllStats($stats); -exit(); - - - -/********** FUNCTIONS **********/ - - -/* Usage(); output how to use this script - */ -function Usage() -{ - echo "\n"; - echo "== maillogstats filters a syslog maillog ==\n"; - echo " into separate counter files for hosts ==\n"; - echo "\n"; - echo " Usage: maillogstats \n"; - echo " | maillogstats"; - echo "\n"; - echo " -? | -h | --help : this message\n"; - echo "\n"; - echo "\n"; -} - - -/* Error($errortext); outputs $errortext to stderr - */ -function Error($errortext) -{ - error_log($errortext."\n\n", 3, "/dev/stderr"); -} - - -/* OutputCounters($host); outputs all the counters for a host to their own file - */ -function OutputCounters($hostname, $counters) -{ - global $CFG; - - // if counters are too big, wrap them around - reset($counters); - while (next($counters)) { - $countertype = key($counters); - $maxval = pow(2, 31); - if ($counters[$countertype] > $maxval) { - $counters[$countertype] = $counters[$countertype] - $maxval; - } // end if coutner is too big - } // end while still keys - reset($counters); - - // replace data in db - $host_query = "REPLACE INTO stats SET - hostname = '$hostname', - connect = '{$counters['connect']}', - received = '{$counters['received']}', - delivered = '{$counters['delivered']}', - forwarded = '{$counters['forwarded']}', - deferred = '{$counters['deferred']}', - bounced = '{$counters['bounced']}', - rejected = '{$counters['rejected']}', - rbld = '{$counters['rbld']}', - spamcount = '{$counters['spamcount']}', - spamscore = '{$counters['spamscore']}', - viri = '{$counters['viri']}'"; - - $host_result = mysql_query($host_query) or - die("ERROR: cannot perform query\n$host_query\n\n"); - -} // end OutputCounters(); - - -/* OutputAllStats($stats); write all the files for each host - */ -function OutputAllStats($stats) -{ - while (list($key, $val) = each($stats)) { - OutputCounters($key, $val); - } // end for each host in array -} // end OutputAllStats(); - - -/* CheckOldCounters($stats); reads in counter values that have already - * been set to initialize the stats variable - */ -function CheckOldCounters(&$stats) -{ - global $CFG; - - // check if host exists - $host_query = "SELECT * FROM stats"; - $host_result = mysql_query($host_query) or - die("ERROR: cannot perform query\n$host_query\n\n"); - - while ($r = mysql_fetch_array($host_result)) { - $stats[$r['hostname']] = array( - "connect" => $r['connect'], - "received" => $r['received'], - "delivered" => $r['delivered'], - "forwarded" => $r['forwarded'], - "deferred" => $r['deferred'], - "bounced" => $r['bounced'], - "rejected" => $r['rejected'], - "rbld" => $r['rbld'], - "spamcount" => $r['spamcount'], - "spamscore" => $r['spamscore'], - "viri" => $r['viri'] - ); // end of array - } // end while each result - -} // end CheckOldCounters(); - - -/* HostInStats($hostname, $stats); check to see if we're already - * keeping stats on a host - */ -function HostInStats($hostname, $stats) -{ - global $CFG; - - while (list($key, $val) = each($stats)) { - if ($hostname == $key) { - return true; - } // end if key == hostname - } // end for each host in array - - return false; -} // end HostInStats(); - - -/* AddHostToStats($hostname, &$stats); initializes array for host in stats - */ -function AddHostToStats($hostname, &$stats) -{ - global $CFG; - - $stats[$hostname] = array( - "connect" => 0, - "received" => 0, - "delivered" => 0, - "forwarded" => 0, - "deferred" => 0, - "bounced" => 0, - "rejected" => 0, - "rbld" => 0, - "spamcount" => 0, - "spamscore" => 0, - "viri" => 0 - ); // end of array -} // end AddHostToStats(); - - -/* PostfixStats($hostname, $statusinfo, &$stats); increment the correct counter - */ -function PostfixStats($hostname, $statusinfo, &$stats) -{ - global $CFG; - - // mail was rbl'd - if (eregi("reject:", $statusinfo) && - eregi("blocked", $statusinfo)) { - $stats[$hostname]["rbld"]++; - $stats[$hostname]["rejected"]++; - - // mail was rejected - } elseif (eregi("reject:", $statusinfo)) { - $stats[$hostname]["rejected"]++; - - // mail was accepted - } elseif (eregi("message-id=<", $statusinfo)) { - $stats[$hostname]["received"]++; - - // mail was forwarded - } elseif (eregi("forwarded as", $statusinfo)) { - $stats[$hostname]["forwarded"]++; - - // mail was sent - } elseif (eregi("status=sent", $statusinfo)) { - $stats[$hostname]["delivered"]++; - - // mail was deferred (can't deliver) - } elseif (eregi("status=deferred", $statusinfo)) { - $stats[$hostname]["deferred"]++; - - // mail was bounded (no local user) - } elseif (eregi("status=bounced", $statusinfo)) { - $stats[$hostname]["bounced"]++; - - } // end bounced - - // connection from client - // Mar 30 11:19:21 mx02 postfix/smtpd[15978]: connect from 69.37.28.78.adsl.snet.net[69.37.28.78] - else if (preg_match("/connect from/", $statusinfo)) - { - $stats[$hostname]["connect"]++; - } // end connection - -} // end PostfixStats(); - - -/* MailScannerStats($hostname, $statusinfo, &$stats); increment the correct counter - */ -function MailScannerStats($hostname, $statusinfo, &$stats) -{ - global $CFG; - - // mail was spam - // Message 3D65D1870 from 193.111.199.194 (excite.com) is spam according to SpamAssassin (score=19.5, required 6, ALL_CAP_PORN, BEST_PORN, BIG_FONT, CTYPE_JUST_HTML, DATE_IN_FUTURE_06_12, FAKED_UNDISC_RECIPS, FREE_PORN, HTML_FONT_COLOR_CYAN, HTML_FONT_COLOR_GREEN, HTML_FONT_COLOR_YELLOW, INVALID_DATE_TZ_ABSURD, LINES_OF_YELLING, MANY_EXCLAMATIONS, MIME_LONG_LINE_QP, NORMAL_HTTP_TO_IP, SPAM_PHRASE_03_05, SUBJ_FREE_CAP, SUBJ_HAS_SPACES, TO_HAS_SPACES, WEIRD_PORT) - if (preg_match("/from [\d\.]*.*SpamAssassin \(score=([\d\.]*),/", $statusinfo, $matches)) { - $stats[$hostname]["spamcount"]++; - $stats[$hostname]["spamscore"] += $matches[1]; - - // mail had a virus - // Virus Scanning: Found 1 viruses - } else if (preg_match("/Virus Scanning: Found (\d+) viruses/", $statusinfo, $matches)) { - $stats[$hostname]["viri"] += $matches[1]; - - } // end if (what is this log) - -} // end MailScannerStats(); - - -/* ImapScannerStats($hostname, $statusinfo, &$stats); increment the correct counter - */ -function ImapScannerStats($hostname, $statusinfo, &$stats) -{ - global $CFG; - - // connection - // Jun 23 09:50:46 imap0 imapd: LOGIN, user=zlove@va.net, ip=[::ffff:205.166.61.177], protocol=IMAP - if (preg_match("/LOGIN, user=/", $statusinfo, $matches)) - { - $stats[$hostname]["connect"]++; - } // end connection - -} // end ImapScannerStats(); - - -/* tpop3dScannerStats($hostname, $statusinfo, &$stats); increment the correct counter - */ -function tpop3dScannerStats($hostname, $statusinfo, &$stats) -{ - global $CFG; - - // connection - // Mar 30 11:14:56 pop0 tpop3d[4811]: authcontext_new_user_pass: began session for `obslaw7' with mysql; uid 8, gid 12 - if (preg_match("/authcontext_new_user_pass: began session for/", $statusinfo, $matches)) - { - $stats[$hostname]["connect"]++; - } // end connection - -} // end tpop3dScannerStats(); - - -/* spamdScannerStats($hostname, $statusinfo, &$stats); increment the correct counter - */ -function spamdScannerStats($hostname, $statusinfo, &$stats) -{ - global $CFG; - - // spam - // Oct 13 22:02:20 argo.pyxos.net spamd[3822]: identified spam (19.7/10.0) for dlittle:501 in 1.8 seconds, 1668 bytes. - if (preg_match("/identified spam \(([\d\.]+)\/[\d\.]+\)/", $statusinfo, $matches)) - { - $stats[$hostname]["spamcount"]++; - $stats[$hostname]["spamscore"] += $matches[1]; - } // end spam - // Oct 13 22:03:13 argo.pyxos.net spamd[3888]: clean message (-0.9/5.0) for silfreed:500 in 2.1 seconds, 1195 bytes. - -} // end spamdScannerStats(); - - -?> diff -Nurb netmrg-0.19/contrib/maillogstats/README netmrg-0.20/ChangeLog/contrib/maillogstats/README --- netmrg-0.19/contrib/maillogstats/README 2004-08-14 18:49:27.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/maillogstats/README 1970-01-01 05:30:00.000000000 +0530 @@ -1,45 +0,0 @@ -== maillogstat filters a syslog maillog == -== into separate counter files for hosts == - Usage: maillogfilter.php - | maillogfilter.php - -? | -h | --help : this message - - -This program takes a maillog syslog feed in, and puts some nifty stats back out. -You'll need to make a fifo (`mkfifo /var/log/maillog-pipe.log` - probably -`chmod 600 /var/log/maillog-pipe.log` also), and send your syslog feed to it; -with a line similar to this: ---- syslog.conf start --- -mail.* |/var/log/maillog-pipe.log ---- syslog.conf stop --- - -It's very useful to put this into your inittab, with a line similar to this: ---- inittab start --- -# maillog stats -ml:3:respawn:/usr/local/bin/maillogfilter/maillogfilter /var/log/maillog-pipe.log ---- inittab stop --- - -make sure you setup your mysql database with the table in maillog.mysql. - -To setup the NetMRG side of things, you'll need to add an SQL test. The test -I commonly use uses this query (be sure to fill in the rest of the info): -SELECT %parameters% FROM maillogstats.stats WHERE hostname = '%mailloghost%' - -Then, I create a sub-device for the device that I want to monitor with a -parameter named 'mailloghost' and the hostname that shows up in your tables. -When you add your monitors to this sub-device, add a parameters field for each -column you want to graph, I usually add a monitor for each of the following -columns as parameters: -connect -received -delivered -forwarded -deferred -bounced -rejected - -Next, you'll want to create a template graph out of these using whatever colors, -etc that you want (see http://demo.netmrg.net/ for an example). - -If you experience any problems, be sure to demand your money back. - diff -Nurb netmrg-0.19/contrib/powerconnect27xx/powerconnect27xx.php netmrg-0.20/ChangeLog/contrib/powerconnect27xx/powerconnect27xx.php --- netmrg-0.19/contrib/powerconnect27xx/powerconnect27xx.php 2005-06-12 00:45:08.000000000 +0530 +++ netmrg-0.20/ChangeLog/contrib/powerconnect27xx/powerconnect27xx.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,49 +0,0 @@ - diff -Nurb netmrg-0.19/debian/changelog netmrg-0.20/ChangeLog/debian/changelog --- netmrg-0.19/debian/changelog 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/changelog 1970-01-01 05:30:00.000000000 +0530 @@ -1,198 +0,0 @@ -netmrg (0.19-4.1) unstable; urgency=low - - * Non-maintainer upload. - * Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455445) - - -- Marc 'HE' Brockschmidt Sun, 16 Mar 2008 19:12:14 +0100 - -netmrg (0.19-4) unstable; urgency=low - - * netmrg-gather is less verbose when run in cron job to prevent - sending a mail every five minutes (Closes: #445027) - - -- Uwe Steinmann Wed, 03 Oct 2007 22:55:42 +0200 - -netmrg (0.19-3) unstable; urgency=low - - * do not check if /usr/share/debconf/confmodule is executable - in postrm, because it isn't. Only check if it is present. - - -- Uwe Steinmann Wed, 29 Aug 2007 16:48:32 +0200 - -netmrg (0.19-2) unstable; urgency=low - - * do not include gettext.h in src/include/common.h because it doesn't - compile on amd64. include libintl.h instead (closes: #439653) - - -- Uwe Steinmann Wed, 29 Aug 2007 15:58:33 +0200 - -netmrg (0.19-1) unstable; urgency=low - - * New upstream release - * fixed many lintian errors in deb conf questions - * fixed linitan error debian-rules-ignores-make-clean-error - * updated translation of debconf po files (Closes: #429347) - - -- Uwe Steinmann Wed, 22 Aug 2007 15:10:21 +0200 - -netmrg (0.18.2-17) unstable; urgency=low - - * set home of new user netmrg to /var/lib/netmrg - * added configuration for php5 in apache config file netmrg.conf - * setting min/max value of graphs no longer fails. Backport from - version 0.19. (Closes: #412548) - - -- Uwe Steinmann Tue, 29 May 2007 12:25:25 +0200 - -netmrg (0.18.2-16) unstable; urgency=low - - * Added new script linuxpmu.sh to read data from /proc/pmu - * Fixed error in sql statement in conditions.php because the - field name 'condition' is a reserved word. - * Fixed lintian error in netmrg.doc-base by removing empty - lines from the end of the file - - -- Uwe Steinmann Mon, 28 May 2007 12:56:05 +0200 - -netmrg (0.18.2-15) unstable; urgency=low - - * netmrg_cron.sh doesn't stumple over a stale logfile anymore - (Closes: #386109) - * added script to get cpu temperature reported by lmsensors (Closes: #412555) - many thanks to Francois Gouget for providing this script - * improved script linux26diskaccess.pl can now also report the number - of read/written blocks (Closes: #412549) - many thanks to Francois Gouget for providing the improved script - - -- Uwe Steinmann Sun, 20 May 2007 19:08:40 +0200 - -netmrg (0.18.2-14.1) unstable; urgency=high - - * Non-maintainer upload during BSP. - * Fix unconditional use of debconf in postrm (Closes: #417011). - * Add php5 alternatives to dependencies (Closes: #424801). - - -- Luk Claes Sat, 19 May 2007 17:45:35 +0200 - -netmrg (0.18.2-14) unstable; urgency=low - - * Rebuild against the new libmysqlclient15off with correct symbols. - (Ubuntu patch) - * added portugese translation (Closes: #375050) - * fixed name of text documentation in doc-base. - - -- Uwe Steinmann Fri, 28 Jul 2006 07:56:04 +0200 - -netmrg (0.18.2-13) unstable; urgency=low - - * Build-Depend on libmysqlclient15-dev (Closes: #343786) - - -- Uwe Steinmann Tue, 20 Dec 2005 09:12:44 +0100 - -netmrg (0.18.2-12) unstable; urgency=low - - * Build-Depend on libmysqlclient14 - * Fixed mysql dump to work with new mysql versions - (Closes: #334436, #334436) - * Do not remove the database user in case of failure during configuration - if the user was not created by postinst itself - - -- Uwe Steinmann Tue, 18 Oct 2005 19:48:15 +0200 - -netmrg (0.18.2-11) unstable; urgency=low - - * run cronjob only if /usr/bin/netmrg_cron.sh is present - - -- Uwe Steinmann Tue, 13 Sep 2005 08:39:16 +0200 - -netmrg (0.18.2-10.1) unstable; urgency=medium - - * NMU during BSP. - * var/lib/rrd/zero.xml: Update for rrdtool 1.2. Closes: #323725. - * Link against libsnmp9. - - -- Matej Vela Mon, 12 Sep 2005 10:56:24 +0200 - -netmrg (0.18.2-10) unstable; urgency=low - - * be more tidy in clean target of debian/rules - * move web files from /var/www to /usr/share/netmrg - - -- Uwe Steinmann Tue, 19 Jul 2005 08:54:16 +0200 - -netmrg (0.18.2-9) unstable; urgency=low - - * added vietnamese translation of debconf template (Closes: #315915) - - -- Uwe Steinmann Mon, 27 Jun 2005 10:29:10 +0200 - -netmrg (0.18.2-8) unstable; urgency=low - - * added missing dependency on mysql-client (Closes: #313660) - * fixed typo in debian/po/de.po (Closes: #313947) - - -- Uwe Steinmann Wed, 15 Jun 2005 07:38:04 +0200 - -netmrg (0.18.2-7) unstable; urgency=low - - * added czech translation of debconf template (Closes: #309077) - - -- Uwe Steinmann Wed, 18 May 2005 10:32:41 +0100 - -netmrg (0.18.2-6) unstable; urgency=low - - * depend on adduser since it is used in postinst - - -- Uwe Steinmann Tue, 10 May 2005 10:16:21 +0100 - -netmrg (0.18.2-5) unstable; urgency=low - - * added french translation of debconf template (Closes: #306233) - * make it build depend on libmysqlclient12-dev - - -- Uwe Steinmann Fri, 6 May 2005 11:01:47 +0100 - -netmrg (0.18.2-4) unstable; urgency=low - - * fixed error when creating new user netmrg - * set shell of user netmrg to /bin/bash in case the user already exists - * restart web server after installation and deinstallation - * delete user when purging the package - * added one missing german translation - * remove log files if user gave permission during configuration - * allow changing password of netmrg user during reconfiguration - * actually rewrite the netmrg configuration file after reconfiguration - - -- Uwe Steinmann Tue, 15 Feb 2005 14:30:05 +0100 - -netmrg (0.18.2-3) unstable; urgency=low - - * new user netmrg gets real shell to make crontab work - - -- Uwe Steinmann Tue, 15 Feb 2005 10:10:15 +0100 - -netmrg (0.18.2-2) unstable; urgency=low - - * Added support for apache2 - - -- Uwe Steinmann Tue, 8 Feb 2005 08:23:51 +0100 - -netmrg (0.18.2-1) unstable; urgency=low - - * New upstream release - * First official debian release (Closes: #271924) - - -- Uwe Steinmann Fri, 14 Jan 2005 16:07:24 +0100 - -netmrg (0.18.1-1) unstable; urgency=low - - * New upstream release - - -- Uwe Steinmann Wed, 3 Nov 2004 18:53:19 +0100 - -netmrg (0.17-1) unstable; urgency=low - - * Initial Release. - - -- Uwe Steinmann Tue, 14 Sep 2004 10:42:21 +0200 - diff -Nurb netmrg-0.19/debian/compat netmrg-0.20/ChangeLog/debian/compat --- netmrg-0.19/debian/compat 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/compat 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -4 diff -Nurb netmrg-0.19/debian/config netmrg-0.20/ChangeLog/debian/config --- netmrg-0.19/debian/config 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/config 1970-01-01 05:30:00.000000000 +0530 @@ -1,188 +0,0 @@ -#!/bin/bash - -set -e - -. /usr/share/debconf/confmodule - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -db_version 2.0 - -if [ "$1" = "reconfigure" ] ; then - # Rotate old configuration - configs="/etc/netmrg/netmrg.xml" - for config in $configs ; do - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] - then mv ${config}.$i ${config}.$(($i +1)) - fi - done - cp ${config} ${config}.0 - done -fi - -step=1 -finished="false" -checkagain="true" -dbexists="false" -db_capb backup -while ! $finished ; do - skip="false" - password="" - confirm="" - case $step in - 1) # Ask for web server type. - db_input medium "netmrg/webserver" || true - next=`expr $step + 1` - previous="-1" - ;; - 2) # Ask on wich host the DBMS is installed. - db_input critical "netmrg/db/host" || true - previous=`expr $step - 1` - next=`expr $step + 1` - ;; - 3) # Get the database administrator name and password. - db_get "netmrg/db/admin/name" - if [ -z "$RET" ] ; then - dbadmname="root" - if [ -n "$dbadmname" ] ; then - db_set "netmrg/db/admin/name" $dbadmname - fi - fi - db_beginblock - db_input critical "netmrg/db/admin/name" || true - db_input critical "netmrg/db/admin/password" || true - db_endblock - previous=`expr $step - 1` - next=`expr $step + 1` - ;; - 4) # Ask for DB name. - db_input critical "netmrg/db/name" || true - previous=`expr $step - 1` - next=`expr $step + 1` - ;; - 5) # Check if DB already exists - if [ "$1" = "configure" ] ; then - if $checkagain ; then - db_get "netmrg/db/name" - dbname="$RET" - db_get "netmrg/db/admin/name" - dbadmin="$RET" - db_get "netmrg/db/admin/password" - dbadmpass="$RET" - . /usr/share/wwwconfig-common/mysql.get - if eval $mysqlcmd $dbname -e '"show tables;"' | grep graphs >/dev/null 2>&1 ; then - db_subst "netmrg/db/exists" "dbname" $dbname - db_input critical "netmrg/db/exists" || true - db_go -# db_fset "netmrg/db/name" "seen" "false" || true - db_input critical "netmrg/db/name" || true - next=`expr $step + 1` - previous=`expr $step - 1` - else - skip="true" - next=`expr $step + 1` - fi - checkagain="false" - else - skip="true" - next=`expr $step + 1` - fi - else - checkagain="false" - skip="true" - next=`expr $step + 1` - fi - ;; - 6) # Get the DBMS account username - db_input critical "netmrg/db/user/name" || true - previous=`expr $step - 1` - next=`expr $step + 1` - ;; - 7) # Get the DBMS account password - db_beginblock - db_input critical "netmrg/db/user/password" || true - db_input critical "netmrg/db/user/password/confirm" || true - db_endblock - previous=`expr $step - 1` - next=`expr $step + 1` - ;; - 8) # Check if passwords match. - db_get "netmrg/db/user/password" - password="$RET" - db_get "netmrg/db/user/password/confirm" - confirm="$RET" - if [ "$password" != "$confirm" ] ; then - # Reset the template used - db_reset "netmrg/db/user/password" || true - db_fset "netmrg/db/user/password" "seen" "false" || true - db_reset "netmrg/db/user/password/confirm" || true - db_fset "netmrg/db/user/password/confirm" "seen" "false" || true - # Promt the user - db_input critical "netmrg/db/user/password/mismatch" || true - # Do one step back anyway. - next=`expr $step - 1` - previous=`expr $step - 1` - else - # Do not prompt, go to the next step. - skip="true" - next=`expr $step + 1` - fi - ;; - 9) # Ask for deleting all the database on package purge. - db_input medium "netmrg/postrm" || true - next=`expr $step + 1` - previous=`expr $step - 1` - ;; - 10) # Ask for web host. - db_input medium "netmrg/web/host" || true - next=`expr $step + 1` - previous=`expr $step - 1` - ;; - 11) # Ask for company name. - db_input medium "netmrg/company/name" || true - next=`expr $step + 1` - previous=`expr $step - 1` - ;; - 12) # Ask for company url. - db_input medium "netmrg/company/link" || true - next=-1 - previous=`expr $step - 1` - ;; - -1) finished="true" - # if this is an initial configure run and the database is fresh - # then warn the user about the predefined password - if [ "$1" = "configure" -a ! $dbexists ] ; then - db_fset "netmrg/configuration/note" "seen" "false" || true - fi - db_beginblock - db_subst "netmrg/configuration/note" "site" `hostname -f` - db_input medium "netmrg/configuration/note" || true - db_endblock - ;; - *) - skip="true" - message="Unknown step #$step." - if [ $step -gt 12 ] || [ $step -le 0 ] ; then - finished="true" - fi - ;; - esac - - if ! $skip ; then - db_title "netmrg" || true - if db_go ; then - step=$next - else - step=$previous - fi - else - step=$next - fi -done - -db_stop - -exit 0 diff -Nurb netmrg-0.19/debian/control netmrg-0.20/ChangeLog/debian/control --- netmrg-0.19/debian/control 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/control 1970-01-01 05:30:00.000000000 +0530 @@ -1,17 +0,0 @@ -Source: netmrg -Section: net -Priority: optional -Maintainer: Uwe Steinmann -Build-Depends: rrdtool, debhelper (>= 4.1.16), debconf, libxml2-dev, libmysqlclient15-dev, libsnmp-dev, xsltproc, docbook-xsl -Standards-Version: 3.7.2 - -Package: netmrg -Architecture: any -Depends: adduser, rrdtool, apache2 | httpd, php5 | php4 | php5-cgi | php4-cgi, php5-cli | php4-cli, php5-mysql | php4-mysql, mysql-client, debconf, wwwconfig-common, ${shlibs:Depends}, ${misc:Depends} -Suggests: mysql-server -Description: network monitoring tool - NetMRG is a database-driven network monitoring - and graphing tool for use on Linux systems. It offers an intuitive - web-based configuration, customized monitoring capabilities for - unusual situations, a fast multi-threaded polling application, and - brilliant graphs rendered by RRDTOOL. diff -Nurb netmrg-0.19/debian/copyright netmrg-0.20/ChangeLog/debian/copyright --- netmrg-0.19/debian/copyright 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/copyright 1970-01-01 05:30:00.000000000 +0530 @@ -1,10 +0,0 @@ -This package was debianized by Uwe Steinmann on -Tue, 14 Sep 2004 10:42:21 +0200. - -It was downloaded from http://www.netmrg.net - -Upstream Authors: Brady Alleman and Douglas E. Warner - -Copyright: - -This project is licensed under the terms of the MIT License. diff -Nurb netmrg-0.19/debian/cron.d netmrg-0.20/ChangeLog/debian/cron.d --- netmrg-0.19/debian/cron.d 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/cron.d 1970-01-01 05:30:00.000000000 +0530 @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the netmrg package -# -*/5 * * * * netmrg test -x /usr/bin/netmrg-gatherer && /usr/bin/netmrg-gatherer -l31 diff -Nurb netmrg-0.19/debian/dirs netmrg-0.20/ChangeLog/debian/dirs --- netmrg-0.19/debian/dirs 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/dirs 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -usr/bin diff -Nurb netmrg-0.19/debian/docs netmrg-0.20/ChangeLog/debian/docs --- netmrg-0.19/debian/docs 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/docs 1970-01-01 05:30:00.000000000 +0530 @@ -1,2 +0,0 @@ -README -debian/update-from-*.sql diff -Nurb netmrg-0.19/debian/netmrg.doc-base netmrg-0.20/ChangeLog/debian/netmrg.doc-base --- netmrg-0.19/debian/netmrg.doc-base 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/netmrg.doc-base 1970-01-01 05:30:00.000000000 +0530 @@ -1,13 +0,0 @@ -Document: netmrg -Title: netmrg Manual -Author: Brady Alleman and Douglas E. Warner -Abstract: This manual describes what netmrg is - and how it can be used. -Section: net - -Format: text -Files: /usr/share/doc/netmrg/netmrg.txt.gz - -Format: HTML -Index: /usr/share/doc/netmrg/html/index.html -Files: /usr/share/doc/netmrg/html/*.html diff -Nurb netmrg-0.19/debian/po/cs.po netmrg-0.20/ChangeLog/debian/po/cs.po --- netmrg-0.19/debian/po/cs.po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/cs.po 1970-01-01 05:30:00.000000000 +0530 @@ -1,250 +0,0 @@ -# Czech translation of netmrg templates -# -msgid "" -msgstr "" -"Project-Id-Version: netmrg 0.18.2-5\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: 2007-06-05 09:02+0200\n" -"Last-Translator: Martin Sin \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: select -#. choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "Žádný, Apache2, Apache, Apache-SSL, VÅ¡echny" - -#. Type: select -#. description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "Nastavit webový server:" - -#. Type: string -#. default -#: ../templates:2001 -msgid "localhost" -msgstr "localhost" - -#. Type: string -#. description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "Jméno poÄítaÄe s databází mysql:" - -#. Type: string -#. default -#. Type: string -#. default -#: ../templates:3001 ../templates:5001 -msgid "netmrg" -msgstr "netmrg" - -#. Type: string -#. description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "Název databáze:" - -#. Type: note -#. description -#: ../templates:4002 -msgid "The database already exists" -msgstr "Databáze již existuje" - -#. Type: note -#. description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "" -"Jednoduchý test ukázal, že databáze se jménem \"${dbname}\" již existuje. " -"PravdÄ›podobnÄ› se jedná o databázi netmrg. Pokud si skuteÄnÄ› pÅ™ejete používat " -"tuto databázi, pak v dalším kroku potvrÄte její název." - -#. Type: string -#. description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "Jméno uživatele databáze:" - -#. Type: string -#. description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "Tento uživatel bude mít práva Ätení/zápisu k databázi netmrg." - -#. Type: password -#. description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "Heslo uživatele databáze:" - -#. Type: password -#. description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "PotvrÄte heslo uživatele databáze:" - -#. Type: text -#. description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "Hesla nesouhlasí" - -#. Type: text -#. description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "Hesla, která jste zadali nesouhlasí. Zadejte je prosím znovu." - -#. Type: string -#. description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "Jméno administrátora databázového systému:" - -#. Type: string -#. description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "" -"Abych (pro program netmrg) mohl vytvoÅ™it požadovanou databázi a uživatele " -"databáze, potÅ™ebuji znát pÅ™ihlaÅ¡ovací jméno administrátora databázového " -"systému." - -#. Type: password -#. description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "Heslo administrátora databázového systému:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "Jméno webového poÄítaÄe:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "" -"Uživatelské rozhraní programu netmrg používá web. Adresy url webového " -"rozhraní netmrg používají hostitelský název webového serveru. Obvykle staÄí " -"ponechat toto políÄko prázdné." - -#. Type: string -#. description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "Jméno vaší spoleÄnosti:" - -#. Type: string -#. description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "" -"Webová aplikace netmrg zobrazuje jméno vaší spoleÄnosti v záhlaví každé " -"webové stránky." - -#. Type: string -#. default -#: ../templates:13001 -msgid "http://" -msgstr "http://" - -#. Type: string -#. description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "Adresa Url webových stránek vaší spoleÄnosti:" - -#. Type: string -#. description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "" -"Kliknutím na jméno spoleÄnosti pÅ™ejdete na tento odkaz. Obvykle se " -"zde zadává url adresa směřující na úvodní webovou stránku vaší spoleÄnosti." - -#. Type: boolean -#. default -#: ../templates:14001 -msgid "true" -msgstr "ano" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "Smazat data po odstranÄ›ní programu?" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "" -"OdstranÄ›ní balíÄku obvykle odstraní vÅ¡echna data získaná tímto programem " -"vÄetnÄ› souborů logu. Zvolte 'ne', pokud si pÅ™ejete zachovat databázi mysql " -"a datové soubory i když nÄ›kdy v budoucnu odstraníte balíÄek netmrg." - -#. Type: note -#. description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "KonfiguraÄní poznámka balíÄku" - -#. Type: note -#. description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "" -"BalíÄek byl úspěšnÄ› nainstalován a nastaven. Ve svém prohlížeÄi zadejte " -"adresu http://${site}/netmrg/ a pÅ™ihlaste se jako uživatel 'admin' s heslem " -"'nimda'. Toto heslo prosím změňte co nejdříve, protože se jedná o výchozí " -"heslo instalace netmrg." - -#. Type: note -#. description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "Chyba pÅ™i vytváření databáze" - -#. Type: note -#. description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "Chyba pÅ™i vytváření uživatele databáze" - -#. Type: note -#. description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "Chyba pÅ™i vytváření databázových tabulek" - -#~ msgid "Which name would you like for the database user?" -#~ msgstr "Jaké jméno si přejete pouşít pro databázového uÅŸivatele?" diff -Nurb netmrg-0.19/debian/po/de.po netmrg-0.20/ChangeLog/debian/po/de.po --- netmrg-0.19/debian/po/de.po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/de.po 1970-01-01 05:30:00.000000000 +0530 @@ -1,264 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: 2007-05-29 19:41+0200\n" -"Last-Translator: Uwe Steinmann \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: select -#. choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "Keiner, Apache2, Apache, Apache-SSL, Alle" - -#. Type: select -#. description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "Zu konfigurierender Web-Server:" - -#. Type: string -#. default -#: ../templates:2001 -msgid "localhost" -msgstr "localhost" - -#. Type: string -#. description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "Name des Rechners auf dem sich der mysql Datenbank-Server befindet:" - -#. Type: string -#. default -#. Type: string -#. default -#: ../templates:3001 ../templates:5001 -msgid "netmrg" -msgstr "netmrg" - -#. Type: string -#. description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "Name der Datenbank:" - -#. Type: note -#. description -#: ../templates:4002 -msgid "The database already exists" -msgstr "Die Datenbank existiert bereits" - -#. Type: note -#. description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "" -"Ein einfacher Test deutet darauf hin, dass eine Datenbank mit dem Namen " -"\"${dbname}\" schon existiert und es sich dabei um eine netmrg Datenbank " -"handelt. Wenn Sie diese Datenbank tatsächlich verwenden wollen, dann " -"bestätigen Sie den Namen im nächsten Schritt." - -#. Type: string -#. description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "Name des Datenbank-Benutzer:" - -#. Type: string -#. description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "" -"Dieser Benutzer greift später lesend und schreibend auf die Datenbank zu." - -#. Type: password -#. description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "Passwort des Datenbank-Benutzer:" - -#. Type: password -#. description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "Bestätigen Sie das Passwort für den Datenbank-Benutzer:" - -#. Type: text -#. description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "Passwörter sind ungleich" - -#. Type: text -#. description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "" -"Die beiden Passwörter des Datenbank-Benutzers sind unterschiedlich. " -"Versuchen Sie es nochmal" - -#. Type: string -#. description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "Name des Datenbank-Systemadministrators:" - -#. Type: string -#. description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "" -"Um die initiale Datenbank und den Datenbank-Benutzer von netmrg anzulegen, " -"bedarf es des Anmeldenamens des Datenbank-Systemadministrators." - -#. Type: password -#. description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "Passwort des Datenbank-Systemadministrator:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "Name des Web-Hosts:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "" -"netmrgs Bedienschnittstelle ist webbasiert. Der Hostname des Webservers wird " -"für URLs innerhalb der Bedienschnittstelle verwendet. In der Regel kann " -"dieses Feld leer gelassen werden." - -#. Type: string -#. description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "Name Ihrer Firma:" - -#. Type: string -#. description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "" -"Das Web-Frontend von netmrg zeigt im Kopf jeder Web-Seite " -"ihren Firmennamen an." - -#. Type: string -#. default -#: ../templates:13001 -msgid "http://" -msgstr "http://" - -#. Type: string -#. description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "URL ihre Firmen-Website:" - -#. Type: string -#. description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "" -"Ein Mausklick auf den Firmennamen verfolgt diesen Link. Es ist für " -"gewöhnlich die URL der Startseite Ihrer Firmen-Website." - -#. Type: boolean -#. default -#: ../templates:14001 -msgid "true" -msgstr "true" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "Sollen die Daten nach dem Löschen der Software auch gelöscht werden?" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "" -"Das vollständige Löschen eines Pakets entfernt für gewöhnlich auch alle " -"gesammelten Daten und die Log-Dateien. Wählen Sie 'nein', wenn Sie die mysql " -"Datenbank und die Datendateien behalten wollen, auch wenn das Paket zu einem " -"späteren Zeitpunkt vollständig gelöscht wird." - -#. Type: note -#. description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "Bemerkung zur Paket-Konfiguration" - -#. Type: note -#. description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "" -"Das Paket wurde erfolgreich installiert und konfiguriert. Besuchen Sie nun " -"mit ihrem Web-Browser die Seite http://${site}/netmrg/ und melden Sie sich " -"als Benutzer 'admin' mit dem Passwort 'nimda' an. Stellen Sie sicher, dass " -"das Passwort so schnell wie möglich geändert wird, weil es das " -"voreingestellte Passwort aller netmrg-Installationen ist." - -#. Type: note -#. description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "Fehler beim Anlegen der Datenbank" - -#. Type: note -#. description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "Fehler beim Anlegen des Datenbank-Benutzers" - -#. Type: note -#. description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "Fehler beim Anlegen der Datenbank-Tabellen" - diff -Nurb netmrg-0.19/debian/po/fr.po netmrg-0.20/ChangeLog/debian/po/fr.po --- netmrg-0.19/debian/po/fr.po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/fr.po 1970-01-01 05:30:00.000000000 +0530 @@ -1,267 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: netmrg_0.18.2-17\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: 2007-06-05 22:27+0100\n" -"Last-Translator: Steve Petruzzello \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-SourceCharset: iso-8859-1\n" - -#. Type: select -#. choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "Aucun, Apache2, Apache, Apache-SSL, Tous" - -#. Type: select -#. description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "Serveur Web à configurer :" - -#. Type: string -#. default -#: ../templates:2001 -msgid "localhost" -msgstr "localhost" - -#. Type: string -#. description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "Nom d'hôte du serveur de bases de données MySQL :" - -#. Type: string -#. default -#. Type: string -#. default -#: ../templates:3001 ../templates:5001 -msgid "netmrg" -msgstr "netmrg" - -#. Type: string -#. description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "Nom de la base de données :" - -#. Type: note -#. description -#: ../templates:4002 -msgid "The database already exists" -msgstr "La base de données existe déjà" - -#. Type: note -#. description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "" -"Une base de données nommée « ${dbname} » existe déjà et semble être une base " -"de données de netmrg. Si vous souhaitez utiliser cette base de données, " -"veuillez le confirmer à la prochaine étape." - -#. Type: string -#. description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "Mot de passe de l'utilisateur de la base de données :" - -#. Type: string -#. description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "" -"Veuillez choisir l'identifiant qui aura les droits de lecture et d'écriture " -"sur la base de données de netmrg." - -#. Type: password -#. description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "Mot de passe de l'utilisateur de la base de données :" - -#. Type: password -#. description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "Confirmation du mot de passe de l'utilisateur de la base de données :" - -#. Type: text -#. description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "Mots de passe différents" - -#. Type: text -#. description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "" -"Les mots de passe pour l'utilisateur de la base de données ne correspondent " -"pas. Veuillez réessayer." - -#. Type: string -#. description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "Mot de passe de l'administrateur du serveur de bases de données:" - -#. Type: string -#. description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "" -"Pour créer la base de données initiale pour netmrg ainsi que son " -"utilisateur, vous devez indiquer l'identifiant de l'administrateur du " -"serveur de bases de données." - -#. Type: password -#. description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "Mot de passe de l'administrateur du serveur de bases de données :" - -#. Type: string -#. description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "Nom d'hôte de netmrg :" - -#. Type: string -#. description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "" -"Netmrg utilise une interface web. Le nom d'hôte du serveur web déterminera " -"les URL utilisées. Il est conseillé de laisser ce champ vide." - -#. Type: string -#. description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "Nom de l'entreprise :" - -#. Type: string -#. description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "" -"L'interface web de netmrg affiche le nom de l'entreprise dans l'en-tête de " -"chaque page web." - -#. Type: string -#. default -#: ../templates:13001 -msgid "http://" -msgstr "http://" - -#. Type: string -#. description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "URL du site web de l'entreprise :" - -#. Type: string -#. description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "" -"Veuillez indiquer l'URL qui sera atteinte en cliquant sur le nom " -"l'entreprise." - -#. Type: boolean -#. default -#: ../templates:14001 -msgid "true" -msgstr "vrai" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "Faut-il effacer les données à la purge du paquet ?" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "" -"La purge d'un paquet supprime toutes les données ainsi que les fichiers " -"journaux créés par le programme. Refusez cette option si vous désirez " -"conserver la base de données MySQL ainsi que les fichiers de données même " -"dans l'éventualité d'une purge future du paquet netmrg." - -#. Type: note -#. description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "Note sur la configuration du paquet" - -#. Type: note -#. description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "" -"L'installation et la configuration du paquet se sont terminées avec succès. " -"Vous pouvez maintenant pointer votre navigateur sur http://${site}/netmrg/ " -"et vous connecter en tant qu'utilisateur « admin » avec le mot de passe " -"« nimda ». N'oubliez pas de modifier ce mot de passe puisque c'est celui " -"utilisé par défaut par toutes les installations de netmrg." - -#. Type: note -#. description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "Erreur lors de la création de la base de données" - -#. Type: note -#. description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "Erreur lors de la création du propriétaire de la base de données" - -#. Type: note -#. description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "Erreur lors de la création des tables de la base de données" - -#~ msgid "Which name would you like for the database user?" -#~ msgstr "Identifiant pour la base de données :" diff -Nurb netmrg-0.19/debian/po/POTFILES.in netmrg-0.20/ChangeLog/debian/po/POTFILES.in --- netmrg-0.19/debian/po/POTFILES.in 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/POTFILES.in 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff -Nurb netmrg-0.19/debian/po/pt.po netmrg-0.20/ChangeLog/debian/po/pt.po --- netmrg-0.19/debian/po/pt.po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/pt.po 1970-01-01 05:30:00.000000000 +0530 @@ -1,253 +0,0 @@ -# Portuguese translation of netmrg debconf messages. -# Copyright (C) 2006 Free Software Foundation, Inc. -# Rui Branco , 2006. -# 05-06-2007 - Rui Branco -# -msgid "" -msgstr "" -"Project-Id-Version: netmrg 0.18.2-13\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: 2007-06-05 18:31+0100\n" -"Last-Translator: Rui Branco \n" -"Language-Team: Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" - -#. Type: select -#. choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "Nenhum, Apache2, Apache, Apache-SSL, Todos" - -#. Type: select -#. description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "Servidor web a configurar:" - -#. Type: string -#. default -#: ../templates:2001 -msgid "localhost" -msgstr "máquina local" - -#. Type: string -#. description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "Nome de máquina do servidor de base de dados mysql:" - -#. Type: string -#. default -#. Type: string -#. default -#: ../templates:3001 ../templates:5001 -msgid "netmrg" -msgstr "netmrg" - -#. Type: string -#. description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "Nome para a base de dados:" - -#. Type: note -#. description -#: ../templates:4002 -msgid "The database already exists" -msgstr "A base de dados já existe" - -#. Type: note -#. description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "" -"Um teste simples revelou que uma base de dados com o nome \"${dbname}\" já " -"existe e parece ser uma base de dados netmrg. Se realmente deseja usar esta " -"base de dados confirme o nome no próximo passo." - -#. Type: string -#. description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "Nome do utilizador da base de dados:" - -#. Type: string -#. description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "Este utilizador terá acesso de leitura/escrita à base de dados netmrg." - -#. Type: password -#. description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "Palavra-chave do utilizador da base de dados:" - -#. Type: password -#. description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "Confirme a palavra-chave do utilizador da base de dados:" - -#. Type: text -#. description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "A palavra-chave não coincide" - -#. Type: text -#. description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "As palavras-chaves que introduziu não coincidem. Por favor tente outra vez." - -#. Type: string -#. description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "Nome do administrador da base de dados sistema:" - -#. Type: string -#. description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "" -"Para ser capaz de criar a base de dados inicial e um utilizador da mesma " -"para o netmrg, necessita do nome da conta do administrador da base de dados " -"sistema." - -#. Type: password -#. description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "Palavra-chave do administrador da base de dados sistema:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "Nome da máquina do servidor web:" - -#. Type: string -#. description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "" -"O interface para o utilizador do netmrg é baseado na web. O nome da máquina " -"servidor web é utilizado para 'urls' dentro da interface web do netmrg. " -"Deixar esta entrada em branco normalmente é uma boa opção." - -#. Type: string -#. description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "Nome da sua companhia:" - -#. Type: string -#. description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "" -"O interface de visualização web do netmrg mostra o nome da sua companhia no " -"cabeçalho cada página." - -#. Type: string -#. default -#: ../templates:13001 -msgid "http://" -msgstr "http://" - -#. Type: string -#. description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "'Url' da página web da sua empresa:" - -#. Type: string -#. description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "" -"Ao clicar no nome da companhia será activado o link. Normalmente é o link " -"'url' que aponta para a página de início do site da sua companhia." - -#. Type: boolean -#. default -#: ../templates:14001 -msgid "true" -msgstr "verdadeiro" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "Apagar data depois de eliminar o software?" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "" -"Eliminar um pacote normalmente elimina toda a informação recolhida pelo " -"pacote incluindo ficheiros de relatório. Escolha 'não' se preferir manter a " -"base de dados mysql e os ficheiros de data, mesmo que o pacote netmrg seja " -"eliminado um dia mais tarde." - -#. Type: note -#. description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "Nota de configuração do pacote" - -#. Type: note -#. description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "" -"O pacote foi instalado e configurado com sucesso. Aponte o seu cliente web " -"para http://${site}/netmrg/ e entre como um utilizador 'admin' com a palavra-" -"chave 'nimda'. Garanta que a palavra-chave seja modificada o mais depressa " -"possível, já que é a palavra-chave por omissão para todas as instalações " -"netmrg." - -#. Type: note -#. description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "Erro ao criar a base de dados" - -#. Type: note -#. description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "Erro ao criar o utilizador da base de dados" - -#. Type: note -#. description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "Erro ao criar as tabelas da base de dados" - diff -Nurb netmrg-0.19/debian/po/templates.pot netmrg-0.20/ChangeLog/debian/po/templates.pot --- netmrg-0.19/debian/po/templates.pot 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/templates.pot 1970-01-01 05:30:00.000000000 +0530 @@ -1,231 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: select -#. choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "" - -#. Type: select -#. description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "" - -#. Type: string -#. default -#: ../templates:2001 -msgid "localhost" -msgstr "" - -#. Type: string -#. description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "" - -#. Type: string -#. default -#. Type: string -#. default -#: ../templates:3001 ../templates:5001 -msgid "netmrg" -msgstr "" - -#. Type: string -#. description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "" - -#. Type: note -#. description -#: ../templates:4002 -msgid "The database already exists" -msgstr "" - -#. Type: note -#. description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "" - -#. Type: string -#. description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "" - -#. Type: string -#. description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "" - -#. Type: password -#. description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "" - -#. Type: password -#. description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "" - -#. Type: text -#. description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "" - -#. Type: text -#. description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "" - -#. Type: string -#. description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "" - -#. Type: string -#. description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "" - -#. Type: password -#. description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "" - -#. Type: string -#. description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "" - -#. Type: string -#. description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "" - -#. Type: string -#. description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "" - -#. Type: string -#. description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "" - -#. Type: string -#. default -#: ../templates:13001 -msgid "http://" -msgstr "" - -#. Type: string -#. description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "" - -#. Type: string -#. description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "" - -#. Type: boolean -#. default -#: ../templates:14001 -msgid "true" -msgstr "" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "" - -#. Type: boolean -#. description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "" - -#. Type: note -#. description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "" - -#. Type: note -#. description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "" - -#. Type: note -#. description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "" - -#. Type: note -#. description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "" - -#. Type: note -#. description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "" diff -Nurb netmrg-0.19/debian/po/vi.po netmrg-0.20/ChangeLog/debian/po/vi.po --- netmrg-0.19/debian/po/vi.po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/po/vi.po 1970-01-01 05:30:00.000000000 +0530 @@ -1,235 +0,0 @@ -# Vietnamese translation for netmrg. -# Copyright © 2007 Free Software Foundation, Inc. -# Clytie Siddall , 2005-2007. -# -msgid "" -"" -msgstr "Project-Id-Version: netmrg 0.18.2-8\n" -"Report-Msgid-Bugs-To: steinm@debian.org\n" -"POT-Creation-Date: 2007-05-30 08:32+0200\n" -"PO-Revision-Date: 2007-06-05 14:39+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.6.3b1\n" - -#.Type: select -#.choices -#: ../templates:1001 -msgid "None, Apache2, Apache, Apache-SSL, All" -msgstr "Không có, Apache2, Apache, Apache-SSL, Tất cả" - -#.Type: select -#.description -#: ../templates:1002 -msgid "Web server to configure:" -msgstr "Trình phục vụ Mạng cần cấu hình:" - -#.Type: string -#.default -#: ../templates:2001 -msgid "localhost" -msgstr "localhost" - -#.Type: string -#.description -#: ../templates:2002 -msgid "Host name of the mysql database server:" -msgstr "Tên máy của máy phục vụ cÆ¡ sở dữ liệu MySQL:" - -#.Type: string -#.default -#.Type: string -#.default -#: ../templates:3001 -#: ../templates:5001 -msgid "netmrg" -msgstr "netmrg" - -#.Type: string -#.description -#: ../templates:3002 -msgid "Name for the database:" -msgstr "Tên cho cÆ¡ sở dữ liệu :" - -#.Type: note -#.description -#: ../templates:4002 -msgid "The database already exists" -msgstr "CÆ¡ sở dữ liệu đã có" - -#.Type: note -#.description -#: ../templates:4002 -msgid "" -"A simple test revealed that a database with the name \"${dbname}\" already " -"exists and appears to be a netmrg database. If you really like to use this " -"database then confirm the name in the next step." -msgstr "Má»™t cÆ¡ sở dữ liệu tên « ${dbname} » đã tồn tại, cÅ©ng có vẻ là nó là cÆ¡ sở dữ liệu kiểu netmrg. Thật muốn sá»­ dụng cÆ¡ sở dữ liệu này thì bạn xác nhận tên trong bÆ°á»›c kế tiếp." - -#.Type: string -#.description -#: ../templates:5002 -msgid "Name of the database user:" -msgstr "Tên của ngÆ°á»i dùng cÆ¡ sở dữ liệu :" - -#.Type: string -#.description -#: ../templates:5002 -msgid "This user will have read/write access to the netmrg database." -msgstr "NgÆ°á»i dùng này sẽ có quyá»n Ä‘á»c/ghi trong cÆ¡ sở dữ liệu netmrg." - -#.Type: password -#.description -#: ../templates:6002 -msgid "Password of the database user:" -msgstr "Mật khẩu của ngÆ°á»i dùng cÆ¡ sở dữ liệu :" - -#.Type: password -#.description -#: ../templates:7002 -msgid "Confirm the password of the database user:" -msgstr "Hãy xác nhận mật khẩu của ngÆ°á»i dùng cÆ¡ sở dữ liệu :" - -#.Type: text -#.description -#: ../templates:8002 -msgid "Password mismatch" -msgstr "Hai mật khẩu không trùng" - -#.Type: text -#.description -#: ../templates:8002 -msgid "The database user passwords you entered didn't match. Please try again." -msgstr "Bạn đã gõ hai mật khẩu ngÆ°á»i dùng cÆ¡ sở dữ liệu không phải trùng vá»›i nhau. Hãy thá»­ lại." - -#.Type: string -#.description -#: ../templates:9002 -msgid "Name of the database system administrator:" -msgstr "Tên của quản trị hệ thống cÆ¡ sở dữ liệu :" - -#.Type: string -#.description -#: ../templates:9002 -msgid "" -"In order to be able to create the initial database and database user for " -"netmrg, the account name of the database system administrator is needed." -msgstr "Äể có khả năng tạo cÆ¡ sở dữ liệu và ngÆ°á»i dùng đầu tiên cho netmrg, cần thiết tên tài khoản của ngÆ°á»i dùng quản trị hệ thống cÆ¡ sở dữ liệu." - -#.Type: password -#.description -#: ../templates:10002 -msgid "Password of the database system administrator:" -msgstr "Mật khẩu của quản trị hệ thống cÆ¡ sở dữ liệu :" - -#.Type: string -#.description -#: ../templates:11002 -msgid "Name of web host:" -msgstr "Tên của máy há»— trợ dịch vụ Mạng:" - -#.Type: string -#.description -#: ../templates:11002 -msgid "" -"netmrg's user interface is web based. The hostname of the web server is used " -"for urls within the netmrg web interface. Leaving this entry field empty is " -"usually a good choice." -msgstr "Giao diện ngÆ°á»i dùng của netmrg dá»±a vào Mạng. Tên máy của máy phục vụ Mạng được dùng cho địa chỉ URL bên trong giao diện Mạng của netmrg. ThÆ°á»ng nên bá» rá»—ng trÆ°á»ng này." - -#.Type: string -#.description -#: ../templates:12002 -msgid "Name of your company:" -msgstr "Tên của công ty bạn:" - -#.Type: string -#.description -#: ../templates:12002 -msgid "" -"The web front end of netmrg shows the name of your company in the header of " -"each web page." -msgstr "Giao diện Mạng của netmrg thì hiển thị tên của công ty của bạn trong phần đầu của má»—i trang Mạng." - -#.Type: string -#.default -#: ../templates:13001 -msgid "http://" -msgstr "http://" - -#.Type: string -#.description -#: ../templates:13002 -msgid "Url of your companies website:" -msgstr "URL của nÆ¡i Mạng của công ty:" - -#.Type: string -#.description -#: ../templates:13002 -msgid "" -"Clicking on the company name will follow a link. It is usualy the url " -"pointing to the start page of your company's web site." -msgstr "Việc nhấn vào tên công ty sẽ theo liên kết. ThÆ°á»ng là địa chỉ URL chỉ tá»›i trang chính của nÆ¡i Mạng của công ty của bạn." - -#.Type: boolean -#.default -#: ../templates:14001 -msgid "true" -msgstr "đúng" - -#.Type: boolean -#.description -#: ../templates:14002 -msgid "Delete data after purging software?" -msgstr "Xoá dữ liệu sau khi tẩy phần má»m không?" - -#.Type: boolean -#.description -#: ../templates:14002 -msgid "" -"Purging a package usually removes all data collected by the software " -"including the log files. Choose 'no' if you would like to keep the mysql " -"database and the datafiles even if the netmrg package is purged sometime in " -"the future." -msgstr "Việc tẩy gói thÆ°á»ng gỡ bá» má»i dữ liệu do phần má»m thu thập, gồm các tập tin ghi lÆ°u. Hãy chá»n « Không » nếu bạn muốn giữ lại cÆ¡ sở dữ liệu MySQL, thậm chí nếu gói netmrg bị tẩy vào lúc sau." - -#.Type: note -#.description -#: ../templates:15002 -msgid "Package configuration note" -msgstr "Ghi chú cấu hình gói" - -#.Type: note -#.description -#: ../templates:15002 -msgid "" -"The package has been successfully installed and configured. Point your " -"webbrowser towards http://${site}/netmrg/ and log in as user 'admin' with " -"the password 'nimda'. Make sure to change the password as soon as possible " -"since it is the default password for all netmrg installations." -msgstr "Gói đã được cài đặt và cấu hình. Chỉ trình duyệt Mạng tá»›i địa chỉ « http://${site}/netmrg/ » rồi đăng nhập vá»›i tên ngÆ°á»i dùng « admin » và mật khẩu « nimda ». Bạn nên thay đổi mật khẩu càng sá»›m càng có thể, vì nó là mật khẩu mặc định cho má»i bản cài đặt netmrg." - -#.Type: note -#.description -#: ../templates:16002 -msgid "Error while creating database" -msgstr "Gặp lá»—i khi tạo cÆ¡ sở dữ liệu" - -#.Type: note -#.description -#: ../templates:17002 -msgid "Error while creating database user" -msgstr "Gặp lá»—i khi tạo ngÆ°á»i dùng cÆ¡ sở dữ liệu" - -#.Type: note -#.description -#: ../templates:18002 -msgid "Error while creating database tables" -msgstr "Gặp lá»—i khi tạo bảng cÆ¡ sở dữ liệu" - -#~ msgid "Which name would you like for the database user?" -#~ msgstr "Cho ngÆ°á»Âi dùng cÆ¡ sở dỡ liệu ấy, bạn muốn chá»Ân tên nào?" diff -Nurb netmrg-0.19/debian/postinst netmrg-0.20/ChangeLog/debian/postinst --- netmrg-0.19/debian/postinst 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/postinst 1970-01-01 05:30:00.000000000 +0530 @@ -1,205 +0,0 @@ -#! /bin/sh -# postinst script for netmrg -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -. /usr/share/debconf/confmodule - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -if ! id netmrg > /dev/null 2>&1; then - adduser --system --ingroup www-data --home /var/lib/netmrg --shell /bin/bash --gecos netmrg netmrg -else - # There has been previous inoffical version where the shell had been - # set to /bin/false. This causes problems when running the crontab entry. - chsh -s /bin/bash netmrg -fi - -get_db_params () { - db_get "netmrg/db/host" - dbserver="$RET" - db_get "netmrg/db/name" - dbname="$RET" - db_get "netmrg/db/admin/name" - dbadmin="$RET" - db_get "netmrg/db/admin/password" - dbadmpass="$RET" - db_get "netmrg/db/user/name" - dbuser="$RET" - db_get "netmrg/db/user/password" - dbpass="$RET" - db_get "netmrg/web/host" - webhost="$RET" - db_get "netmrg/company/name" - companyname="$RET" - db_get "netmrg/company/link" - companylink="$RET" -} - -case "$1" in - configure) - - chown -R netmrg.www-data /var/lib/netmrg - chown -R netmrg.www-data /var/log/netmrg - if [ ! -d "/var/lib/netmrg/sessions" ] ; then - mkdir -p /var/lib/netmrg/sessions - fi - chown -R www-data.www-data /var/lib/netmrg/sessions - chmod 700 /var/lib/netmrg/sessions - - config="/etc/netmrg/netmrg.xml" - if [ -s $config ] ; then - template=$config - else - template="/usr/share/netmrg/netmrg.xml.sample" - fi - - # Get the web server type. - db_get "netmrg/webserver" - webserver="$RET" - case $webserver in - Apache2) webservers="apache2" ;; - Apache) webservers="apache" ;; - Apache-SSL) webservers="apache-ssl" ;; - All) webservers="apache2 apache apache-ssl" ;; - *) webservers="" ;; - esac - . /usr/share/wwwconfig-common/php.get - . /usr/share/wwwconfig-common/apache-run.get - - # Set up web server. - for server in $webservers ; do - # prefer conf.d over monolithic form - if [ -d "/etc/${server}/conf.d" ] ; then - rm -f "/etc/${server}/conf.d/netmrg.conf" - if [ ! -e "/etc/${server}/conf.d/netmrg.conf" ] ; then - ln -s /etc/netmrg/netmrg.conf "/etc/${server}/conf.d/netmrg.conf" - fi - restart="$server $restart" - else - includefile="/etc/netmrg/netmrg.conf" - . /usr/share/wwwconfig-common/apache-include_all.sh - test "$status" = "uncomment" -o "$status" = "include" && restart="$server $restart" - fi - - for index in index.php; do - . /usr/share/wwwconfig-common/apache-index_all.sh - test "$status" = "added" && restart="$server $restart" - done - done - - # Setup the database. - get_db_params - . /usr/share/wwwconfig-common/mysql-createdb.sh - dbcreatestatus=$status - if [ "$status" = "create" ]; then - if eval $mysqlcmd -f mysql -e '"select User from user;"' | grep $dbuser >/dev/null 2>&1 ; then - userexists=true - else - userexists=false - fi - . /usr/share/wwwconfig-common/mysql-createuser.sh - if [ "$status" != "error" ]; then - # Check for one table - if ! eval $mysqlcmd $dbname -e '"show tables;"' | grep graphs >/dev/null 2>&1 ; then - if ! eval $mysqlcmd $dbname < /usr/share/netmrg/db/netmrg.mysql > /dev/null 2>&1 ; then - status=error - else - status=exec - fi - if [ "$status" != "exec" ]; then - db_fset netmrg/db/tablegen_error seen false - db_input high netmrg/db/tablegen_error || true - db_go - . /usr/share/wwwconfig-common/mysql-dropdb.sh - if [ "$userexists" != "true" ]; then - . /usr/share/wwwconfig-common/mysql-dropuser.sh - fi - fi - fi - - else - db_reset "netmrg/db/admin/password" - db_fset netmrg/db/usergen_error seen false - db_input high netmrg/db/usergen_error || true - db_go - # Only delete the database when it was created in this script - if [ $dbcreatestatus = "create" ] ; then - . /usr/share/wwwconfig-common/mysql-dropdb.sh - fi - fi - - elif [ "$status" = "nothing" ]; then - # run createuser in case the password has been changed during - # a reconfiguration of the package - . /usr/share/wwwconfig-common/mysql-createuser.sh - oldvers=$(eval "$mysqlcmd $dbname -e 'select module, version from versioninfo'" | grep Main | awk '{print $2}') - if [ -f /usr/share/doc/netmrg/update-from-$oldvers.sql ] ; then - echo "Updating from version $oldvers." - sqlfile=/usr/share/doc/netmrg/update-from-$oldvers.sql - . /usr/share/wwwconfig-common/mysql-exec.sh - if [ $status = "execerror" ] ; then - echo "Updating from version $oldvers failed!" - fi - else - echo "No update for database needed." - fi - else - db_reset "netmrg/db/admin/password" - db_fset netmrg/db/generation_error seen false - db_input high netmrg/db/generation_error || true - db_go - fi - - # Everything fine so far. Now create an new config file - TEMPFILE=`tempfile -s .netmrg_install.tmp` && chown root:www-data $TEMPFILE && chmod 640 $TEMPFILE - sed "s:^\(.*\)\(.*\):\1$dbserver:g" $template | \ - sed "s:^\(.*\)\(.*\):\1$dbuser:g" | \ - sed "s|^\(.*\)\(.*\)|\1$dbpass|g" | \ - sed "s:^\(.*\)\(.*\):\1$dbname:g" | \ - sed "s|^\(.*\)\(.*\)|\1$webhost|g" | \ - sed "s|^\(.*\)\(.*\)|\1/netmrg|g" | \ - sed "s|^\(.*\)\(.*\)|\1$companyname|g" | \ - sed "s|^\(.*\)\(.*\)|\1$companylink|g" > \ - $TEMPFILE && mv $TEMPFILE $config - - # Restart the servers that need to be restarted - servers="apache-ssl apache apache2 mysql" - . /usr/share/wwwconfig-common/restart.sh - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff -Nurb netmrg-0.19/debian/postrm netmrg-0.20/ChangeLog/debian/postrm --- netmrg-0.19/debian/postrm 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/postrm 1970-01-01 05:30:00.000000000 +0530 @@ -1,165 +0,0 @@ -#! /bin/sh -# postrm script for netmrg -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_version 2.0 - - db_get "netmrg/webserver" || true - webserver="$RET" - - # Allows us to loop and substitute in one pass - case $webserver in - Apache2) webservers="apache2" ;; - Apache) webservers="apache" ;; - Apache-SSL) webservers="apache-ssl" ;; - All) webservers="apache2 apache apache-ssl" ;; - *) webservers="" ;; - esac -fi -includefile=/etc/netmrg/netmrg.conf - -case "$1" in - purge) - if [ -f /usr/share/debconf/confmodule ]; then - db_get "netmrg/postrm" - if [ "$RET" = "true" ] ; then - # Get database configuration - db_get "netmrg/db/user/name" - dbuser="$RET" - db_get "netmrg/db/user/password" - dbpass="$RET" - db_get "netmrg/db/host" - dbserver="$RET" - db_get "netmrg/db/name" - dbname="$RET" - db_get "netmrg/db/admin/name" - dbadmin="$RET" - db_reset "netmrg/db/admin/password" - db_input critical "netmrg/db/admin/password" || true - db_go || true - db_get "netmrg/db/admin/password" - dbadmpass="$RET" - if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then - . /usr/share/wwwconfig-common/mysql-dropdb.sh - else - echo "Cannot drop database (can't find wwwconfig-common script)." >&2 - fi - if [ -e /usr/share/wwwconfig-common/mysql-dropuser.sh ] ; then - . /usr/share/wwwconfig-common/mysql-dropuser.sh - else - echo "Cannot drop user (can't find wwwconfig-common script)." >&2 - fi - - rm -rf /var/lib/netmrg - rm -rf /var/log/netmrg - - # Get rid of the user if the package is purged - if getent passwd netmrg >/dev/null; then - if [ -x /usr/sbin/userdel ]; then - /usr/sbin/userdel netmrg - fi - fi - fi - - for server in $webservers ; do - # prefer conf.d over monolithic form - if [ -d "/etc/${server}/conf.d" ] ; then - if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then - rm "/etc/${server}/conf.d/netmrg.conf" - status="purge" - fi - else - conffile="/etc/$server/httpd.conf" - if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then - . /usr/share/wwwconfig-common/apache-uninclude.sh - else - echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2 - fi - fi - if [ "$status" = "purge" ] ; then - restart="$restart $server" - fi - done - fi - - rm -rf /etc/netmrg - servers="apache-ssl apache apache2 mysql" - if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then - . /usr/share/wwwconfig-common/restart.sh || - echo "Could not restart servers (wwwconfig-common script failed)." >&2 - else - echo "Cannot restart servers (can't find wwwconfig-common script)." >&2 - fi - rm -rf /var/lib/netmrg/sessions - - ;; - remove) - if [ -f /usr/share/debconf/confmodule ]; then - for server in $webservers ; do - # prefer conf.d over monolithic form - if [ -d "/etc/${server}/conf.d" ] ; then - if [ -L "/etc/${server}/conf.d/netmrg.conf" ] ; then - rm "/etc/${server}/conf.d/netmrg.conf" - status="purge" - fi - else - conffile="/etc/$server/httpd.conf" - if [ -e /usr/share/wwwconfig-common/apache-uninclude.sh ] ; then - . /usr/share/wwwconfig-common/apache-uninclude.sh - else - echo "Cannot uninclude apache config part (can't find wwwconfig-common script)." >&2 - fi - fi - if [ "$status" = "purge" ] ; then - restart="$restart $server" - fi - done - fi - - servers="apache-ssl apache apache2 mysql" - if [ -e /usr/share/wwwconfig-common/restart.sh ] ; then - . /usr/share/wwwconfig-common/restart.sh || - echo "Could not restart servers (wwwconfig-common script failed)." >&2 - else - echo "Cannot restart servers (can't find wwwconfig-common script)." >&2 - fi - rm -rf /var/lib/netmrg/sessions - - ;; - upgrade) - ;; - failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff -Nurb netmrg-0.19/debian/README.Debian netmrg-0.20/ChangeLog/debian/README.Debian --- netmrg-0.19/debian/README.Debian 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/README.Debian 1970-01-01 05:30:00.000000000 +0530 @@ -1,11 +0,0 @@ -netmrg for Debian ------------------ - -netmrg for debian tries to handle all configuration options by debconf. -If you update from an earlier version everything is taken care of, including -updates to the database. There is no need to run netmrg's own updater, -thought it shouldn't harm. -In case the automatic update of the database fails, you can always run -the updater from netmrg. - - -- Uwe Steinmann , Tue, 14 Sep 2004 10:42:21 +0200 diff -Nurb netmrg-0.19/debian/rrdedit.xml netmrg-0.20/ChangeLog/debian/rrdedit.xml --- netmrg-0.19/debian/rrdedit.xml 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/rrdedit.xml 1970-01-01 05:30:00.000000000 +0530 @@ -1,120 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A -typical entry in a Makefile or Makefile.am is: - -DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/\ -manpages/docbook.xsl -XP=xsltproc -''-nonet - -manpage.1: manpage.dbk - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The -XSL files are in docbook-xsl. Please remember that if you -create the nroff version in one of the debian/rules file -targets (such as build), you will need to include xsltproc -and docbook-xsl in your Build-Depends control field. - ---> - - - Uwe"> - Steinmann"> - - September 14, 2004"> - - 1"> - steinm@debian.org"> - - RRDEDIT"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2004 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to edit rrd files - - - - &dhpackage; - - FILE - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; command. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program to edit rrd files. - It uses rrdtool to create an xml export file - from the rrd-file, calls vi to modify it and - restores it afterwards. - The filename passed to the program must be relative to - /var/lib/netmrg/rrd. - - - - SEE ALSO - - rrddump (1). - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - diff -Nurb netmrg-0.19/debian/rules netmrg-0.20/ChangeLog/debian/rules --- netmrg-0.19/debian/rules 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/rules 1970-01-01 05:30:00.000000000 +0530 @@ -1,113 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc/netmrg --localstatedir=/var --libexecdir=/usr/lib - - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/netmrg.sgml > netmrg.1 - (cd debian; xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl rrdedit.xml) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - rm -f debian/rrdedit.1 - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/netmrg. - $(MAKE) install DESTDIR=$(CURDIR)/debian/netmrg netmrg_share_docdir=/usr/share/doc/netmrg netmrg_share_htmldir=/usr/share/doc/netmrg/html netmrg_wwwdir=/usr/share/netmrg - cp $(CURDIR)/debian/netmrg/etc/netmrg/netmrg.xml $(CURDIR)/debian/netmrg/usr/share/netmrg/netmrg.xml.sample - rm -f $(CURDIR)/debian/netmrg/usr/share/doc/netmrg/INSTALL - rm -f $(CURDIR)/debian/netmrg/usr/share/doc/netmrg/LICENSE - chmod 744 $(CURDIR)/debian/netmrg/usr/share/netmrg/contrib/bindstats/dnsstats - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs -k share/doc/ChangeLog - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu - dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit - dh_installcron -# dh_installinfo - dh_installman $(CURDIR)/debian/rrdedit.1 - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff -Nurb netmrg-0.19/debian/templates netmrg-0.20/ChangeLog/debian/templates --- netmrg-0.19/debian/templates 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/templates 1970-01-01 05:30:00.000000000 +0530 @@ -1,114 +0,0 @@ -Template: netmrg/webserver -Type: select -_choices: None, Apache2, Apache, Apache-SSL, All -_description: Web server to configure: - -Template: netmrg/db/host -Type: string -_default: localhost -_description: Host name of the mysql database server: - -Template: netmrg/db/name -Type: string -_default: netmrg -_description: Name for the database: - -Template: netmrg/db/exists -Type: note -_default: -_description: The database already exists - A simple test revealed that a database with the name "${dbname}" - already exists and appears to be a netmrg database. If you really - like to use this database then confirm the name in the next step. - -Template: netmrg/db/user/name -Type: string -_default: netmrg -_description: Name of the database user: - This user will have read/write access to the netmrg database. - -Template: netmrg/db/user/password -Type: password -_default: -_description: Password of the database user: - -Template: netmrg/db/user/password/confirm -Type: password -_default: -_description: Confirm the password of the database user: - -Template: netmrg/db/user/password/mismatch -Type: text -_default: -_description: Password mismatch - The database user passwords you entered didn't match. Please try again. - -Template: netmrg/db/admin/name -Type: string -_default: -_description: Name of the database system administrator: - In order to be able to create the initial database and database user - for netmrg, the account name of the database system administrator - is needed. - -Template: netmrg/db/admin/password -Type: password -_default: -_description: Password of the database system administrator: - -Template: netmrg/web/host -Type: string -_default: -_description: Name of web host: - netmrg's user interface is web based. The hostname of the web server - is used for urls within the netmrg web interface. Leaving this - entry field empty is usually a good choice. - -Template: netmrg/company/name -Type: string -_default: -_description: Name of your company: - The web front end of netmrg shows the name of your company in the header - of each web page. - -Template: netmrg/company/link -Type: string -_default: http:// -_description: Url of your companies website: - Clicking on the company name will follow a link. It is usualy - the url pointing to the start page of your company's web site. - -Template: netmrg/postrm -Type: boolean -_default: true -_description: Delete data after purging software? - Purging a package usually removes all data collected by the software - including the log files. - Choose 'no' if you would like to keep the mysql database and - the datafiles even if the netmrg package is purged sometime in the - future. - -Template: netmrg/configuration/note -Type: note -_default: -_description: Package configuration note - The package has been successfully installed and configured. Point your - webbrowser towards http://${site}/netmrg/ and log in as user 'admin' - with the password 'nimda'. Make sure to change the password as soon - as possible since it is the default password for all netmrg installations. - -Template: netmrg/db/generation_error -Type: note -_default: -_description: Error while creating database - -Template: netmrg/db/usergen_error -Type: note -_default: -_description: Error while creating database user - -Template: netmrg/db/tablegen_error -Type: note -_default: -_description: Error while creating database tables - diff -Nurb netmrg-0.19/debian/update-from-0.17.sql netmrg-0.20/ChangeLog/debian/update-from-0.17.sql --- netmrg-0.19/debian/update-from-0.17.sql 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/update-from-0.17.sql 1970-01-01 05:30:00.000000000 +0530 @@ -1,10 +0,0 @@ -ALTER TABLE `graph_ds` CHANGE `stats` `stats` SET( 'CURRENT', 'AVERAGE', 'MAXIMUM', 'SUMS', 'INTEGER', 'MULTSUM' ) DEFAULT 'CURRENT,AVERAGE,MAXIMUM' NOT NULL ; --- INSERT INTO updates SET update_version = '0.18.1', name = 'Graph Multiply Sum Support', version_applied_to = 'pre-0.17', dateapplied = now(); - -INSERT INTO tests_internal VALUES (7,'SNMP Failure'); --- INSERT INTO updates SET update_version = '0.18.1', name = 'New Internal Test - SNMP Failure', version_applied_to = 'pre-0.17', dateapplied = now(); - -ALTER TABLE `tests_sql` ADD `timeout` INT DEFAULT '10' NOT NULL ; --- INSERT INTO updates SET update_version = '0.18.1', name = 'SQL Test Timeout', version_applied_to = 'pre-0.17', dateapplied = now(); - -UPDATE `versioninfo` set version = '0.18.2' where module = 'Main'; diff -Nurb netmrg-0.19/debian/update-from-0.18.1.sql netmrg-0.20/ChangeLog/debian/update-from-0.18.1.sql --- netmrg-0.19/debian/update-from-0.18.1.sql 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/update-from-0.18.1.sql 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -UPDATE `versioninfo` set version = '0.18.2' where module = 'Main'; diff -Nurb netmrg-0.19/debian/update-from-0.18.2.sql netmrg-0.20/ChangeLog/debian/update-from-0.18.2.sql --- netmrg-0.19/debian/update-from-0.18.2.sql 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/update-from-0.18.2.sql 1970-01-01 05:30:00.000000000 +0530 @@ -1,7 +0,0 @@ -ALTER TABLE monitors MODIFY test_id INT NOT NULL; -ALTER TABLE view MODIFY pos INT NOT NULL; -INSERT INTO tests_internal VALUES (8,'Windows CPU Load'); -INSERT INTO tests_script SET name='Livingston Portmaster Active Modems', cmd='pmmodems.pl %snmp_read_community% %ip%', data_type='2'; -UPDATE graphs SET min=NULL WHERE min=0; -UPDATE graphs SET max=NULL WHERE max=0; -UPDATE `versioninfo` set version = '0.19' where module = 'Main'; diff -Nurb netmrg-0.19/debian/watch netmrg-0.20/ChangeLog/debian/watch --- netmrg-0.19/debian/watch 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/debian/watch 1970-01-01 05:30:00.000000000 +0530 @@ -1,6 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# Site Directory Pattern Version Script -version=2 -http://www.netmrg.net/download/release/netmrg-([\d\.]*)\.tar\.gz debian uupdate diff -Nurb netmrg-0.19/depcomp netmrg-0.20/ChangeLog/depcomp --- netmrg-0.19/depcomp 2003-07-09 06:51:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/depcomp 1970-01-01 05:30:00.000000000 +0530 @@ -1,423 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -if test -z "$depfile"; then - base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` - dir=`echo "$object" | sed 's,/.*$,/,'` - if test "$dir" = "$object"; then - dir= - fi - # FIXME: should be _deps on DOS. - depfile="$dir.deps/$base" -fi - -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - tmpdepfile1="$dir.libs/$base.lo.d" - tmpdepfile2="$dir.libs/$base.d" - "$@" -Wc,-MD - else - tmpdepfile1="$dir$base.o.d" - tmpdepfile2="$dir$base.d" - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. We will use -o /dev/null later, - # however we can't do the remplacement now because - # `-o $object' might simply not be used - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # X makedepend - shift - cleared=no - for arg in "$@"; do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - "$@" || exit $? - IFS=" " - for arg - do - case "$arg" in - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 diff -Nurb netmrg-0.19/etc/cron.d-netmrg.in netmrg-0.20/ChangeLog/etc/cron.d-netmrg.in --- netmrg-0.19/etc/cron.d-netmrg.in 2005-06-14 06:43:37.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/cron.d-netmrg.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,3 +0,0 @@ -# run NetMRG every 5 minutes if enabled -*/5 * * * * netmrg bash -c "if [ -f @localstatedir@/lock/subsys/netmrg ]; then @bindir@/netmrg-gatherer; fi" - diff -Nurb netmrg-0.19/etc/init.d-netmrg.in netmrg-0.20/ChangeLog/etc/init.d-netmrg.in --- netmrg-0.19/etc/init.d-netmrg.in 2004-05-29 06:17:08.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/init.d-netmrg.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,71 +0,0 @@ -#!/bin/bash -# -# NetMRG This shell script enables the running of NetMRG via cron -# -# Author: Douglas E. Warner -# -# chkconfig: - 50 01 -# -# description: Enable NetMRG run via cron -# processname: netmrg -# config: /etc/netmrg/netmrg.xml -# - -# source function library -. /etc/rc.d/init.d/functions - -prog="netmrg" -lockfile="@localstatedir@/lock/subsys/$prog" - -RETVAL=0 - -start() { - echo -n $"Enabling NetMRG run via cron: " - touch "$lockfile" && success || failure - RETVAL=$? - echo -} - -stop() { - echo -n $"Disabling NetMRG run via cron: " - rm -f "$lockfile" && success || failure - RETVAL=$? - echo -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|force-reload) - restart - ;; - reload) - ;; - condrestart) - [ -f "$lockfile" ] && restart - ;; - status) - if [ -f $lockfile ]; then - echo $"NetMRG run via cron is enabled." - RETVAL=0 - else - echo $"NetMRG run via cron is disabled." - RETVAL=3 - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}" - exit 1 -esac - -exit $RETVAL - diff -Nurb netmrg-0.19/etc/Makefile.am netmrg-0.20/ChangeLog/etc/Makefile.am --- netmrg-0.19/etc/Makefile.am 2004-10-21 12:21:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,23 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -# options to install files in the etc directory -netmrg_etcdir=$(sysconfdir) -netmrg_etc_DATA = netmrg.xml netmrg.conf - -# override the default netmrg_etc install -install-netmrg_etcDATA: $(netmrg_etc_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(netmrg_etcdir) - @list='$(netmrg_etc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - if test -e "$(DESTDIR)$(netmrg_etcdir)/$$f"; then \ - echo " Config file $$p exists...not overwriting."; \ - else \ - echo " INST $$d$$p"; \ - $(netmrg_etcDATA_INSTALL) $$d$$p $(DESTDIR)$(netmrg_etcdir)/$$f; \ - fi; \ - done - diff -Nurb netmrg-0.19/etc/Makefile.in netmrg-0.20/ChangeLog/etc/Makefile.in --- netmrg-0.19/etc/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,367 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/cron.d-netmrg.in $(srcdir)/init.d-netmrg.in \ - $(srcdir)/netmrg.conf.in $(srcdir)/netmrg.xml.in \ - $(top_srcdir)/Make.inc -subdir = etc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = cron.d-netmrg init.d-netmrg netmrg.conf \ - netmrg.xml -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(netmrg_etcdir)" -netmrg_etcDATA_INSTALL = $(INSTALL_DATA) -DATA = $(netmrg_etc_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - - -# options to install files in the etc directory -netmrg_etcdir = $(sysconfdir) -netmrg_etc_DATA = netmrg.xml netmrg.conf -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign etc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -cron.d-netmrg: $(top_builddir)/config.status $(srcdir)/cron.d-netmrg.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -init.d-netmrg: $(top_builddir)/config.status $(srcdir)/init.d-netmrg.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -netmrg.conf: $(top_builddir)/config.status $(srcdir)/netmrg.conf.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -netmrg.xml: $(top_builddir)/config.status $(srcdir)/netmrg.xml.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -uninstall-info-am: - -uninstall-netmrg_etcDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_etc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_etcdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_etcdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(netmrg_etcdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-netmrg_etcDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-netmrg_etcDATA - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-netmrg_etcDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-netmrg_etcDATA - -@SET_MAKE@ - -# override the default netmrg_etc install -install-netmrg_etcDATA: $(netmrg_etc_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(netmrg_etcdir) - @list='$(netmrg_etc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - if test -e "$(DESTDIR)$(netmrg_etcdir)/$$f"; then \ - echo " Config file $$p exists...not overwriting."; \ - else \ - echo " INST $$d$$p"; \ - $(netmrg_etcDATA_INSTALL) $$d$$p $(DESTDIR)$(netmrg_etcdir)/$$f; \ - fi; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/etc/netmrg.conf.in netmrg-0.20/ChangeLog/etc/netmrg.conf.in --- netmrg-0.19/etc/netmrg.conf.in 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/netmrg.conf.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,11 +0,0 @@ -Alias /netmrg "@prefix@/share/netmrg/webfiles" - - Options Indexes - AllowOverride None - Order allow,deny - Allow from all - - php_value session.save_path /var/lib/netmrg/sessions - - - diff -Nurb netmrg-0.19/etc/netmrg.xml.in netmrg-0.20/ChangeLog/etc/netmrg.xml.in --- netmrg-0.19/etc/netmrg.xml.in 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/etc/netmrg.xml.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,40 +0,0 @@ - - - localhost - netmrguser - netmrgpass - netmrg - - - 10 - - - @RRDTOOL@ - @localstatedir@/log/netmrg/lockfile - @localstatedir@/log/netmrg/runtime - @libexecdir@/netmrg - @localstatedir@/lib/netmrg/rrd - @prefix@/share/netmrg - @datadir@/netmrg/locale - - - 5 - - - Generic Company - http://www.netmrg.net - http://localhost - /netmrg - false - - - 300 - - - 500 - LOG_DAEMON - - - 1.0 - - diff -Nurb netmrg-0.19/INSTALL netmrg-0.20/ChangeLog/INSTALL --- netmrg-0.19/INSTALL 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/INSTALL 1970-01-01 05:30:00.000000000 +0530 @@ -1,94 +0,0 @@ - - Chapter 5. Installation Procedure - - 1. Untar to some directory like /tmp/ (it will untar into a 'netmrg' - directory) - - cd /tmp - wget http://www.netmrg.net/download/release/netmrg.tar.gz - tar xzvf netmrg.tar.gz - - 2. Now we need to compile and install the source. cd into the directory - made by your tar command and type the following: - - ./configure - make - make install - - Note: If configure fails to locate the needed libraries they can be - manually specified. Run ./configure --help for details on the - necessary options. - - 3. Setup the database - - Now we need to setup the database. Please change at least the password - (netmrgpass below). - - mysqladmin create netmrg - mysql -u root -p netmrg < share/netmrg.mysql - mysql -u root -p - > grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpass'; - - 4. You need to modify your apache config in order to make your NetMRG - installation live (commonly in /etc/httpd/conf/httpd.conf). - - The first is to alias /netmrg to the installed web directory (commonly - /usr/local/var/www/netmrg/webfiles). - - Alias /netmrg "/usr/local/var/www/netmrg/webfiles" - - The easier way (if you're running Apache >= 1.3) is to just Include - the conf file we've created anywhere in your file (near the bottom is - fine). - - Include /usr/local/etc/netmrg.conf - - You will need to restart your Apache after making config changes. - Telling it to reload its config should be good enough - - killall -HUP httpd - - 5. Configure the Installation - - All of NetMRG's common configuration options are controlled by an XML - file, normally located at /usr/local/etc/netmrg.xml. You should edit - this file to make any necessary changes before continuing with - installation. - - For most installations, you will at least need to edit netmrg.xml to - reflect your database username and password. - - 6. Setup Permissions - - NetMRG does not need superuser permissions to run, therefore we will - setup a user for it. - - # useradd netmrg - # chown netmrg:netmrg /usr/local/var/log/netmrg - # chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd - - 7. Setup crontab - - You can setup the crontab entries in two places: either edit - /etc/crontab, or run crontab -e as the netmrg user. For 'crontab -e', - use an entry similar to this: - - */5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - - To edit the master crontab, edit /etc/crontab and add a line similar - to this: - - */5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - - 8. Point your web browser at your install, and start graphing things! The - default login is admin and the default password is nimda. Point your - web browser at the host you built this on (something similar to - http://yourhost.com/netmrg/) and please change your password! - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/satisfyreq.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/upgrade.html diff -Nurb netmrg-0.19/install-sh netmrg-0.20/ChangeLog/install-sh --- netmrg-0.19/install-sh 2003-07-09 06:51:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/install-sh 1970-01-01 05:30:00.000000000 +0530 @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - : - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - : - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff -Nurb netmrg-0.19/libexec/avoided.php netmrg-0.20/ChangeLog/libexec/avoided.php --- netmrg-0.19/libexec/avoided.php 2002-11-13 04:42:11.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/avoided.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,28 +0,0 @@ -#!/usr/bin/php -q - diff -Nurb netmrg-0.19/libexec/linux26diskaccess.pl netmrg-0.20/ChangeLog/libexec/linux26diskaccess.pl --- netmrg-0.19/libexec/linux26diskaccess.pl 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/linux26diskaccess.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,80 +0,0 @@ -#!/usr/bin/perl -use strict; - -### config variables -my $blockdev = "/sys/block"; - - -### argument processing -if (@ARGV != 2 or - $ARGV[0] !~ /^-[rw]b?$/ or - $ARGV[1] !~ /^\w+(?:\d+)?$/) -{ - print "U\n"; - print "\n"; - print "$0 [-r|-rb|-w|-wb] \n"; - print "\n"; - print "Reports disk I/O statistics counters for use as a NetMRG test script.\n"; - print "\n"; - print "Options:\n"; - print " -r Report the number of read operations\n"; - print " -rb Report the number of read blocks\n"; - print " -w Report the number of write operations\n"; - print " -wb Report the number of written blocks\n"; - print " dev(n) Is a relative block device or partition name.\n"; - print " For instance hda, hda1 or md0\n"; - print "\n"; - exit 1; -} - - -### figure out device/partitions -my ($hd, $partition); -if ($ARGV[1] =~ /^(hd\w)\d+$/) -{ - $partition = $ARGV[1]; - $hd = $1; -} # end if hd has a partition -else -{ - $hd = $ARGV[1]; -} # end else hd is just the drive - - -### read info from system block - -# read the data from the correct path -my $path = "$blockdev/$hd"; -$path .= "/$partition" if ($partition ne ""); -$path .= "/stat"; -open(STAT, $path) || die ("U\nERROR: couldn't open $path\n\n"); -my $line = ; -close(STAT); -chomp($line); -my ($read, $readb, $write, $writeb); -if ($partition eq "") -{ - ($read, $readb, $write, $writeb)=(split /\s+/, $line)[0, 2, 4, 6]; -} -else -{ - ($read, $readb, $write, $writeb)=split /\s+/, $line; -} - -### output the data -if ($ARGV[0] eq "-r") -{ - print "$read\n"; -} -elsif ($ARGV[0] eq "-w") -{ - print "$write\n"; -} -elsif ($ARGV[0] eq "-rb") -{ - print "$readb\n"; -} -elsif ($ARGV[0] eq "-wb") -{ - print "$writeb\n"; -} diff -Nurb netmrg-0.19/libexec/linuxacpiinfo.pl netmrg-0.20/ChangeLog/libexec/linuxacpiinfo.pl --- netmrg-0.19/libexec/linuxacpiinfo.pl 2004-04-08 19:08:52.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/linuxacpiinfo.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,152 +0,0 @@ -#!/usr/bin/perl -# -# linuxacpiinfo.pl -# -# reports some acpi battery info -# -# % remaining, minutes remaining, ac status -# -# works for all batteries (if you have > 1) and non-standard -# acpi directories (ie, not BATx) -# - -use strict; - -### config variables -my $acpibatdir = "/proc/acpi/battery"; -my $acpiacdir = "/proc/acpi/ac_adapter"; -my $max_minutes = 600; # 10hrs -### status variables -my $ac_status = 0; -my $battery_status = 0; -my $battery_maxcapacity = 0; -my $battery_curcapacity = 0; -my $battery_dischargerate = 0; -my $time_remaining = "U"; -my $percent_left = "U"; - - -### argument processing -if (scalar(@ARGV) != 1 - || ($ARGV[0] ne "-p" && $ARGV[0] ne "-th" && $ARGV[0] ne "-tm" && $ARGV[0] ne "-V") - ) -{ - print "U\n"; - print "\n"; - print "$0 [-p|-tm|-th|-a|-V]\n"; - print " -p: Report Percent Left\n"; - print " -th: Report Time Remaining (in hours)\n"; - print " -tm: Report Time Remaining (in minutes)\n"; - print " -V: acpi -V compatibility\n"; - print "\n"; - exit(1); -} # end if not enough parameters - - -### read info from acpi - -# find our ac status -opendir(DIR, $acpiacdir); -my @acdirfiles = grep { !/^\./ } readdir(DIR); -closedir(DIR); - -foreach my $acfile (@acdirfiles) -{ - open(AC, "$acpiacdir/$acfile/state") or die("ERROR: couldn't open acfile"); - while (my $line = ) - { - $ac_status = $1 if ($line =~ /^state:\s+(\S+)$/); - } # end while lines - close(AC); -} # end foreach acfile - -# find our battery info -opendir(DIR, $acpibatdir); -my @batdirfiles = grep { !/^\./ } readdir(DIR); -closedir(DIR); - -foreach my $batfile (@batdirfiles) -{ - open(BATINFO, "$acpibatdir/$batfile/info") or die("ERROR: couldn't open batfile"); - while (my $line = ) - { - $battery_maxcapacity += $1 if ($line =~ /^last full capacity:\s+(\d+)/); - } # end while lines - close(BATINFO); - - open(BATSTATE, "$acpibatdir/$batfile/state") or die("ERROR: couldn't open batstate"); - while (my $line = ) - { - $battery_status = $1 if ($line =~ /^charging state:\s+(\S+)$/); - $battery_curcapacity = $1 if ($line =~ /^remaining capacity:\s+(\d+)/); - $battery_dischargerate = $1 if ($line =~ /^present rate:\s+(\d+)/); - } # end while lines - close(BATSTATE); -} # end foreach batfile - -$time_remaining = sprintf("%.2f", $battery_curcapacity/$battery_dischargerate) if ($battery_dischargerate); -$time_remaining = "U" if ($time_remaining*60 > $max_minutes); -$percent_left = sprintf("%.2f", $battery_curcapacity/$battery_maxcapacity*100); - - -### do what the user wanted -if ($ARGV[0] eq "-p") -{ - print int($percent_left)."\n"; -} # end if percent left - -elsif ($ARGV[0] eq "-th") -{ - print $time_remaining."\n"; -} # end if time left (hours) - -elsif ($ARGV[0] eq "-tm") -{ - print int($time_remaining*60) if ($time_remaining ne "U"); - print "\n"; -} # end if time left (minutes) - -elsif ($ARGV[0] eq "-V") -{ -#$ acpi -V -# Battery 1: unknown, 100% -# Thermal 1: ok, 43.0 degrees C -# AC Adapter 1: on-line -#$ acpi -V -# Battery 1: charging, 97%, 00:26:45 until charged -# Thermal 1: ok, 39.0 degrees C -# AC Adapter 1: on-line -#$ acpi -V -# Battery 1: discharging, 71%, 02:12:12 remaining -# Thermal 1: ok, 48.0 degrees C -# AC Adapter 1: off-line - print " Battery 1: ".$battery_status.", "; - print int($percent_left)."%"; - if ($battery_status eq "discharging") - { - my $hours_remaining = int($time_remaining); - my $minutes_remaining = ($time_remaining * 60) % 60; - my $seconds_remaining = ($time_remaining * 3600) % 60; - print ", "; - printf("%.2d", $hours_remaining); - print ":"; - printf("%.2d", $minutes_remaining); - print ":"; - printf("%.2d", $seconds_remaining); - print " remaining"; - } # end if discharging - print "\n"; - print " Thermal 1: ok, 30.0 degrees C\n"; - print " AC Adapter 1: ".$ac_status."\n"; -} # end if ac status - - -### DEBUG -#print "AC Status: $ac_status\n"; -#print "BAT Status: $battery_status\n"; -#print "BAT Max Capacity: $battery_maxcapacity\n"; -#print "BAT Current Capacity: $battery_curcapacity\n"; -#print "BAT Discharge Rate: $battery_dischargerate\n"; -#print "Time Left: $time_remaining\n"; -#print "Percent Left: $percent_left\n"; - diff -Nurb netmrg-0.19/libexec/linuxapminfo.pl netmrg-0.20/ChangeLog/libexec/linuxapminfo.pl --- netmrg-0.19/libexec/linuxapminfo.pl 2003-10-19 00:19:58.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/linuxapminfo.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,56 +0,0 @@ -#!/usr/bin/perl -# -# linuxapminfo.pl -# -# reports values of certain apm values -# - -use strict; - -if (scalar(@ARGV) != 1 - || ($ARGV[0] ne "-p" && $ARGV[0] ne "-t") - ) -{ - print "U\n"; - print "\n"; - print "$0 [-p] [-t]\n"; - print " -p: Report Percent Left\n"; - print " -t: Report Time Remaining (in minutes)\n"; - print "\n"; - exit(1); -} # end if not enough parameters - -# read in info from apm -open 'apmfh', "/proc/apm"; -my $apmline = ; -close 'apmfh'; - -## get the value we want -# percent left -if ($ARGV[0] eq "-p") -{ - if ($apmline =~ /(\d+)%/) - { - print "$1\n"; - exit(0); - } # end if found percent left -} # end if percent left to check - -# time remaining -elsif ($ARGV[0] eq "-t") -{ - if ($apmline =~ /(\d+)\s+min$/) - { - print "$1\n"; - exit(0); - } # end if found min left - elsif ($apmline =~ /(\w+)\s+\?$/) - { - print "U\n"; - exit(0); - } # end if indef minutes left -} # end if time remaining - -print "U\n"; -exit (1); - diff -Nurb netmrg-0.19/libexec/linuxload.sh netmrg-0.20/ChangeLog/libexec/linuxload.sh --- netmrg-0.19/libexec/linuxload.sh 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/linuxload.sh 1970-01-01 05:30:00.000000000 +0530 @@ -1,14 +0,0 @@ -#!/bin/sh - -# usage linuxload.sh -# item can be 1, 2, or 3 - -if [ -f /proc/loadavg ]; then -# if [ "$1" = "1" ­o "$1" = "2" -o "$1" = "3" ]; then - cat /proc/loadavg | cut -d' ' -f$1 -# else -# echo "U" -# fi -else - echo "U" -fi diff -Nurb netmrg-0.19/libexec/linuxpmu.sh netmrg-0.20/ChangeLog/libexec/linuxpmu.sh --- netmrg-0.19/libexec/linuxpmu.sh 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/linuxpmu.sh 1970-01-01 05:30:00.000000000 +0530 @@ -1,11 +0,0 @@ -#!/bin/sh - -# usage linuxpmu.sh -# battery number can be 0 or 1 -# command can be 'charge', 'max_charge', 'current', 'voltage' - -if [ -f /proc/pmu/battery_$1 ]; then - cat /proc/pmu/battery_$1 | grep "^$2 *:" | awk -F: '{print $2}' -else - echo "U" -fi diff -Nurb netmrg-0.19/libexec/lmsensors.pl netmrg-0.20/ChangeLog/libexec/lmsensors.pl --- netmrg-0.19/libexec/lmsensors.pl 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/lmsensors.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,28 +0,0 @@ -#!/usr/bin/perl -use strict; - -### argument processing -my $sensor=$ARGV[0]; -my $hwmon=$ARGV[1] || "hwmon0"; -if (@ARGV < 1 or @ARGV > 2 or $sensor !~ /^\w+$/ or $hwmon !~ /^\w+$/) -{ - print "U\n"; - print "\n"; - print "$0 [monitor]\n"; - print "\n"; - print "Reports sensor gauges for use as a NetMRG test script.\n"; - print "\n"; - print "Options:\n"; - print " sensor Is the sensor value to report\n"; - print " monitor The hardware monitor the sensor is attached to, 'hwmon0' by default\n"; - print "\n"; - exit 1; -} - - -# read the data from the correct path -my $path = "/sys/class/hwmon/$hwmon/device/${sensor}_input"; -open(STAT, $path) || die ("U\nERROR: couldn't open $path\n\n"); -my $value = ; -close(STAT); -print $value; diff -Nurb netmrg-0.19/libexec/ping_time.pl netmrg-0.20/ChangeLog/libexec/ping_time.pl --- netmrg-0.19/libexec/ping_time.pl 2003-05-07 02:19:34.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/ping_time.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,16 +0,0 @@ -#!/usr/bin/perl - -# Return average ping time - -($ip) = @ARGV; - -@result = `ping -n -c 6 -i 0.2 -w 3 $ip 2>/dev/null`; -$result = $result[$#result]; -$result =~ s/.*= //; -$result =~ s/\/.*//; -if ($result =~ /errors/) -{ - print("U\n"); -} else { - print($result); -} diff -Nurb netmrg-0.19/libexec/pmmodems.pl netmrg-0.20/ChangeLog/libexec/pmmodems.pl --- netmrg-0.19/libexec/pmmodems.pl 2005-08-25 00:31:51.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/pmmodems.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,74 +0,0 @@ -#!/usr/bin/perl -w -# Copyright (c) 2004, Ben Winslow -# -# Released under the MIT (aka X11) License: -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. - -# Abstract: -# Tallies the number of active modems on a Livingston Portmaster. -# Modems in the 'active' and 'connecting' state are counted. -# Tested and working on PM3s running ComOS 3.9.1c1. -# Usage: -# pmmodems.pl
- -use Net::SNMP; - -sub get_users -{ - my ($comm, $ip) = @_; - my ($numusers) = 0; - my ($baseoid, $res, $k); - my ($snmp, $err) = Net::SNMP->session( - -hostname => $ip, - -community => $comm, - -version => 1 - ); - - die $err if ($err); - - # enterprises.livingston.livingstonMib.livingstonInterfaces.livingstonModem.livingstonModemTable.livingstonModemEntry.livingstonModemStatus - $baseoid = ".1.3.6.1.4.1.307.3.2.3.1.1.3"; - - $res = $snmp->get_table($baseoid); - - if (defined($res)) { - # use oid_lex_sort for properly sorted output if hacking - # up this script. it doesn't matter here. - foreach $k (keys %$res) { - # none(1), bound(2), connecting(3), - # active(4), test(5), down(6), ready(7), - # halt(8), admin(9) - $numusers++ if ($res->{$k} == 4 || $res->{$k} == 3); - } - } else { - $numusers = -1; - } - - $snmp->close(); - - return $numusers; -} - -my ($users); - -die "Usage: $0 \n" if (@ARGV != 2); - -$users = get_users($ARGV[0], $ARGV[1]); -print "$users\n" if ($users != -1); diff -Nurb netmrg-0.19/libexec/snmpdiff.php netmrg-0.20/ChangeLog/libexec/snmpdiff.php --- netmrg-0.19/libexec/snmpdiff.php 2002-11-13 04:42:11.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/snmpdiff.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,33 +0,0 @@ -#!/usr/bin/php -q - -** -** Descritpion: -** Gets an oid1 and oid2 from a community@host and -** returns just the facts -*/ - -// no errors! -error_reporting(E_NONE); - -// if less than 4 arguments, exit -if ($argc != 5) { exit; } - -$snmp_result0 = snmpget($argv[1], $argv[2], $argv[3]); -$snmp_result1 = snmpget($argv[1], $argv[2], $argv[4]); - -//if (!empty($snmp_result0) && !empty($snmp_result1)) { - $snmp_parts0 = explode(" ", $snmp_result0); - $snmp_parts1 = explode(" ", $snmp_result1); - $diff = ($snmp_parts0[count($snmp_parts0)-1]+0) - ($snmp_parts1[count($snmp_parts1)-1]+0); - echo "$diff\n"; -//} else { -// echo "U\n"; -//} // end if - -exit; -?> - diff -Nurb netmrg-0.19/libexec/snmpdiff.sh netmrg-0.20/ChangeLog/libexec/snmpdiff.sh --- netmrg-0.19/libexec/snmpdiff.sh 2005-11-03 23:17:04.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/snmpdiff.sh 1970-01-01 05:30:00.000000000 +0530 @@ -1,27 +0,0 @@ -#!/bin/sh -# -# snmpdiff.sh -# -# takes in arguments and outputs diff of OIDs -# - -if (( $# < 4 )); then - echo "Usage: $0 [... ]"; - exit 1; -fi; - -hostname="$1" -community="$2" -shift -shift - -snmpget="snmpget -v1 -c $community -Oqv $hostname" -val=`$snmpget $1`; -shift - -for i in "$@"; do - val=$(($val - `$snmpget $i`)); -done - -if (( $val != 0 )); then echo $val; else echo U; fi - diff -Nurb netmrg-0.19/libexec/win2kcpu.pl netmrg-0.20/ChangeLog/libexec/win2kcpu.pl --- netmrg-0.19/libexec/win2kcpu.pl 2003-02-04 05:57:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/libexec/win2kcpu.pl 1970-01-01 05:30:00.000000000 +0530 @@ -1,48 +0,0 @@ -#!/usr/bin/perl -# -# win2kcpu.pl -# -# uses snmpwalk to return the cpu load for -# the cpu requested, or the first cpu if no cpu specified -# - -use strict; - -# we need at least a host and a community string -if (scalar(@ARGV) < 2) -{ - print "U\n"; - exit(); -} # end if only one argument - -# some variables to be used later -my $host = $ARGV[0]; -my $community = $ARGV[1]; -my $cpunumber = 1; -my $cmdoutput; -my @outputpercpu; - -if (defined($ARGV[2])) -{ - $cpunumber = $ARGV[2]; -} # end if cpu number specified - - -# execute snmpwalk and store output -$cmdoutput = `snmpwalk -Ov -c $community $host host.hrDevice.hrProcessorTable.hrProcessorEntry.hrProcessorLoad 2> /dev/null`; -@outputpercpu = split(/\n$/, $cmdoutput); - -my $i = 0; -foreach my $line (@outputpercpu) -{ - $i++; - if ($i == $cpunumber) - { - $line =~ /(\d+)$/; - print "$1\n"; - exit(); - } # end if time to output cpu info -} # end output for each cpu - -print "U\n"; - diff -Nurb netmrg-0.19/m4/codeset.m4 netmrg-0.20/ChangeLog/m4/codeset.m4 --- netmrg-0.19/m4/codeset.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/codeset.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,23 +0,0 @@ -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) diff -Nurb netmrg-0.19/m4/gettext.m4 netmrg-0.20/ChangeLog/m4/gettext.m4 --- netmrg-0.19/m4/gettext.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/gettext.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,487 +0,0 @@ -# gettext.m4 serial 28 (gettext-0.13) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that don't -dnl support the ISO C 99 formatstring macros will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Set USE_NLS. - AM_NLS - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias ();], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -], [])[extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias ();], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl For backward compatibility. Some Makefiles may be using this. - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_XSIZE])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \ -mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \ -strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \ -__fsetlocking]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_ICONV - AM_LANGINFO_CODESET - if test $ac_cv_header_locale_h = yes; then - AM_LC_MESSAGES - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], -[ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff -Nurb netmrg-0.19/m4/glibc21.m4 netmrg-0.20/ChangeLog/m4/glibc21.m4 --- netmrg-0.19/m4/glibc21.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/glibc21.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) diff -Nurb netmrg-0.19/m4/iconv.m4 netmrg-0.20/ChangeLog/m4/iconv.m4 --- netmrg-0.19/m4/iconv.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/iconv.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,103 +0,0 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) diff -Nurb netmrg-0.19/m4/intdiv0.m4 netmrg-0.20/ChangeLog/m4/intdiv0.m4 --- netmrg-0.19/m4/intdiv0.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/intdiv0.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,72 +0,0 @@ -# intdiv0.m4 serial 1 (gettext-0.11.3) -dnl Copyright (C) 2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([gt_INTDIV0], -[ - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - - AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], - gt_cv_int_divbyzero_sigfpe, - [ - AC_TRY_RUN([ -#include -#include - -static void -#ifdef __cplusplus -sigfpe_handler (int sig) -#else -sigfpe_handler (sig) int sig; -#endif -{ - /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ - exit (sig != SIGFPE); -} - -int x = 1; -int y = 0; -int z; -int nan; - -int main () -{ - signal (SIGFPE, sigfpe_handler); -/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) - signal (SIGTRAP, sigfpe_handler); -#endif -/* Linux/SPARC yields signal SIGILL. */ -#if defined (__sparc__) && defined (__linux__) - signal (SIGILL, sigfpe_handler); -#endif - - z = x / y; - nan = y / y; - exit (1); -} -], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, - [ - # Guess based on the CPU. - case "$host_cpu" in - alpha* | i[34567]86 | m68k | s390*) - gt_cv_int_divbyzero_sigfpe="guessing yes";; - *) - gt_cv_int_divbyzero_sigfpe="guessing no";; - esac - ]) - ]) - case "$gt_cv_int_divbyzero_sigfpe" in - *yes) value=1;; - *) value=0;; - esac - AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, - [Define if integer division by zero raises signal SIGFPE.]) -]) diff -Nurb netmrg-0.19/m4/intmax.m4 netmrg-0.20/ChangeLog/m4/intmax.m4 --- netmrg-0.19/m4/intmax.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/intmax.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -# intmax.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether the system has the 'intmax_t' type, but don't attempt to -dnl find a replacement if it is lacking. - -AC_DEFUN([gt_TYPE_INTMAX_T], -[ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, - [AC_TRY_COMPILE([ -#include -#include -#if HAVE_STDINT_H_WITH_UINTMAX -#include -#endif -#if HAVE_INTTYPES_H_WITH_UINTMAX -#include -#endif -], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) - if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, - [Define if you have the 'intmax_t' type in or .]) - fi -]) diff -Nurb netmrg-0.19/m4/inttypes_h.m4 netmrg-0.20/ChangeLog/m4/inttypes_h.m4 --- netmrg-0.19/m4/inttypes_h.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/inttypes_h.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,28 +0,0 @@ -# inttypes_h.m4 serial 5 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_inttypes_h=yes, - jm_ac_cv_header_inttypes_h=no)]) - if test $jm_ac_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nurb netmrg-0.19/m4/inttypes.m4 netmrg-0.20/ChangeLog/m4/inttypes.m4 --- netmrg-0.19/m4/inttypes.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/inttypes.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,27 +0,0 @@ -# inttypes.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_INTTYPES_H if exists and doesn't clash with -# . - -AC_DEFUN([gt_HEADER_INTTYPES_H], -[ - AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, - [ - AC_TRY_COMPILE( - [#include -#include ], - [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) - ]) - if test $gt_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, - [Define if exists and doesn't clash with .]) - fi -]) diff -Nurb netmrg-0.19/m4/inttypes-pri.m4 netmrg-0.20/ChangeLog/m4/inttypes-pri.m4 --- netmrg-0.19/m4/inttypes-pri.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/inttypes-pri.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -# inttypes-pri.m4 serial 1 (gettext-0.11.4) -dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -# Define PRI_MACROS_BROKEN if exists and defines the PRI* -# macros to non-string values. This is the case on AIX 4.3.3. - -AC_DEFUN([gt_INTTYPES_PRI], -[ - AC_REQUIRE([gt_HEADER_INTTYPES_H]) - if test $gt_cv_header_inttypes_h = yes; then - AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], - gt_cv_inttypes_pri_broken, - [ - AC_TRY_COMPILE([#include -#ifdef PRId32 -char *p = PRId32; -#endif -], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) - ]) - fi - if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, - [Define if exists and defines unusable PRI* macros.]) - fi -]) diff -Nurb netmrg-0.19/m4/isc-posix.m4 netmrg-0.20/ChangeLog/m4/isc-posix.m4 --- netmrg-0.19/m4/isc-posix.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/isc-posix.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,26 +0,0 @@ -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) diff -Nurb netmrg-0.19/m4/lcmessage.m4 netmrg-0.20/ChangeLog/m4/lcmessage.m4 --- netmrg-0.19/m4/lcmessage.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/lcmessage.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -# lcmessage.m4 serial 3 (gettext-0.11.3) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995. - -# Check whether LC_MESSAGES is available in . - -AC_DEFUN([AM_LC_MESSAGES], -[ - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi -]) diff -Nurb netmrg-0.19/m4/lib-ld.m4 netmrg-0.20/ChangeLog/m4/lib-ld.m4 --- netmrg-0.19/m4/lib-ld.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/lib-ld.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,112 +0,0 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff -Nurb netmrg-0.19/m4/lib-link.m4 netmrg-0.20/ChangeLog/m4/lib-link.m4 --- netmrg-0.19/m4/lib-link.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/lib-link.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,551 +0,0 @@ -# lib-link.m4 serial 4 (gettext-0.12) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) diff -Nurb netmrg-0.19/m4/lib-prefix.m4 netmrg-0.20/ChangeLog/m4/lib-prefix.m4 --- netmrg-0.19/m4/lib-prefix.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/lib-prefix.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,155 +0,0 @@ -# lib-prefix.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) diff -Nurb netmrg-0.19/m4/longdouble.m4 netmrg-0.20/ChangeLog/m4/longdouble.m4 --- netmrg-0.19/m4/longdouble.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/longdouble.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,30 +0,0 @@ -# longdouble.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether the compiler supports the 'long double' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_LONGDOUBLE], -[ - AC_CACHE_CHECK([for long double], gt_cv_c_long_double, - [if test "$GCC" = yes; then - gt_cv_c_long_double=yes - else - AC_TRY_COMPILE([ - /* The Stardent Vistra knows sizeof(long double), but does not support it. */ - long double foo = 0.0; - /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ - int array [2*(sizeof(long double) >= sizeof(double)) - 1]; - ], , - gt_cv_c_long_double=yes, gt_cv_c_long_double=no) - fi]) - if test $gt_cv_c_long_double = yes; then - AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) - fi -]) diff -Nurb netmrg-0.19/m4/longlong.m4 netmrg-0.20/ChangeLog/m4/longlong.m4 --- netmrg-0.19/m4/longlong.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/longlong.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,25 +0,0 @@ -# longlong.m4 serial 4 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_LONG_LONG if 'long long' works. - -AC_DEFUN([jm_AC_TYPE_LONG_LONG], -[ - AC_CACHE_CHECK([for long long], ac_cv_type_long_long, - [AC_TRY_LINK([long long ll = 1LL; int i = 63;], - [long long llmax = (long long) -1; - return ll << i | ll >> i | llmax / ll | llmax % ll;], - ac_cv_type_long_long=yes, - ac_cv_type_long_long=no)]) - if test $ac_cv_type_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG, 1, - [Define if you have the 'long long' type.]) - fi -]) diff -Nurb netmrg-0.19/m4/Makefile.am netmrg-0.20/ChangeLog/m4/Makefile.am --- netmrg-0.19/m4/Makefile.am 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 diff -Nurb netmrg-0.19/m4/Makefile.in netmrg-0.20/ChangeLog/m4/Makefile.in --- netmrg-0.19/m4/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,307 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = m4 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign m4/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/m4/nls.m4 netmrg-0.20/ChangeLog/m4/nls.m4 --- netmrg-0.19/m4/nls.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/nls.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,49 +0,0 @@ -# nls.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) - -AC_DEFUN([AM_MKINSTALLDIRS], -[ - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate it. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - case "$ac_aux_dir" in - /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; - *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; - esac - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) diff -Nurb netmrg-0.19/m4/po.m4 netmrg-0.20/ChangeLog/m4/po.m4 --- netmrg-0.19/m4/po.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/po.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,426 +0,0 @@ -# po.m4 serial 3 (gettext-0.14) -dnl Copyright (C) 1995-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AM_NLS])dnl - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - AC_MSG_RESULT( - [found $GMSGFMT program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - fi - - AC_OUTPUT_COMMANDS([ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat < "$ac_file.tmp" - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" < -#include -/* The string "%2$d %1$d", with dollar characters protected from the shell's - dollar expansion (possibly an autoconf bug). */ -static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -static char buf[100]; -int main () -{ - sprintf (buf, format, 33, 55); - return (strcmp (buf, "55 33") != 0); -}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, - [ - AC_EGREP_CPP(notposix, [ -#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ - notposix -#endif - ], gt_cv_func_printf_posix="guessing no", - gt_cv_func_printf_posix="guessing yes") - ]) - ]) - case $gt_cv_func_printf_posix in - *yes) - AC_DEFINE(HAVE_POSIX_PRINTF, 1, - [Define if your printf() function supports format strings with positions.]) - ;; - esac -]) diff -Nurb netmrg-0.19/m4/progtest.m4 netmrg-0.20/ChangeLog/m4/progtest.m4 --- netmrg-0.19/m4/progtest.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/progtest.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,91 +0,0 @@ -# progtest.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1996. - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) diff -Nurb netmrg-0.19/m4/signed.m4 netmrg-0.20/ChangeLog/m4/signed.m4 --- netmrg-0.19/m4/signed.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/signed.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,19 +0,0 @@ -# signed.m4 serial 1 (gettext-0.10.40) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([bh_C_SIGNED], -[ - AC_CACHE_CHECK([for signed], bh_cv_c_signed, - [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) - if test $bh_cv_c_signed = no; then - AC_DEFINE(signed, , - [Define to empty if the C compiler doesn't support this keyword.]) - fi -]) diff -Nurb netmrg-0.19/m4/size_max.m4 netmrg-0.20/ChangeLog/m4/size_max.m4 --- netmrg-0.19/m4/size_max.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/size_max.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,61 +0,0 @@ -# size_max.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([gl_SIZE_MAX], -[ - AC_CHECK_HEADERS(stdint.h) - dnl First test whether the system already has SIZE_MAX. - AC_MSG_CHECKING([for SIZE_MAX]) - result= - AC_EGREP_CPP([Found it], [ -#include -#if HAVE_STDINT_H -#include -#endif -#ifdef SIZE_MAX -Found it -#endif -], result=yes) - if test -z "$result"; then - dnl Define it ourselves. Here we assume that the type 'size_t' is not wider - dnl than the type 'unsigned long'. - dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', - dnl which is guaranteed to work from LONG_MIN to LONG_MAX. - _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, - [#include ], result=?) - _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, - [#include ], result=?) - _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, - [#include ], result=?) - if test "$fits_in_uint" = 1; then - dnl Even though SIZE_MAX fits in an unsigned int, it must be of type - dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. - AC_TRY_COMPILE([#include - extern size_t foo; - extern unsigned long foo; - ], [], fits_in_uint=0) - fi - if test -z "$result"; then - if test "$fits_in_uint" = 1; then - result="$res_hi$res_lo"U - else - result="$res_hi$res_lo"UL - fi - else - dnl Shouldn't happen, but who knows... - result='~(size_t)0' - fi - fi - AC_MSG_RESULT([$result]) - if test "$result" != yes; then - AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], - [Define as the maximum value of type 'size_t', if the system doesn't define it.]) - fi -]) diff -Nurb netmrg-0.19/m4/stdint_h.m4 netmrg-0.20/ChangeLog/m4/stdint_h.m4 --- netmrg-0.19/m4/stdint_h.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/stdint_h.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,28 +0,0 @@ -# stdint_h.m4 serial 3 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -# doesn't clash with , and declares uintmax_t. - -AC_DEFUN([jm_AC_HEADER_STDINT_H], -[ - AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, - [AC_TRY_COMPILE( - [#include -#include ], - [uintmax_t i = (uintmax_t) -1;], - jm_ac_cv_header_stdint_h=yes, - jm_ac_cv_header_stdint_h=no)]) - if test $jm_ac_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, - [Define if exists, doesn't clash with , - and declares uintmax_t. ]) - fi -]) diff -Nurb netmrg-0.19/m4/uintmax_t.m4 netmrg-0.20/ChangeLog/m4/uintmax_t.m4 --- netmrg-0.19/m4/uintmax_t.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/uintmax_t.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -# uintmax_t.m4 serial 7 (gettext-0.12) -dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -AC_PREREQ(2.13) - -# Define uintmax_t to 'unsigned long' or 'unsigned long long' -# if it is not already defined in or . - -AC_DEFUN([jm_AC_TYPE_UINTMAX_T], -[ - AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([jm_AC_HEADER_STDINT_H]) - if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then - AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) - test $ac_cv_type_unsigned_long_long = yes \ - && ac_type='unsigned long long' \ - || ac_type='unsigned long' - AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, - [Define to unsigned long or unsigned long long - if and don't define.]) - else - AC_DEFINE(HAVE_UINTMAX_T, 1, - [Define if you have the 'uintmax_t' type in or .]) - fi -]) diff -Nurb netmrg-0.19/m4/ulonglong.m4 netmrg-0.20/ChangeLog/m4/ulonglong.m4 --- netmrg-0.19/m4/ulonglong.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/ulonglong.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,25 +0,0 @@ -# ulonglong.m4 serial 3 -dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Paul Eggert. - -# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. - -AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -[ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, - [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) - if test $ac_cv_type_unsigned_long_long = yes; then - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, - [Define if you have the 'unsigned long long' type.]) - fi -]) diff -Nurb netmrg-0.19/m4/wchar_t.m4 netmrg-0.20/ChangeLog/m4/wchar_t.m4 --- netmrg-0.19/m4/wchar_t.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/wchar_t.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -# wchar_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether has the 'wchar_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WCHAR_T], -[ - AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, - [AC_TRY_COMPILE([#include - wchar_t foo = (wchar_t)'\0';], , - gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) - if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) - fi -]) diff -Nurb netmrg-0.19/m4/wint_t.m4 netmrg-0.20/ChangeLog/m4/wint_t.m4 --- netmrg-0.19/m4/wint_t.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/wint_t.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -# wint_t.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. -dnl Test whether has the 'wint_t' type. -dnl Prerequisite: AC_PROG_CC - -AC_DEFUN([gt_TYPE_WINT_T], -[ - AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, - [AC_TRY_COMPILE([#include - wint_t foo = (wchar_t)'\0';], , - gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) - fi -]) diff -Nurb netmrg-0.19/m4/xsize.m4 netmrg-0.20/ChangeLog/m4/xsize.m4 --- netmrg-0.19/m4/xsize.m4 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/m4/xsize.m4 1970-01-01 05:30:00.000000000 +0530 @@ -1,14 +0,0 @@ -# xsize.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -AC_DEFUN([gl_XSIZE], -[ - dnl Prerequisites of lib/xsize.h. - AC_REQUIRE([gl_SIZE_MAX]) - AC_CHECK_HEADERS(stdint.h) -]) diff -Nurb netmrg-0.19/Makefile.am netmrg-0.20/ChangeLog/Makefile.am --- netmrg-0.19/Makefile.am 2005-11-04 20:39:02.000000000 +0530 +++ netmrg-0.20/ChangeLog/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,138 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -SUBDIRS = m4 po src www etc var . - -ACLOCAL_AMFLAGS = -I m4 - -EXTRA_DIST = config.rpath ABOUT-NLS - -install : all install-recursive - -# options to install files in the libexec directory -netmrg_libexecdir=$(libexecdir)/$(PACKAGE) -netmrg_libexec_SCRIPTS = libexec/*.php libexec/*.pl - -# options to install files in the bin directory -bin_SCRIPTS = bin/rrdedit - -# options to install files in the share/images directory -netmrg_share_imagesdir=$(pkgdatadir)/images -netmrg_share_images_DATA = share/images/default/*.svg - -# options to install files in the share/db directory -netmrg_share_dbdir=$(pkgdatadir)/db -netmrg_share_db_DATA = share/netmrg.mysql - -# options to install files in the share/contrib directory -netmrg_share_bindstatsdir=$(pkgdatadir)/contrib/bindstats -netmrg_share_bindstats_DATA = contrib/bindstats/dnsstats* - -# options to install files in the share/doc directory -netmrg_share_docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION) -netmrg_share_doc_DATA = INSTALL README share/doc/*.sgml share/doc/ChangeLog share/doc/LICENSE share/doc/TODO share/doc/txt/netmrg.txt share/doc/txt/INSTALL share/doc/txt/RELEASE-NOTES share/doc/txt/UPGRADE etc/cron.d-netmrg etc/init.d-netmrg - -# html documentation -netmrg_share_htmldir=$(datadir)/doc/$(PACKAGE)-$(VERSION)/html -netmrg_share_html_DATA = share/doc/html/*.html - -# man1 pages -netmrg_man1dir=$(mandir)/man1 -netmrg_man1_DATA = share/doc/man/man1/*.1 - -# options to install files in the var/log directory -netmrg_var_logdir=$(localstatedir)/log/$(PACKAGE) -netmrg_var_log_DATA = - - -distclean: distclean-recursive - @echo " RM $(am__CONFIG_DISTCLEAN_FILES)" - @rm -f $(am__CONFIG_DISTCLEAN_FILES) - @echo " RM Makefile" - @rm -f Makefile - -install-netmrg_libexecSCRIPTS: $(netmrg_libexec_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(netmrg_libexecdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_libexecdir)" - @echo " INST $(netmrg_libexec_SCRIPTS)" - @list='$(netmrg_libexec_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - $(netmrg_libexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_libexecdir)/$$f"; \ - else :; fi; \ - done - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @echo " INST $(bin_SCRIPTS)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -install-netmrg_share_imagesDATA: $(netmrg_share_images_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_imagesdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_imagesdir)" - @echo " INST $(netmrg_share_images_DATA)" - @list='$(netmrg_share_images_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_imagesdir)/$$f"; \ - done - -install-netmrg_share_dbDATA: $(netmrg_share_db_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_dbdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_dbdir)" - @echo " INST $(netmrg_share_db_DATA)" - @list='$(netmrg_share_db_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_dbDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_dbdir)/$$f"; \ - done - -install-netmrg_share_bindstatsDATA: $(netmrg_share_bindstats_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_bindstatsdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_bindstatsdir)" - @echo " INST $(netmrg_share_bindstats_DATA)" - @list='$(netmrg_share_bindstats_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_bindstatsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_bindstatsdir)/$$f"; \ - done - -install-netmrg_share_docDATA: $(netmrg_share_doc_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_docdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_docdir)" - @echo " INST $(netmrg_share_doc_DATA)" - @list='$(netmrg_share_doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_docdir)/$$f"; \ - done - -install-netmrg_share_htmlDATA: $(netmrg_share_html_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_htmldir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_htmldir)" - @echo " INST $(netmrg_share_html_DATA)" - @list='$(netmrg_share_html_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_htmldir)/$$f"; \ - done - -install-netmrg_man1DATA: $(netmrg_man1_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_man1dir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_man1dir)" - @echo " INST $(netmrg_man1_DATA)" - @list='$(netmrg_man1_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_man1DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_man1dir)/$$f"; \ - done - diff -Nurb netmrg-0.19/Makefile.in netmrg-0.20/ChangeLog/Makefile.in --- netmrg-0.19/Makefile.in 2006-02-04 06:41:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,881 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake - - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/subst.in \ - $(top_srcdir)/Make.inc $(top_srcdir)/bin/rrdedit.in \ - $(top_srcdir)/configure $(top_srcdir)/src/include/config.h.in \ - $(top_srcdir)/src/include/netmrg.h.in \ - $(top_srcdir)/www/include/config.php.in ABOUT-NLS INSTALL \ - config.guess config.rpath config.sub depcomp install-sh \ - missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = subst bin/rrdedit src/include/netmrg.h \ - www/include/config.php -am__installdirs = "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(netmrg_libexecdir)" "$(DESTDIR)$(netmrg_man1dir)" \ - "$(DESTDIR)$(netmrg_share_bindstatsdir)" \ - "$(DESTDIR)$(netmrg_share_dbdir)" \ - "$(DESTDIR)$(netmrg_share_docdir)" \ - "$(DESTDIR)$(netmrg_share_htmldir)" \ - "$(DESTDIR)$(netmrg_share_imagesdir)" \ - "$(DESTDIR)$(netmrg_var_logdir)" -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -netmrg_libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) $(netmrg_libexec_SCRIPTS) -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -netmrg_man1DATA_INSTALL = $(INSTALL_DATA) -netmrg_share_bindstatsDATA_INSTALL = $(INSTALL_DATA) -netmrg_share_dbDATA_INSTALL = $(INSTALL_DATA) -netmrg_share_docDATA_INSTALL = $(INSTALL_DATA) -netmrg_share_htmlDATA_INSTALL = $(INSTALL_DATA) -netmrg_share_imagesDATA_INSTALL = $(INSTALL_DATA) -netmrg_var_logDATA_INSTALL = $(INSTALL_DATA) -DATA = $(netmrg_man1_DATA) $(netmrg_share_bindstats_DATA) \ - $(netmrg_share_db_DATA) $(netmrg_share_doc_DATA) \ - $(netmrg_share_html_DATA) $(netmrg_share_images_DATA) \ - $(netmrg_var_log_DATA) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - -SUBDIRS = m4 po src www etc var . -ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = config.rpath ABOUT-NLS - -# options to install files in the libexec directory -netmrg_libexecdir = $(libexecdir)/$(PACKAGE) -netmrg_libexec_SCRIPTS = libexec/*.php libexec/*.pl - -# options to install files in the bin directory -bin_SCRIPTS = bin/rrdedit - -# options to install files in the share/images directory -netmrg_share_imagesdir = $(pkgdatadir)/images -netmrg_share_images_DATA = share/images/default/*.svg - -# options to install files in the share/db directory -netmrg_share_dbdir = $(pkgdatadir)/db -netmrg_share_db_DATA = share/netmrg.mysql - -# options to install files in the share/contrib directory -netmrg_share_bindstatsdir = $(pkgdatadir)/contrib/bindstats -netmrg_share_bindstats_DATA = contrib/bindstats/dnsstats* - -# options to install files in the share/doc directory -netmrg_share_docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -netmrg_share_doc_DATA = INSTALL README share/doc/*.sgml share/doc/ChangeLog share/doc/LICENSE share/doc/TODO share/doc/txt/netmrg.txt share/doc/txt/INSTALL share/doc/txt/RELEASE-NOTES share/doc/txt/UPGRADE etc/cron.d-netmrg etc/init.d-netmrg - -# html documentation -netmrg_share_htmldir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html -netmrg_share_html_DATA = share/doc/html/*.html - -# man1 pages -netmrg_man1dir = $(mandir)/man1 -netmrg_man1_DATA = share/doc/man/man1/*.1 - -# options to install files in the var/log directory -netmrg_var_logdir = $(localstatedir)/log/$(PACKAGE) -netmrg_var_log_DATA = -all: all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -src/include/config.h: src/include/stamp-h1 - @if test ! -f $@; then \ - rm -f src/include/stamp-h1; \ - $(MAKE) src/include/stamp-h1; \ - else :; fi - -src/include/stamp-h1: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status - @rm -f src/include/stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status src/include/config.h -$(top_srcdir)/src/include/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f src/include/stamp-h1 - touch $@ - -distclean-hdr: - -rm -f src/include/config.h src/include/stamp-h1 -subst: $(top_builddir)/config.status $(srcdir)/subst.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -bin/rrdedit: $(top_builddir)/config.status $(top_srcdir)/bin/rrdedit.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -src/include/netmrg.h: $(top_builddir)/config.status $(top_srcdir)/src/include/netmrg.h.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -www/include/config.php: $(top_builddir)/config.status $(top_srcdir)/www/include/config.php.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -uninstall-netmrg_libexecSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_libexec_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(netmrg_libexecdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_libexecdir)/$$f"; \ - done -uninstall-info-am: - -uninstall-netmrg_man1DATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_man1_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_man1dir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_man1dir)/$$f"; \ - done - -uninstall-netmrg_share_bindstatsDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_share_bindstats_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_share_bindstatsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_share_bindstatsdir)/$$f"; \ - done - -uninstall-netmrg_share_dbDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_share_db_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_share_dbdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_share_dbdir)/$$f"; \ - done - -uninstall-netmrg_share_docDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_share_doc_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_share_docdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_share_docdir)/$$f"; \ - done - -uninstall-netmrg_share_htmlDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_share_html_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_share_htmldir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_share_htmldir)/$$f"; \ - done - -uninstall-netmrg_share_imagesDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_share_images_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_share_imagesdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_share_imagesdir)/$$f"; \ - done -install-netmrg_var_logDATA: $(netmrg_var_log_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_var_logdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_var_logdir)" - @list='$(netmrg_var_log_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(netmrg_var_logDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(netmrg_var_logdir)/$$f'"; \ - $(netmrg_var_logDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_var_logdir)/$$f"; \ - done - -uninstall-netmrg_var_logDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_var_log_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_var_logdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_var_logdir)/$$f"; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/bin $(distdir)/etc $(distdir)/m4 $(distdir)/po $(distdir)/src/include $(distdir)/www/include - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile $(SCRIPTS) $(DATA) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(netmrg_libexecdir)" "$(DESTDIR)$(netmrg_man1dir)" "$(DESTDIR)$(netmrg_share_bindstatsdir)" "$(DESTDIR)$(netmrg_share_dbdir)" "$(DESTDIR)$(netmrg_share_docdir)" "$(DESTDIR)$(netmrg_share_htmldir)" "$(DESTDIR)$(netmrg_share_imagesdir)" "$(DESTDIR)$(netmrg_var_logdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: install-netmrg_man1DATA \ - install-netmrg_share_bindstatsDATA install-netmrg_share_dbDATA \ - install-netmrg_share_docDATA install-netmrg_share_htmlDATA \ - install-netmrg_share_imagesDATA install-netmrg_var_logDATA - -install-exec-am: install-binSCRIPTS install-netmrg_libexecSCRIPTS - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binSCRIPTS uninstall-info-am \ - uninstall-netmrg_libexecSCRIPTS uninstall-netmrg_man1DATA \ - uninstall-netmrg_share_bindstatsDATA \ - uninstall-netmrg_share_dbDATA uninstall-netmrg_share_docDATA \ - uninstall-netmrg_share_htmlDATA \ - uninstall-netmrg_share_imagesDATA uninstall-netmrg_var_logDATA - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man \ - install-netmrg_libexecSCRIPTS install-netmrg_man1DATA \ - install-netmrg_share_bindstatsDATA install-netmrg_share_dbDATA \ - install-netmrg_share_docDATA install-netmrg_share_htmlDATA \ - install-netmrg_share_imagesDATA install-netmrg_var_logDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \ - uninstall-netmrg_libexecSCRIPTS uninstall-netmrg_man1DATA \ - uninstall-netmrg_share_bindstatsDATA \ - uninstall-netmrg_share_dbDATA uninstall-netmrg_share_docDATA \ - uninstall-netmrg_share_htmlDATA \ - uninstall-netmrg_share_imagesDATA uninstall-netmrg_var_logDATA - -@SET_MAKE@ - -install : all install-recursive - -distclean: distclean-recursive - @echo " RM $(am__CONFIG_DISTCLEAN_FILES)" - @rm -f $(am__CONFIG_DISTCLEAN_FILES) - @echo " RM Makefile" - @rm -f Makefile - -install-netmrg_libexecSCRIPTS: $(netmrg_libexec_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(netmrg_libexecdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_libexecdir)" - @echo " INST $(netmrg_libexec_SCRIPTS)" - @list='$(netmrg_libexec_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - $(netmrg_libexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_libexecdir)/$$f"; \ - else :; fi; \ - done - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @echo " INST $(bin_SCRIPTS)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -install-netmrg_share_imagesDATA: $(netmrg_share_images_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_imagesdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_imagesdir)" - @echo " INST $(netmrg_share_images_DATA)" - @list='$(netmrg_share_images_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_imagesdir)/$$f"; \ - done - -install-netmrg_share_dbDATA: $(netmrg_share_db_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_dbdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_dbdir)" - @echo " INST $(netmrg_share_db_DATA)" - @list='$(netmrg_share_db_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_dbDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_dbdir)/$$f"; \ - done - -install-netmrg_share_bindstatsDATA: $(netmrg_share_bindstats_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_bindstatsdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_bindstatsdir)" - @echo " INST $(netmrg_share_bindstats_DATA)" - @list='$(netmrg_share_bindstats_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_bindstatsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_bindstatsdir)/$$f"; \ - done - -install-netmrg_share_docDATA: $(netmrg_share_doc_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_docdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_docdir)" - @echo " INST $(netmrg_share_doc_DATA)" - @list='$(netmrg_share_doc_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_docdir)/$$f"; \ - done - -install-netmrg_share_htmlDATA: $(netmrg_share_html_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_share_htmldir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_share_htmldir)" - @echo " INST $(netmrg_share_html_DATA)" - @list='$(netmrg_share_html_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_share_htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_share_htmldir)/$$f"; \ - done - -install-netmrg_man1DATA: $(netmrg_man1_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_man1dir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_man1dir)" - @echo " INST $(netmrg_man1_DATA)" - @list='$(netmrg_man1_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - $(netmrg_man1DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_man1dir)/$$f"; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/Make.inc netmrg-0.20/ChangeLog/Make.inc --- netmrg-0.19/Make.inc 2004-10-21 12:22:23.000000000 +0530 +++ netmrg-0.20/ChangeLog/Make.inc 1970-01-01 05:30:00.000000000 +0530 @@ -1,7 +0,0 @@ - -# These settings are pulled into Makefile.in by automake - -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - diff -Nurb netmrg-0.19/missing netmrg-0.20/ChangeLog/missing --- netmrg-0.19/missing 2003-07-09 06:51:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/missing 1970-01-01 05:30:00.000000000 +0530 @@ -1,336 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.4 - GNU automake" - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - - aclocal*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. - You can get \`$1Help2man' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 diff -Nurb netmrg-0.19/mkinstalldirs netmrg-0.20/ChangeLog/mkinstalldirs --- netmrg-0.19/mkinstalldirs 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/mkinstalldirs 1970-01-01 05:30:00.000000000 +0530 @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here diff -Nurb netmrg-0.19/po/boldquot.sed netmrg-0.20/ChangeLog/po/boldquot.sed --- netmrg-0.19/po/boldquot.sed 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/boldquot.sed 1970-01-01 05:30:00.000000000 +0530 @@ -1,10 +0,0 @@ -s/"\([^"]*\)"/“\1â€/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“â€/""/g -s/“/“/g -s/â€/â€/g -s/‘/‘/g -s/’/’/g diff -Nurb netmrg-0.19/po/en@boldquot.header netmrg-0.20/ChangeLog/po/en@boldquot.header --- netmrg-0.19/po/en@boldquot.header 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/en@boldquot.header 1970-01-01 05:30:00.000000000 +0530 @@ -1,25 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# -# This catalog furthermore displays the text between the quotation marks in -# bold face, assuming the VT100/XTerm escape sequences. -# diff -Nurb netmrg-0.19/po/en@quot.header netmrg-0.20/ChangeLog/po/en@quot.header --- netmrg-0.19/po/en@quot.header 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/en@quot.header 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# diff -Nurb netmrg-0.19/po/insert-header.sin netmrg-0.20/ChangeLog/po/insert-header.sin --- netmrg-0.19/po/insert-header.sin 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/insert-header.sin 1970-01-01 05:30:00.000000000 +0530 @@ -1,23 +0,0 @@ -# Sed script that inserts the file called HEADER before the header entry. -# -# At each occurrence of a line starting with "msgid ", we execute the following -# commands. At the first occurrence, insert the file. At the following -# occurrences, do nothing. The distinction between the first and the following -# occurrences is achieved by looking at the hold space. -/^msgid /{ -x -# Test if the hold space is empty. -s/m/m/ -ta -# Yes it was empty. First occurrence. Read the file. -r HEADER -# Output the file's contents by reading the next line. But don't lose the -# current line while doing this. -g -N -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff -Nurb netmrg-0.19/po/LINGUAS netmrg-0.20/ChangeLog/po/LINGUAS --- netmrg-0.19/po/LINGUAS 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/LINGUAS 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -# Available languages diff -Nurb netmrg-0.19/po/Makefile.in.in netmrg-0.20/ChangeLog/po/Makefile.in.in --- netmrg-0.19/po/Makefile.in.in 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/Makefile.in.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,366 +0,0 @@ -# Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU General Public -# License but which still want to provide support for the GNU gettext -# functionality. -# Please note that the actual code of GNU gettext is covered by the GNU -# General Public License and is *not* in the public domain. -# -# Origin: gettext-0.14 - -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -MSGMERGE = msgmerge -MSGMERGE_UPDATE = @MSGMERGE@ --update -MSGINIT = msginit -MSGCONV = msgconv -MSGFILTER = msgfilter - -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -UPDATEPOFILES = @UPDATEPOFILES@ -DUMMYPOFILES = @DUMMYPOFILES@ -DISTFILES.common = Makefile.in.in remove-potcdate.sin \ -$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) -DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \ -$(POFILES) $(GMOFILES) \ -$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) - -POTFILES = \ - -CATALOGS = @CATALOGS@ - -# Makevars gets inserted here. (Don't remove this line!) - -.SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update - -.po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ - -.po.gmo: - @lang=`echo $* | sed -e 's,.*/,,'`; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo - -.sin.sed: - sed -e '/^#/d' $< > t-$@ - mv t-$@ $@ - - -all: all-@USE_NLS@ - -all-yes: stamp-po -all-no: - -# stamp-po is a timestamp denoting the last time at which the CATALOGS have -# been loosely updated. Its purpose is that when a developer or translator -# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, -# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent -# invocations of "make" will do nothing. This timestamp would not be necessary -# if updating the $(CATALOGS) would always touch them; however, the rule for -# $(POFILES) has been designed to not touch files that don't need to be -# changed. -stamp-po: $(srcdir)/$(DOMAIN).pot - test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) - @echo "touch stamp-po" - @echo timestamp > stamp-poT - @mv stamp-poT stamp-po - -# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', -# otherwise packages like GCC can not be built if only parts of the source -# have been downloaded. - -# This target rebuilds $(DOMAIN).pot; it is an expensive operation. -# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. -$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' - test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ - if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ - else \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - else \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - } - -# This rule has no dependencies: we don't need to update $(DOMAIN).pot at -# every "make" invocation, only create it when it is missing. -# Only "make $(DOMAIN).pot-update" or "make dist" will force an update. -$(srcdir)/$(DOMAIN).pot: - $(MAKE) $(DOMAIN).pot-update - -# This target rebuilds a PO file if $(DOMAIN).pot has changed. -# Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot - @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ - if test -f "$(srcdir)/$${lang}.po"; then \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ - else \ - $(MAKE) $${lang}.po-create; \ - fi - - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - for file in Makevars; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -install-data-no: all -install-data-yes: all - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ - link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ - ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ - cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ - fi; \ - done; \ - done - -install-strip: install - -installdirs: installdirs-exec installdirs-data -installdirs-exec: -installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi -installdirs-data-no: -installdirs-data-yes: - $(mkinstalldirs) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(mkinstalldirs) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ - link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ - mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ - for file in *; do \ - if test -f $$file; then \ - ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ - fi; \ - done); \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ - else \ - if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ - :; \ - else \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ - mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ - fi; \ - fi; \ - fi; \ - done; \ - done - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: uninstall-exec uninstall-data -uninstall-exec: -uninstall-data: uninstall-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in $(DISTFILES.common) Makevars.template; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ - else \ - : ; \ - fi -uninstall-data-no: -uninstall-data-yes: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ - rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ - done; \ - done - -check: all - -info dvi ps pdf html tags TAGS ctags CTAGS ID: - -mostlyclean: - rm -f remove-potcdate.sed - rm -f stamp-poT - rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f stamp-po $(GMOFILES) - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: - $(MAKE) update-po - @$(MAKE) dist2 -# This is a separate target because 'update-po' must be executed before. -dist2: $(DISTFILES) - dists="$(DISTFILES)"; \ - if test "$(PACKAGE)" = "gettext-tools"; then \ - dists="$$dists Makevars.template"; \ - fi; \ - if test -f $(srcdir)/ChangeLog; then \ - dists="$$dists ChangeLog"; \ - fi; \ - for i in 0 1 2 3 4 5 6 7 8 9; do \ - if test -f $(srcdir)/ChangeLog.$$i; then \ - dists="$$dists ChangeLog.$$i"; \ - fi; \ - done; \ - if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ - for file in $$dists; do \ - if test -f $$file; then \ - cp -p $$file $(distdir); \ - else \ - cp -p $(srcdir)/$$file $(distdir); \ - fi; \ - done - -update-po: Makefile - $(MAKE) $(DOMAIN).pot-update - test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES) - $(MAKE) update-gmo - -# General rule for creating PO files. - -.nop.po-create: - @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \ - echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \ - exit 1 - -# General rule for updating PO files. - -.nop.po-update: - @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ - if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ - cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -$(DUMMYPOFILES): - -update-gmo: Makefile $(GMOFILES) - @: - -Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@ - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -force: - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/po/Makevars netmrg-0.20/ChangeLog/po/Makevars --- netmrg-0.19/po/Makevars 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/Makevars 1970-01-01 05:30:00.000000000 +0530 @@ -1,42 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. -localedir = $(datadir)/$(PACKAGE)/locale - -# These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = NetMRG Development Team - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = Devel Forum at http://lists.netmrg.net - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff -Nurb netmrg-0.19/po/netmrg.pot netmrg-0.20/ChangeLog/po/netmrg.pot --- netmrg-0.19/po/netmrg.pot 2004-12-13 06:05:20.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/netmrg.pot 1970-01-01 05:30:00.000000000 +0530 @@ -1,41 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR NetMRG Development Team -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Devel Forum at http://lists.netmrg.net\n" -"POT-Creation-Date: 2004-12-12 19:29-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/settings.cpp:117 -msgid "Parsing config section" -msgstr "" - -#: src/settings.cpp:190 -msgid "Second stage parser not aware of this section." -msgstr "" - -#: src/settings.cpp:205 -msgid "Failed to parse configuration file" -msgstr "" - -#: src/settings.cpp:213 -msgid "Empty configuration file" -msgstr "" - -#: src/settings.cpp:220 -msgid "Configuration file of the wrong type. Root node is not 'netmrg.'" -msgstr "" - -#: src/settings.cpp:265 -msgid "Unexpected section in configuration file: " -msgstr "" diff -Nurb netmrg-0.19/po/POTFILES.in netmrg-0.20/ChangeLog/po/POTFILES.in --- netmrg-0.19/po/POTFILES.in 2004-12-13 06:06:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/POTFILES.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,60 +0,0 @@ -# List of source files containing translatable strings. -# Copyright (C) 2004 NetMRG Development Team - -# C++ files -src/db.cpp -src/devices.cpp -src/events.cpp -src/locks.cpp -src/mappings.cpp -src/monitors.cpp -src/netmrg.cpp -src/rrd.cpp -src/settings.cpp -src/snmp.cpp -src/utils.cpp - -# PHP files -www/lib/auth.php -www/lib/database.php -www/lib/format.php -www/lib/graphing.php -www/lib/misc.php -www/lib/phptimer.php -www/lib/processing.php -www/lib/static.php -www/lib/xml_to_array.php -www/webfiles/about.php -www/webfiles/color_dialog.php -www/webfiles/conditions.php -www/webfiles/contributors.php -www/webfiles/devices.php -www/webfiles/device_tree.php -www/webfiles/dev_types.php -www/webfiles/enclose_graph.php -www/webfiles/error.php -www/webfiles/event_log.php -www/webfiles/events.php -www/webfiles/get_graph.php -www/webfiles/graph_items.php -www/webfiles/graphs.php -www/webfiles/groups.php -www/webfiles/grpdev_list.php -www/webfiles/index.php -www/webfiles/login.php -www/webfiles/logout.php -www/webfiles/monitors.php -www/webfiles/notifications.php -www/webfiles/recache.php -www/webfiles/responses.php -www/webfiles/snmp_cache_view.php -www/webfiles/sub_devices.php -www/webfiles/sub_dev_param.php -www/webfiles/tests_script.php -www/webfiles/tests_snmp.php -www/webfiles/tests_sql.php -www/webfiles/updater.php -www/webfiles/user_prefs.php -www/webfiles/users.php -www/webfiles/view.php - diff -Nurb netmrg-0.19/po/quot.sed netmrg-0.20/ChangeLog/po/quot.sed --- netmrg-0.19/po/quot.sed 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/quot.sed 1970-01-01 05:30:00.000000000 +0530 @@ -1,6 +0,0 @@ -s/"\([^"]*\)"/“\1â€/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“â€/""/g diff -Nurb netmrg-0.19/po/remove-potcdate.sin netmrg-0.20/ChangeLog/po/remove-potcdate.sin --- netmrg-0.19/po/remove-potcdate.sin 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/remove-potcdate.sin 1970-01-01 05:30:00.000000000 +0530 @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff -Nurb netmrg-0.19/po/Rules-quot netmrg-0.20/ChangeLog/po/Rules-quot --- netmrg-0.19/po/Rules-quot 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/Rules-quot 1970-01-01 05:30:00.000000000 +0530 @@ -1,47 +0,0 @@ -# Special Makefile rules for English message catalogs with quotation marks. - -DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot - -.SUFFIXES: .insert-header .po-update-en - -en@quot.po-create: - $(MAKE) en@quot.po-update -en@boldquot.po-create: - $(MAKE) en@boldquot.po-update - -en@quot.po-update: en@quot.po-update-en -en@boldquot.po-update: en@boldquot.po-update-en - -.insert-header.po-update-en: - @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - ll=`echo $$lang | sed -e 's/@.*//'`; \ - LC_ALL=C; export LC_ALL; \ - cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "creation of $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -en@quot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header - -en@boldquot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header - -mostlyclean: mostlyclean-quot -mostlyclean-quot: - rm -f *.insert-header diff -Nurb netmrg-0.19/po/stamp-po netmrg-0.20/ChangeLog/po/stamp-po --- netmrg-0.19/po/stamp-po 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/po/stamp-po 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -timestamp diff -Nurb netmrg-0.19/README netmrg-0.20/ChangeLog/README --- netmrg-0.19/README 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/README 1970-01-01 05:30:00.000000000 +0530 @@ -1,504 +0,0 @@ - -The NetMRG Reference - -Brady Alleman - -Douglas E. Warner - - Copyright © 2003-2006 Brady Alleman and Douglas E. Warner - - This project is licensed under the terms of the MIT License. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - All product names are property of their respective owners. Such - names are used for identification purposes only and are not - indicative of endorsement by or of any company, organization, - product, or platform. - _________________________________________________________ - - Table of Contents - I. Overview - - 1. Introduction - 2. Revision History - - II. Installation - - 3. Software Requirements - 4. Satisfying Requirements - 5. Installation Procedure - 6. Upgrade Procedure - - III. Reference - - I. Manual Pages - - netmrg-gatherer -- Gathers data from devices. - - 7. Contact Information - -I. Overview - - Table of Contents - 1. Introduction - 2. Revision History - _________________________________________________________ - -Chapter 1. Introduction - - Welcome to NetMRG! NetMRG is a database-driven network monitoring - and graphing tool for use on Linux systems. It offers an intuitive - web-based configuration, customized monitoring capabilities for - unusual situations, a fast multi-threaded polling application, and - brilliant graphs rendered by RRDTOOL. - - This document aims to guide you swiftly through the installation and - configuration of NetMRG, as well as act as a reference for those - with existing installations. - _________________________________________________________ - -Chapter 2. Revision History - - * 0.19 - 2006.02.03 - Major Feature Enhancements and Bug Fixes; Major Web Interface - redesign to give more room for graphs and ease overall use. - Security enhancements behind the scenes to ensure correct - permissions checking. Added a search interface that will search - groups, devices, sub devies, and sub device parameters. RRDtool - 1.2 support (including graph smoothing); Depricated use of - netmrg_cron.sh in favor of using netmrg-gatherer; migrated bulk - of docs to wiki; numerous other bugfixes and enhancements. - * 0.18.2 - 2004.11.09 - Minor Bug Fixes; Fixed some escaping problems on the interface - cache page, disabled the 'quickprint' Net-SNMP option for better - compatibility, fixed the snmp-failure test, fixed an SVO-user - view issue, and added failover for duplicate ifNames when adding - interfaces. - * 0.18.1 - 2004.11.01 - Minor Bug Fixes; Fixed a small bug where the gatherer would not - register negative values. - * 0.18 - 2004.10.25 - Major Bug Fixes; Fixed an issue preventing form submissions on - some browsers, fixed PHP string escaping problems, fixed - inability to create inverted stacked graphs, and fixed parameter - substituion and documentation regarding notifications and - responses. Added better support on FreeBSDs (4.8-5.2) and x86-64 - architectures (Linux and FreeBSD), the ability to multiply - summed values, MySQL timeouts, simple value parsing (to get the - numeric content out of quoted numbers, etc), graphic icons for - most actions, support for a default external auth user (with - regards to permissions), and cleaned up the gatherer build - process output. - * 0.17 - 2004.09.13 - Minor Feature Enhancements; Added colorized gatherer output, - checkbox support on multiple pages, the ability to disable - users, fixed a potential SQL-injection bug, updated navigation - on group pages, updated tutorials. - * 0.16 - 2004.06.10 - Minor Bugfixes and Feature Enhancements; fixed a user management - bug and several bugs related to 'single view only' users not - being able to see graphs, added the ability to ignore SNMP - uptime checks for devices (permitting the monitoring of broken - devices), added the ability to do an SNMP walk of an OID (useful - for the Windows SNMP agent), enhanced group/device management, - cleaned up autoconf (now supports FC2), and added experimental - syslog and daemon support in the gatherer. - * 0.15 - 2004.05.20 - Minor Bugfixes and Feature Enhancements; fixes for various db - errors (including the infamous one on snmp_cache_view.php), - better cross-platform compilation, select all/none/invert - checkbox support, support for choosing what graph to apply to an - interface, better support for php < 4.2.0, and some security - fixes for single-view-only users. - * 0.14 - 2004.03.10 - Minor Bugfixes and Feature Enhancements; escaping issues in - template dereferencing, broken links on various pages, security - issues regarding manual SNMP recaching, broken duplication on - non-cutting-edge MySQL, more parameter substitution in SQL - tests, better date parsing for advanced graph view, nav-bar and - group navigation enhancements, advanced view capability for - monitor-only graphs. - * 0.13 - 2003.12.19 - Minor Bugfixes and Feature Enhancements; slide show ordering, - previous slide, resume slide show, better formatting of 'sums', - errors on view editing, fixes to permissions checking, and an - occassional segfault in the gatherer was fixed. - * 0.12 - 2003.12.15 - Major Feature Enhancents and Bugfixes; added SNMPv2 support, - fixed a bug that would cause a device to be deleted from all - groups, fixed session timeout when using external auth, added - checkbox support to interface/disk cache pages, slide show - enhancements, fixed permission issue where unauthorized users - could view/edit test_* pages - * 0.10 - 2003.10.05 - Major bug fix; fixes a db error when trying to view monitors, a - bug that would always set the width and height to zero when - creating graphs, and makes conditions with 'rate of change' - work. Many documentation upgrades. - * 0.10pre2 - 2003.09.15 - This release focuses on adding new features and sqaushing bugs. - In addition, there is now an 'updater.php' that is required to - be run between versions. A minor change needs to be made to - everyone's 'netmrg.xml' to add an 'externalauth' field inside - the 'website' section. - * 0.10pre1 - 2003.07.28 - Initial publication - -II. Installation - - Table of Contents - 3. Software Requirements - 4. Satisfying Requirements - 5. Installation Procedure - 6. Upgrade Procedure - _________________________________________________________ - -Chapter 3. Software Requirements - - NetMRG Requires the following packages for compilation. - - * PHP, Version >= 4.1 - * MySQL, Version >= 3.23 - * RRDTOOL, Version >= 1.0.28 - * Libxml2, Version >= 2.30 - * Libstdc++, Version >= 3.2 - Versions earlier than this may compile just fine, but may - experience runtime issues. Specifically, we experienced software - crashes on an SMP machine running version 2.96 that were - resolved by upgrading to 3.2. - * NET/UCD-SNMP, Version >= 4.2.2 - _________________________________________________________ - -Chapter 4. Satisfying Requirements - - Specific instructions to satisfy dependencies for certain platforms - are presented below. They should be used more as suggestions, not - necessarily step-by-step instructions. You may need to do more than - what is listed, or much less, depending on the options you selected - when installing your operating system. - - * Red Hat Linux - + In order to satisfy the libstdc++ requirement, Redhat 8.0 - or above is required. NetMRG may not be stable on older - versions of libstdc++. - + Install the following RPMs from your Red Hat installation - media: - o httpd - o php - o php-mysql - o mysql - o mysql-server - o mysql-devel - o libxml2 - o libxml2-devel - o net-snmp - o net-snmp-devel - o net-snmp-utils - + Installing RRDTOOL - o Download an RRDTOOL RPM from http://www.freshrpms.net/ - o OR Download the RRDTOOL source from - http://www.rrdtool.org/ and compile it. - + Installing precompiled NetMRG RPM - Download the latest NetMRG RPM and install it as follows: -$ rpm -Uvh netmrg-0.10.rpm - You will still have to perform the following tasks listed - in the Install Instructions: - o Setup the Database - o Configure Apache - o Configure the Installation - o Setup Crontab - * FreeBSD (4.8) - + Install the following ports: - o www/apache13 - o rrdtool - o net-snmp - o libxml2 - o mod_php4 (specify MySQL support) - o lang/gcc32 - + Run configure, specifying gcc32: -./configure 'LDFLAGS=-L/usr/local/gcc3/lib' 'CPPFLAGS=-I/usr/local/gcc3 -/include' 'CXX=g++32' - _________________________________________________________ - -Chapter 5. Installation Procedure - - 1. Untar to some directory like /tmp/ (it will untar into a - 'netmrg' directory) -cd /tmp -wget http://www.netmrg.net/download/release/netmrg.tar.gz -tar xzvf netmrg.tar.gz - 2. Now we need to compile and install the source. cd into the - directory made by your tar command and type the following: -./configure -make -make install - - Note: If configure fails to locate the needed libraries they can - be manually specified. Run ./configure --help for details on the - necessary options. - 3. Setup the database - Now we need to setup the database. Please change at least the - password (netmrgpass below). -mysqladmin create netmrg -mysql -u root -p netmrg < share/netmrg.mysql -mysql -u root -p -> grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpa -ss'; - 4. You need to modify your apache config in order to make your - NetMRG installation live (commonly in - /etc/httpd/conf/httpd.conf). - The first is to alias /netmrg to the installed web directory - (commonly /usr/local/var/www/netmrg/webfiles). -Alias /netmrg "/usr/local/var/www/netmrg/webfiles" - The easier way (if you're running Apache >= 1.3) is to just - Include the conf file we've created anywhere in your file (near - the bottom is fine). -Include /usr/local/etc/netmrg.conf - You will need to restart your Apache after making config - changes. Telling it to reload its config should be good enough -killall -HUP httpd - 5. Configure the Installation - All of NetMRG's common configuration options are controlled by - an XML file, normally located at /usr/local/etc/netmrg.xml. You - should edit this file to make any necessary changes before - continuing with installation. - For most installations, you will at least need to edit - netmrg.xml to reflect your database username and password. - 6. Setup Permissions - NetMRG does not need superuser permissions to run, therefore we - will setup a user for it. -# useradd netmrg -# chown netmrg:netmrg /usr/local/var/log/netmrg -# chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd - 7. Setup crontab - You can setup the crontab entries in two places: either edit - /etc/crontab, or run crontab -e as the netmrg user. For 'crontab - -e', use an entry similar to this: -*/5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then -/usr/local/bin/netmrg-gatherer; fi" - To edit the master crontab, edit /etc/crontab and add a line - similar to this: -*/5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ] -; then /usr/local/bin/netmrg-gatherer; fi" - 8. Point your web browser at your install, and start graphing - things! The default login is admin and the default password is - nimda. Point your web browser at the host you built this on - (something similar to http://yourhost.com/netmrg/) and please - change your password! - _________________________________________________________ - -Chapter 6. Upgrade Procedure - - After doing a 'make install' as described in the chapter on - Installing NetMRG, the next step is to run the web-based updater. - This is accomplished by logging into NetMRG with administrator - privileges, and following the prompts. NetMRG's web interface will - not operate normally and the gatherer will not run until the - web-based upgrade is performed. Non-administrator users will only - receive a message directing them to contact their NetMRG - administrator. - - If you need to perform an upgrade, the updater will prompt you to - apply all updates. Clicking this link will perform all necessary - updates for this release. - - If for some reason an update fails, or you would like to re-apply an - update for any reason, you can goto the updater and goto View all - available updates. This will present you a list of the updates that - are available and their status (applied, not applied, or error). If - you have problems updating from one version to the next, you can - force individual updates that fail so that they're considered - 'applied'. Once all updates are applied for a particular version, - the database will be automatically updated to the latest version - that has all updates applied. - -III. Reference - - Table of Contents - I. Manual Pages - -I. Manual Pages - - Table of Contents - netmrg-gatherer -- Gathers data from devices. - -netmrg-gatherer - -Name - - netmrg-gatherer -- Gathers data from devices. - -Synopsis - - netmrg-gatherer [OPTIONS] - -Description - - netmrg-gatherer performs tests on all enabled hosts in NetMRG. It - will store results in RRD files using RRDTOOL(1) and perform actions - in response to events. - -Global Options - - -h - - Displays usage information and exits. - - -v - - Displays software version and exits. - -Operating Options - - -t num threads - - Run no more than the specified number of threads - simultaneously. - - -X - - Become a daemon. - - -M mode - - Mode of operation. This option controls the manner in which - the gatherer operates. The modes currently supported are - "once" (the default, best used manually or via cron) which - runs all tests once then exits, and "wait" (best used when - daemonized) which will run all tests, wait for the gatherer - interval to expire, and then repeat. - - Note: To run netmrg-gatherer daemonized, the recommended set of - options at this point is "-X -S -M wait" which will daemonize, - repeat the gather cycle on each interval, and write output to - syslog. - -Logging, Debugging and Verbosity Options - - -S - - Syslog. Logs messages to syslog instead of stdout. - - -b - - Bland. Disables color output. By default, netmrg-gatherer - will display color output when connected to a terminal, but - will use bland output when its output is written to a file. - This option should only be needed when the detection - mechanism has failed, or the user doesn't want to see colors - when running the program by hand. - - -a - - All. Displays all log messages. - - -m - - Most. Displays more messages than default. - - -q - - Quiet. Silences all output. - - -l level mask - - Only outputs messages that match the specified level mask. - - -c component mask - - Only outputs messages that match the specified component - mask. - - -s - - Safe. Tries to keep sensitive information out of the - displayed messages. - -Configuration File Options - - -C config file - - Uses the specified XML configuration file. - - -K config file - - Parses the specified XML configuration file and exits. - -Database Options - - -H host - - Uses the specified host name for connecting to the database. - - -D database - - Uses the specified database name. - - -u user name - - Uses the specified user name for connecting to the database. - - -p [password] - - Uses the specified password for connecting to the database. - If no password is specified, the user is prompted to enter - one. - -Recaching Options - - -i device id - - Performs an interface recache on the specified device. - - -d device id - - Performs a disk recache on the specified device. - - Note: Recaching options are intended for use by the web interface. - These options should not be generally used by end users. - _________________________________________________________ - -Chapter 7. Contact Information - - We have great aspirations for what NetMRG could become, but as with - all open-source software, such aspriations can only be achieved with - the active participation of the open-source community. Please do - your part and support software that you use by helping to answer - support questions on forums and report bugs to developers. Thanks! - - * Main Website - http://www.netmrg.net/ - * Online Docs- http://wiki.netmrg.net/ - * Support Forum - http://lists.netmrg.net/ - * Bug Reporting and Tracking - http://bugs.netmrg.net/ diff -Nurb netmrg-0.19/RELEASE-NOTES netmrg-0.20/ChangeLog/RELEASE-NOTES --- netmrg-0.19/RELEASE-NOTES 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/RELEASE-NOTES 1970-01-01 05:30:00.000000000 +0530 @@ -1,143 +0,0 @@ - - Chapter 2. Revision History - - * 0.19 - - 2006.02.03 - - Major Feature Enhancements and Bug Fixes; Major Web Interface redesign - to give more room for graphs and ease overall use. Security - enhancements behind the scenes to ensure correct permissions checking. - Added a search interface that will search groups, devices, sub devies, - and sub device parameters. RRDtool 1.2 support (including graph - smoothing); Depricated use of netmrg_cron.sh in favor of using - netmrg-gatherer; migrated bulk of docs to wiki; numerous other - bugfixes and enhancements. - - * 0.18.2 - - 2004.11.09 - - Minor Bug Fixes; Fixed some escaping problems on the interface cache - page, disabled the 'quickprint' Net-SNMP option for better - compatibility, fixed the snmp-failure test, fixed an SVO-user view - issue, and added failover for duplicate ifNames when adding - interfaces. - - * 0.18.1 - - 2004.11.01 - - Minor Bug Fixes; Fixed a small bug where the gatherer would not - register negative values. - - * 0.18 - - 2004.10.25 - - Major Bug Fixes; Fixed an issue preventing form submissions on some - browsers, fixed PHP string escaping problems, fixed inability to - create inverted stacked graphs, and fixed parameter substituion and - documentation regarding notifications and responses. Added better - support on FreeBSDs (4.8-5.2) and x86-64 architectures (Linux and - FreeBSD), the ability to multiply summed values, MySQL timeouts, - simple value parsing (to get the numeric content out of quoted - numbers, etc), graphic icons for most actions, support for a default - external auth user (with regards to permissions), and cleaned up the - gatherer build process output. - - * 0.17 - - 2004.09.13 - - Minor Feature Enhancements; Added colorized gatherer output, checkbox - support on multiple pages, the ability to disable users, fixed a - potential SQL-injection bug, updated navigation on group pages, - updated tutorials. - - * 0.16 - - 2004.06.10 - - Minor Bugfixes and Feature Enhancements; fixed a user management bug - and several bugs related to 'single view only' users not being able to - see graphs, added the ability to ignore SNMP uptime checks for devices - (permitting the monitoring of broken devices), added the ability to do - an SNMP walk of an OID (useful for the Windows SNMP agent), enhanced - group/device management, cleaned up autoconf (now supports FC2), and - added experimental syslog and daemon support in the gatherer. - - * 0.15 - - 2004.05.20 - - Minor Bugfixes and Feature Enhancements; fixes for various db errors - (including the infamous one on snmp_cache_view.php), better - cross-platform compilation, select all/none/invert checkbox support, - support for choosing what graph to apply to an interface, better - support for php < 4.2.0, and some security fixes for single-view-only - users. - - * 0.14 - - 2004.03.10 - - Minor Bugfixes and Feature Enhancements; escaping issues in template - dereferencing, broken links on various pages, security issues - regarding manual SNMP recaching, broken duplication on - non-cutting-edge MySQL, more parameter substitution in SQL tests, - better date parsing for advanced graph view, nav-bar and group - navigation enhancements, advanced view capability for monitor-only - graphs. - - * 0.13 - - 2003.12.19 - - Minor Bugfixes and Feature Enhancements; slide show ordering, previous - slide, resume slide show, better formatting of 'sums', errors on view - editing, fixes to permissions checking, and an occassional segfault in - the gatherer was fixed. - - * 0.12 - - 2003.12.15 - - Major Feature Enhancents and Bugfixes; added SNMPv2 support, fixed a - bug that would cause a device to be deleted from all groups, fixed - session timeout when using external auth, added checkbox support to - interface/disk cache pages, slide show enhancements, fixed permission - issue where unauthorized users could view/edit test_* pages - - * 0.10 - - 2003.10.05 - - Major bug fix; fixes a db error when trying to view monitors, a bug - that would always set the width and height to zero when creating - graphs, and makes conditions with 'rate of change' work. Many - documentation upgrades. - - * 0.10pre2 - - 2003.09.15 - - This release focuses on adding new features and sqaushing bugs. In - addition, there is now an 'updater.php' that is required to be run - between versions. A minor change needs to be made to everyone's - 'netmrg.xml' to add an 'externalauth' field inside the 'website' - section. - - * 0.10pre1 - - 2003.07.28 - - Initial publication - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/overview.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/intro.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html diff -Nurb netmrg-0.19/share/doc/ChangeLog netmrg-0.20/ChangeLog/share/doc/ChangeLog --- netmrg-0.19/share/doc/ChangeLog 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/ChangeLog 1970-01-01 05:30:00.000000000 +0530 @@ -1,982 +0,0 @@ -2006.02.03 v0.19cvs silfreed - - bug#0000392: Release Checklist for 0.19 - * final doc changes and branching before release - -2006.01.30 v0.19cvs silfreed - - bug#0000449: ReadAll Users should be able to goto Edit pages, but not save - - bug#0000392: Release Checklist for 0.19 - updated docs - -2006.01.10 v0.19cvs keb - - bug#0000444: ReadAll users can edit sub-devices - - bug#0000430: permissions 'gotcha' - -2006.01.08 v0.19cvs silfreed - - updated wiki.netmrg.net to mediawiki 1.5.5 - -2006.01.09 v0.19cvs balleman - - bug#0000433: problem with graph min/max - - bug#0000392: bumping versions to 0.19 - -2006.01.08 v0.19cvs silfreed - - bug#0000439: netmrg.sgml still needs maintained for the README, - INSTALL, and netmrg-gatherer.1 files - - bug#0000442: We should get ourselves added to the rrdtool 1.2's rrdworld pages - -2006.01.04 v0.19cvs silfreed - - bug#0000371: Grouped + Non-Grouped display in device tree is confusing - - bug#0000286: provide a way to check integrity of a release tarball - -2006.01.04 v0.19cvs balleman - - bug#0000438: rewrote script tests using execve() - -2006.01.02 v0.19cvs silfreed - - updated lists.netmrg.net to phpBB 2.0.19 - - updated wiki.netmrg.net to mediawiki 1.5.4 - -2005.12.18 v0.19cvs silfreed - - updated bugs.netmrg.net to Mantis BT 0.19.4 - -2005.12.16 v0.19cvs balleman - - fixed problem on monitors.php that showed unknown values as 0.00 - - bug#0000437: added snmpwalk count method - -2005.12.15 v0.19cvs silfreed - - added killspike2 from cricket (with some modifications) - -2005.12.09 v0.19cvs silfreed - - updated wiki.netmrg.net to mediawiki 1.5.3 - -2005.12.08 v0.19cvs silfreed - - bug#0000294: Search feature - - bug#0000372: RFE: Add link for current level in device path - -2005.11.11 v0.19cvs balleman - - bufish://balleman@oak/var/www/netmrg/trunk/share/doc/ChangeLogg#0000410: updated 'Manual' URL to point to the wiki - -2005.11.09 v0.19cvs balleman - - bug#0000406: verify against rrdtool-1.2 - revisited comments escaping - -2005.11.03 v0.19cvs balleman - - bug#0000427: use RRDTOOL create instead of restore for zero.rrd - - bug#0000342: delete template view items associated with deleted subdevices - - bug#0000112: view edit should have move top and move bottom features - - added "arrow_limit" icon - -2005.10.31 v0.19cvs silfreed - - updated wiki.netmrg.net to mediawiki 1.5.1 - - updated lists.netmrg.net to phpBB 2.0.18 - -2005.10.22 v0.19cvs keb - - bug#0000430: permissions 'gotcha' - * responses.php snmp_cache_view.php conditions.php - -2005.10.13 v0.19cvs balleman - - bug#0000429: ReadAll user can add/edit/delete devices - -2005.10.12 v0.19cvs silfreed - - updated wiki.netmrg.net to mediawiki 1.4.11 - - updated bugs.netmrg.net to Mantis BT 0.19.3 - -2005.09.21 v0.19cvs silfreed - - updated wiki.netmrg.net to mediawiki 1.4.10 - -2005.09.12 v0.19cvs balleman - - bug#0000287: on the monitor edit page, subdevice dropdown should not be displayed by default - - bug#0000403: Upper/lower graph limit problem - fixed both instances described; mins and maxes of 0 should now behave properly, and 'U' works again, too - -2005.09.10 v0.19cvs balleman - - bug#0000424: rrdtool 1.2 slope feature (use by default for 1.2) - - bug#0000414: view edit enhancements - -2005.09.09 v0.19cvs silfreed - - upgrade version to 0.19cvs - - bug#0000365: Web Interface redesign - made sure all *.php pages were in the menu - - bug#0000294: Search feature - created a stock search page that just shows you your query back - -2005.09.09 v0.18.2 silfreed - - bug#0000365: Web Interface redesign - updated header section to be all-inclusive of the nav bars - (in case we want to do background images later) - more CSS work to make hovers work nicely - - bug#0000294: Search feature - created the search box in the page header and hide it on the login page - search box auto-focuses w/ the word "search" on page load - -2005.09.06 v0.18.2 silfreed - - updated wiki.netmrg.net to mediawiki 1.4.9 - - bug#0000365: Web Interface redesign - removing javascript; reformatting nav layers - -2005.08.31 v0.18.2 balleman - - bug#0000422: disabled notifications act as if they are enabled - - bug#0000421: notifications page should display whether a notification is disabled or not - -2005.08.24 v0.18.2 balleman - - bug#0000373: contrib: Script action to count active modems on a Livingston Portmaster - -2005.08.24 v0.18.2 keb - - bug#0000420: macro variables should be configurable - -2005.08.17 v0.18.2 balleman - - bug#0000417: when a device is disabled, all of its status information should be 'unknown' - -2005.08.15 v0.18.2 balleman - - bug#0000413: apply templates page should not display subdevice dropdown by default - - bug#0000394: Change license to GPL, upgrade keb to developer - -2005.08.12 v0.18.2 balleman - - bug#0000398: for devices without SNMP support, don't display 'pending...' - -2005.07.21 v0.18.2 silfreed - - updated wiki.netmrg.net to mediawiki 1.4.7 - -2005.07.18 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.17 - -2005.07.15 v0.18.2 balleman - - use localtime_r() to avoid concurrency issues - -2005.07.08 v0.18.2 balleman - - bug#0000400: monitors.cpp does not compile on Solaris/SPARC - Solaris does not have setenv/unsetenv - -2005.07.06 v0.18.2 balleman - - bug#0000385: Graph titles, axis labels, legend labels not properly escaped - - bug#0000406: verify against rrdtool-1.2 (added config option for rrd version, fixed escaping) - -2005.06.28 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.15 - -2005.06.13 v0.18.2 keb - - bug#0000391: remove netmrg_cron.sh - -2005.05.31 v0.18.2 balleman - - bug#0000408: lukasz_engel's graphing shell escaping patch - -2005.05.28 v0.18.2 balleman - - bug#0000409: an internal monitor (# 8) to replace win2kcpu.pl - -2005.05.23 v0.18.2 balleman - - bug#0000407: Notifications should have duplicate feature - -2005.05.16 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.15 - - bug#0000365: fixing javascript to collapse all items before opening a new menu - -2005.04.20 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.14 - -2005.04.01 v0.18.2 silfreed - - bug#0000366: testing new RSS aggregator for SVN commits - - bug#0000365: Web Interface redesign - try new idea of putting items below the main menu bar; still needs cleaned up - - bug#0000395: monitors table test_id can not store tests_snmp rows with id>127 - - bug#0000401: linux26diskaccess.pl only works for IDE drives - -2005.03.28 v0.18.2 keb - - bug#0000399: nanosleep needs rt library - -2005.03.26 v0.18.2 keb - - bug#0000387: Way to apply a template graph to multiple subdevices - -2005.03.09 v0.18.2 silfreed - - updated about, contributions pages - - updated to 2005 in all docs - -2005.03.02 v0.18.2 silfreed - - bug#0000366: testing getting svn comments into mantis [x4] - -2005.02.28 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.13 - - bug#0000365: Web Interface redesign - added 'hidden' menu items that will expand the menu list - -2005.02.27 v0.18.2 silfreed - - merging silbranch from r1104:1125 - - bug#0000381: Update source tree items that use cvs to make things happen - - bug#0000379: Snapshots need to be made of the source trees - - bug#0000380: Documentation needs auto-generated from source tree - -2005.02.22 v0.18.2 silfreed - - updated lists.netmrg.net to phpBB 2.0.12 - -2005.02.15 v0.18.2 keb - - bug#0000388 - utils.cpp build warnings - - bug#0000390 - libintl linking errors - - bug#0000389 - build errors: WEXITSTATUS and WIFEXITED - -2005.01.26 v0.18.2 balleman - - bug#0000328 - SIGTERM/SIGINT should result in clean shutdown - - Avoid SNMP tests for SNMP-disabled devices - -2005.01.16 v0.18.2 balleman - - bug#0000346 - Use correct sums in advanced graph view - - bug#0000382 - when applying templates, they should be added to the sub-device view - - bug#0000383 - if a STACK is first, change it to an AREA - - bug#0000347 - fractional multipliers starting with "1" are broken - -2005.01.16 v0.18.2 balleman - - bug#0000375 - Gatherer can crash with certain versions of net-snmp against broken agents - - bug#0000359 - error code scripts don't really return the error code - - bug#0000358 - Duplicating a device does not duplicate status of "Disable SNMP Uptime Check" - - bug#0000368 - RFE: Pass parameters as environment variables - - bug#0000307 - kill stale lockfiles automatically - -2004.12.20 v0.18.2 keb - - bug#0000369 - 'Delete' under device groups fails with no device selected - - bug#0000376 - devices.php: break statement missing - -2004.12.12 v0.18.2 keb - - bug#0000362 - gettext support - -2004.12.10 v0.18.2 keb - - bug#0000348 - More SVO "Access denied" issues (problems with MySQL 3.X) - -2004.12.09 v0.18.2 silfreed - - bug#0000281 - Support for a config_site.php in addition to config.php - - bug#0000364 - PHP Library Restructure - -2004.11.23 v0.18.2 keb - - bug#0000352 - Escaping issues in graphing.php - - bug#0000348 - More SVO "Access denied" issues - -2004.11.19 v0.18.2 keb - - bug#0000341 - Root group should always be returned from the Get*Groups functions - -2004.11.16 v0.18.2 keb - - bug#0000345 - get_graph.php needs cleaned up - -2004.11.08 v0.18.1 silfreed - - bug#0000325 - Access denied to custom graphs attached to subdevice and group - - bug#0000316 - NETMRG_DEFAULT_MAP should not be allowed to edit prefs - -2004.11.06 v0.18.1 keb - - bug#0000271 - checkbox options should have a standard layout - -2004.11.05 v0.18.1 balleman - - bug#0000335 - disabled quickprint option so mandrake should work - - bug#0000331 - snmp failure internal test doesn't work - - bug#0000321 - don't use ifName if it is not unique in the cache - -2004.11.04 v0.18.1 silfreed - - bug#0000329 - escaping problems in snmp_cache_view.php - -2004.10.24 v0.17 keb - - bug#0000318 - CVS build fails due to unknown function llround - -2004.10.23 v0.17 silfreed - - bug#0000302 - Updater should support updating from any version - -2004.10.23 v0.17 balleman - - bug#0000317 - Function name conflict for stripnl on FreeBSD - -2004.10.22 v0.17 keb - - bug#0000308 - color should be reset when gatherer exits - -2004.10.19 v0.17 balleman - - bug#0000313 - internal test for snmp availability - - bug#0000293 - SQL timeouts - - bug#0000247 - simple parsing of snmp values - -2004.10.16 v0.17 keb - - bug#0000315 - netmrg build should have cleaner output - - add more control over the install files in www/ - -2004.10.14 v0.17 silfreed - - bug#0000314 - zero.rrd needs to be built at 'make install' time - -2004.10.13 v0.17 silfreed - - bug#0000312 - Default external auth user should be added, but disabled - - bug#0000310 - need more graphics - -2004.10.12 v0.17 keb - - bug#0000292 - checkbox delete gives errors in responses.php - -2004.10.08 v0.17 silfreed - - bug#0000310 - need more graphics; started - -2004.10.07 v0.17 silfreed - - bug#0000240 - default permissions for external auth users - - bug#0000291 - adding new group always returns user to root group view - -2004.10.05 v0.17 balleman - - bug#0000282 - SNMP uptime should be displayed in a nice format - -2004.10.04 v0.17 balleman - - bug#0000283 - docs on notifications.php are wrong - - bug#0000290 - negative (inverted) values not working - -2004.09.21 v0.17 balleman - - bug#0000288 - escape colons in graph item titles - - bug#0000300 - graph sums don't take multipliers into account - -2004.09.21 v0.17 silfreed - - bug#0000299 - IE users can't submit forms - -2004.09.19 v0.17 silfreed - - bug#0000295 - db_escape_string can't be conditional - -2004.09.13 v0.17cvs silfreed - - updated bugs.pa.net to mantis 0.19.0, enabled sponsorships - - bug#0000280 - Using checkbox delete in conditions.php gives errors when nothing is checked - - bug#0000279 - new groups are always added with the Root parent - - fixed 'disabled user check' to take into account if we were 0.17 or not - (so updates can proceed) - -2004.09.13 v0.17cvs keb - - bug#0000271 - checkbox options should have a standard layout - -2004.09.12 v0.17cvs balleman - - bug#0000109 - tests_script.php checkboxes - - bug#0000111 - tests_snmp.php checkboxes - - bug#0000110 - tests_sql.php checkboxes - - bug#0000103 - events.php checkboxes - - bug#0000104 - responses.php checkboxes - - bug#0000105 - conditions.php checkboxes - -2004.09.11 v0.17cvs silfreed - - bug#0000200 - Need a tutorial on how to create custom/template graphs - - bug#0000259 - It should be noted that RRDs and variables aren't usable - until after the gatherer runs - - bug#0000275 - Tutorial on our Interface cache and Disk Cache - - bug#0000276 - Document how variable substitution works - - bug#0000273 - Move monitors to a new subdevice - -2004.09.10 v0.17cvs silfreed - - bug#0000272 - Move subdevices to different device - -2004.09.08 v0.17cvs keb - - bug#0000266 - apply templates should return to proper location - -2004.09.07 v0.17cvs balleman - - bug#0000213 - tests documentation - - bug#0000108 - view.php checkboxes - - bug#0000101 - subdevices.php checkboxes - -2004.09.07 v0.17cvs silfreed - - bug#0000267 - Device Group can't be reassigned to a new Parent - -2004.09.03 v0.17cvs balleman - - bug#0000102 - monitors.php checkboxes - -2004.09.03 v0.17cvs silfreed - - bug#0000229 - NavBar mods on snmp_cache_view - -2004.09.01 v0.17cvs keb - - bug#0000117 - an 'apply templates' page should be added - - add graph count to graphs.php - -2004.09.01 v0.17cvs balleman - - bug#0000265 - column size for tests_internal.name not large enough - - bug#0000107 - graph_items.php should have checkbox support - - cleanup of graph_items.php / refactor graph item move - - gradient feature on graph_items.php - -2004.08.31 v0.17cvs balleman - - bug#0000263 - internal test for reading a value from a file - -2004.08.31 v0.17cvs silfreed - - bug#0000248 - notifications.php has escaping issues - - bug#0000261 - breadcrumbs break when you traverse multiple groups - - bug#0000099, bug#0000100 - checkboxes on grpnav_list, devices, groups - -2004.08.30 v0.17cvs keb - - use global permit values for disabled users and the PERMIT_TYPES array - -2004.08.29 v0.17cvs silfreed - - bug#0000244 - global define for permit values - - bug#0000248 - notifications.php has escaping issues - -2004.08.29 v0.17cvs keb - - ability to duplicate multiple graphs at once - -2004.08.28 v0.17cvs keb - - bug#0000106 - checkboxes to delete graphs for graphs.php - -2004.08.24 v0.17cvs balleman - - bug#0000258 - "Previous Value" should be available when processing conditions - - bug#0000232 - correctly order cisco names on snmp interface cache page - - bug#0000231 - make subdevice page sorting aware of cisco names - -2004.08.24 v0.17cvs silfreed - - bug#0000257 - doing a delayed insert for dynamic variables lowers mysql overhead - -2004.08.21 v0.17cvs balleman - - bug#0000241 - setting for syslog facility - - bug#0000250 - internal ucd user+system monitor should return U's when necessary - - added the rest of the included internal tests to tests_internal in the default database - - bug#0000236 - escaping fields displayed by rrdtool - - bug#0000158 - "advanced" monitor graphs, broken by timeframe changes, now fixed - -2004.08.20 v0.17cvs balleman - - bug#0000243 - gatherer man-page updates - - bug#0000252 - status line, quick implementation - - bug#0000251 - disable buttons on save - - bug#0000245 - abstract graph duplication, add graph item duplication - -2004.08.20 v0.17cvs silfreed - - bug#0000253 - security: SQL injection to bypass auth - - sub_dev_param.php: fixed escaping issues - - bug#0000254 - Link to GNU Tar page is incorrect - -2004.07.27 v0.17cvs balleman - - bug#0000246 - improved monitor sorting on monitors.php and monitors dropdown - -2004.07.20 v0.17cvs keb - - bug#0000221 - ability to disable users - -2004.07.18 v0.17cvs silfreed - - bug#0000114 - checkboxes to delete users on users.php - - bug#0000201 - summary of each section in netmrg - -2004.06.30 v0.17cvs balleman - - bug#0000239 - variable substitution for notifications - - bug#0000238 - thread timestamps - -2004.06.30 v0.17cvs dwarner - - bug#0000235 - fixed SVO users viewing custom graphs in devices - -2004.06.17 v0.17cvs keb - - NetMRG now builds on Debian 3.0 (woody) - -2004.06.15 v0.17cvs balleman - - bug#0000211 - colorized gatherer output - - bug#0000234 - change time frame for a view - -2004.06.14 v0.17cvs balleman - - version bump to 0.17cvs - - bug#0000233 - 'disable snmp uptime check' should default to off - - bug#0000230 - should be able to duplicate monitors - -2004.06.06 v0.16cvs silfreed - - bug#0000227 - problem w/ SVO users viewing a primary group - -2004.06.04 v0.16cvs keb - - bug#0000219 - build problems. Merged configure.ac and src/configure.ac - -2004.06.04 v0.16cvs silfreed - - bug#0000224 - rrdedit uses @RRDTOOL@ and /bin/sh - -2004.06.01 v0.16cvs balleman - - bug#0000177 - graph scaling options - - bug#0000223 - docs links - -2004.05.31 v0.16cvs balleman - - bug#0000214 - syslog support - - bug#0000157 - become a daemon - -2004.05.27 v0.16cvs keb - - cleanup subst perl script and make it stop using the .in files - - bug#0000147 - fix warnings caused by autoconf PACKAGE_* defines - -2004.05.27 v0.16cvs silfreed - - bug#0000209 - docs should be a little prettier - - bug#0000063 - all items on device tree have edit link - - bug#0000217 - db driven news items - - bug#0000218 - easier to maintain public website - - bug#0000209 - easier to browse docs - - bug#0000182 - FAQ system - - bug#0000207 - disable password fields when external auth is in use - - bug#0000210 - use cron.d for netmrg RPM installations - -2004.05.26 v0.16cvs silfreed - - bug#0000215 - fix view.php edit template/custom graph selection - - bug#0000206 - make edit_rrd.pl as shell script and auto-confisize it - - SVO users can view items in views attached to a subgroup - - bug#0000063 - get into edit mode from device tree - -2004.05.25 v0.16cvs balleman - - bug#0000208 - when adding a group, remember your parent - - bug#0000202 - ignore snmp uptime option - - bug#0000187 - Nth subitem of an OID - -2004.05.24 v0.16cvs silfreed - - bug#0000197 - SVO users can't see custom graphs - - bug#0000204 - SVO users can't see devices in subgroups when they're - granted permissions for the parent group - -2004.05.21 v0.16cvs silfreed - - bug#0000203 - when submitting a group 0 (root) on users.php, there was a notice - - default error reporting should be warnings and errors - - version bump to 0.16cvs - -2004.05.20 v0.15cvs balleman - - doc updates for grpdev_list - -2004.05.19 v0.15cvs silfreed - - bug#0000196 - access denied graphic not displaying - - bug#0000197 - SVO user can't see custom graphs - - arbitrary user can't delete/duplicate subdevices - - added titles to checkbox thingies - - bug#0000159 - adding select box to choose your template for interface cache - - fixed bug where you couldn't delete items on the view page w/ % signs - -2004.05.18 v0.15cvs balleman - - bug#0000195 - notifications.php errors - -2004.05.15 v0.15cvs balleman - - bug#0000192 - override default mysql socket - - bug#0000193 - delete group generates warnings - -2004.05.08 v0.15cvs silfreed - - bug#0000186 - default view add custom graph db error - - bug#0000181 - undefined index dev_type in test_script.php - - bug#0000175 - in_array() can't take an array as needle in PHP < 4.2.0 - - bug#0000174 - srand() needs seeded in php < 4.2.0 - - bug#0000167 - don't allow non-SVO users to be chroot'd - - bug#0000170 - don't allow devices in root group - -2004.05.06 v0.15cvs balleman - - bug#0000188 - Select All/None/Invert for checkboxes - - bug#0000190 - Intelligent Subdev Defaults - - bug#0000183 - escaping for ifAlias, ifDescr in gatherer - - bug#0000189 - when applying a template, never duplicate a monitor - - bug#0000172 - pthread_cond_wait() instead of busy-wait for thread counter - -2004.04.08 v0.15cvs dwarner - - added some quoting to lib/graphing.php to prevent db errors - -2004.04.07 v0.15cvs balleman - - bug#0000184 - Solaris doesn't check for NULL in sprintf - -2004.03.29 v0.15cvs keb - - bug#0000176 - OpenBSD needs des library to link libsnmp - -2004.03.26 v0.15cvs keb - - bug#0000179 - specify rrdtool location to configure - -2004.03.17 v0.15cvs dwarner - - fixed tripid bug in snmp_cache_view for 'Monitor/Graph All Checked' - -2004.03.17 v0.14 dwarner - - version bump to 0.15cvs - -2004.03.10 v0.14cvs dwarner - - bug#0000169 - stat.php interface operstatus doesn't match IF-MIB - - bug#0000168 - duplicate users are allowed - -2004.03.10 v0.14cvs keb - - bug#0000165 - let single-view only users view/change preferences - - bug#0000166 - fix bug where user can't modify preferences - -2004.03.08 v0.14cvs silfreed - - bug#0000164 - fix breadcrumbs - - bug#0000160 - fix device duplication - -2004.03.07 v0.14cvs keb - - bug#0000147 - fix thread warnings - -2004.02.28 v0.14cvs balleman - - bug#0000158 - support 'advanced' features on monitor graphs - - bug#0000139 - monitor mins/maxes should be templated - -2004.02.24 v0.14cvs silfreed - - bug#0000161 - space in front of sub groups on device tree page - -2004.02.24 v0.13 silfreed - - bug#0000046 & bug#0000047 - new group/device navigation w/ updated history bar - - started on bug#0000160 - broken device duplication - - version bump to 0.14cvs - -2004.02.23 v0.13 silfreed - - bug#0000150 - prerequisite matching (php safe mode + others) - -2004.02.22 v0.13 silfreed - - bug#0000046 - better group/device navigation - -2004.02.14 v0.13 balleman - - bug#0000155 - subdevice name escaping in snmp_cache_view.php - - bug#0000154 - add navbar to conditions.php - -2004.01.25 v0.13 balleman - - bug#0000151 - fixed value field too short on graph_items.php - - bug#0000142 - warning/error log (support added in gatherer and database) - - bug#0000153 - possible name collision with Solaris mutex_* functions - -2004.01.10 v0.13 balleman - - bug#0000149 - recache.php security issues - -2004.01.08 v0.13 silfreed - - bug#0000143 - started deletion dependancy checking - -2004.01.04 v0.13 balleman - - bug#0000058 - get logos in the docbook manual - - copyright year bump - - bug#0000140 - interface cache sometimes is left empty - -2003.12.30 v0.13 silfreed - - bug#0000146 - reparent unparented child groups - - bug#0000124 - cleanup groups.php - -2003.12.29 v0.13 balleman - - bug#0000145 - wrong link on graph_items.php - - bug#0000144 - clicking on a view link on the snmp interface cache page results in an error - - bug#0000126 - advanced graph view should parse dates like 'workday highlighting' does - -2003.12.28 v0.13 balleman - - enhance "test not present" checking. - -2003.12.19 v0.13 balleman - - parameter substitution in sql tests - - escaping issue in dereferencing templated monitors - -2003.12.19 v0.12 silfreed - - bug#0000131 - dynamic 'resume slide show' link - -2003.12.18 v0.12 balleman - - bug#0000130 - descendants slideshow should sort groups by name - - bug#0000132 - there should be a "previous slide" link during slideshow - - bug#0000134 - "sums" column should be numerically formatted like the others - - bug#0000136 - error on view.php page when trying to edit items - - added lots of missing auth checks to view.php - - bug#0000135 - read-only users can reorder graph items - - bug#0000133 - for tests_sql, long queries should be truncated and an elipsis should be appended - -2003.12.15 v0.12 balleman - - bug#0000129 - uninitialized snmp session pointer can cause segfault - -2003.12.14 v0.10 silfreed - - bug#0000128 - add slideshow icon - -2003.12.13 v0.10 balleman - - bug#0000127 - unauthorized users can view/edit on test_*.php pages - -2003.12.05 v0.10 balleman - - rework slideshow/view.php to implement many enhancements - -2003.11.26 v0.10 keb - - bug#0000122 - configure enhancements for solaris - - bug#0000123 - fixed several compile-time warnings - -2003.11.26 v0.10 balleman - - bug#0000120 - gatherer should check db version - - bug#0000118 - total of sums should work - - bug#0000119 - version bump checklist - not complete - - broke [sub]devices.php into functions - - bug#0000095 - device duplication - - subdevice duplication - -2003.11.24 v0.10 silfreed - - bug#0000115 - add checkbox support to disks on snmp_cache_view.php - - bug#0000088 - added slide show pref to user_prefs.php, use pref in view.php, - and set all user prefs to true for users by default - -2003.11.22 v0.10 silfreed - - favicon - -2003.11.20 v0.10 balleman - - bug#0000116 - graph_items.php move up / move down icons - -2003.11.20 v0.10 silfreed - - bug#0000057 - added checkbox support to snmp_cache_view.php to - make interfaces - - start of user prefs (created table and function to return prefs) - -2003.11.17 v0.10 balleman - - add debug messages for thread locking - -2003.11.17 v0.10 silfreed - - bug#0000092 - test_* pages should redirect after saves - - bug#0000093 - download page needs 'binary release' support and - 'prettied up' - - bug#0000094 - screenshots needs ordered by most recent release first - - bug#0000082 - make netmrg_cron.sh use /bin/sh - - bug#0000086 - view.php should display the custom name, not the dbrow name - - bug#0000087 - session+external auth 'invalid' bug - - bug#0000098 - be more specific in Makefile.am so CVS doesn't cause problems - - new arrow images; used on view.php to reorder items - -2003.11.16 v0.10 balleman - - bug#0000091 - monitor parameter escaping issues - - bug#0000074 - escaping issues editing sql tests - - handle similar escaping issues for snmp and script tests - -2003.10.25 v0.10 balleman - - bug#0000083 - indent nested groups on device tree - - bug#0000084 - reset sums when a total graph item is used - - bug#0000075 - debugging enhancements - - trivial rrdtool syntax highlighting - -2003.10.24 v0.10 silfreed - - updated viewgraph-off.png to be more apparent that there's nothing in it - (made it gray instead of black) - -2003.10.23 v0.10 balleman - - bug#0000081 - applied patch for popen concurrency issue (rojer) - -2003.10.21 v0.10 balleman - - updated device page docs with new SNMP options - - parse out SNMPv2 'bad oid' msgs - -2003.10.18 v0.10 silfreed - - bug#0000077 - deleting a device from a group deleted that device completely - -2003.10.14 v0.10 balleman - - bug#0000064 - SNMPv2c support - - bug#0000066 - specify SNMP port support - - bug#0000068 - specify SNMP timeout support - -2003.10.12 v0.10 keb - - always check /usr/local/include for libraries in FreeBSD - - fix typo in src/configure when detecting xml2 libraries - -2003.10.12 v0.10 balleman - - bug#0000073 - nav error in sub_dev_params - - bug#0000076 - show template name when applying - -2003.10.10 v0.10 silfreed - - CSS just for separator on view page - -2003.10.06 v0.10pre2 silfreed - - version bump to 0.10 - - more doc updates; add custom dsl - - add doc directories - - updated spec file - -2003.10.06 v0.10pre2 balleman - - bug#0000072: db error on slide show if no active, viewable devices - - doc updates - -2003.10.04 v0.10pre2 balleman - - bug#0000071: rate of change support in conditions - -2003.09.29 v0.10pre2 silfreed - - documentation updates - -2003.09.27 v0.10pre2 silfreed - - bug#0000059: sqaushed by adding grp nav to snmp_cache_view.php - - make the device tree have it's 'view' images next to the device it - represents - - bug#0000070: header redirect on devices.php after db updates - - bug#0000067: fixed notifications.php's docs a bit to make them more - uniform - -2003.09.24 v0.10pre2 balleman - - bug#0000060: yesterday's highlight should be displayed on daily graphs - - bug#0000069: infinite graph items shouldn't be included in "totals" - - bug#0000061: document workday highlight feature - - Add tags to the manual for organization - -2003.09.23 v0.10pre2 balleman - - bug#0000054: program crash on problem with runtime file - - bug#0000065: can't change graph width/height - - Set height/width for monitor graphs to default for custom graphs - -2003.09.13 v0.10pre1 silfreed - - bug#0000026: hiding advanced options on graph items edit page - - bug#0000049: moved everything from DBChangeLog to netmrg.mysql and - added names to template graphs - - added 'advanced' hiding on graphs.php - - bug#0000050: updater to go from version to version - - move external auth to config file - - version bump to 0.10pre2 - -2003.09.13 v0.10pre1 balleman - - bug#0000042: --base support on graphs - - bug#0000043: support logarithmic display (-o) - - support legend hiding (-g) - - bug#0000048: duplication problems - - bug#0000020: polling interval configuration - - bug#0000039: disk graph automagic, finalize - -2003.09.12 v0.10pre1 silfreed - - bug#0000041: add navigational history to the top of pages underneath 'Groups' - -2003.09.11 v0.10pre1 balleman - - bug#0000045: modularize SNMP further so that sessions aren't created on - each SNMP query - - bug#0000044: rojer's patches - error handling, windows disk mappings, - and a series of new 'internal' tests. - -2003.09.08 v0.10pre1 silfreed - - bug#0000031: added a 'user_prefs.php' page as well as a whole new system - of writing frontend pages - -2003.08.31 v0.10pre1 silfreed - - bug#0000024: the 'next' link shouldn't always work now - - bug#0000027: when adding a monitor, it won't select the first item in the - database - it should just select the first item - - bug#0000035: deleting a group wasn't deleting devices because of the - dev_parents change. - - bug#0000034: wrapper script complains about more errors - -2003.08.27 v0.10pre1 balleman - - kill feature#28 graph dissection ("show children") feature restored - -2003.08.25 v0.10pre1 balleman - - kill bug#25 - log device names - -2003.08.02 v0.10pre1 balleman - - kill bug#0000008 - hide password on command line - - add password prompting capability - -2003.07.28 v0.8 silfreed - - lots of doc upgrades - - makedoctree addition to make docs for the website - - xml config for web interface - - version bump to 0.10pre1 - -2003.07.28 v0.8 balleman - - bug#0000018 - SubDevParam page doesn't have a working delete - - documentation - - xml config for gatherer - -2003.07.17 v0.8 silfreed - - fixing directory paths - - bug#0000014: fixed static paths for lockfile and runtime netmrg.cpp - -2003.07.16 v0.8 silfreed - - restructured cvs tree - - added kevin's latest autoconf patch - -2003.07.14 v0.8 silfreed - - posted beta.netmrg.net to be live at www.netmrg.net - - added makecvssnap to create cvs snapshots - -2003.07.07 v0.8 silfreed - - bug#0000005: where id != '$grp_id' should do the trick - - bug#0000006: spiffy javascript to prevent min >= max in monitors.php - - bug#0000007: spiffy javascript to write a 'U' in the min/max column in monitors.php - - bug#0000004: can't figure out how to speed things up - - added a 'makedist' script that will make a tarball out of the latest cvs - -2003.07.06 v0.8 silfreed - - enclose_graph checks for auth now - - added an 'ACCESS DENIED' png for get_graph auth - - get_graph now auths - - external auth now works - -2003.07.06 v0.8 balleman - - bug#0000001: chrooting code had multiple issues with respect to device tree - - break netmrg.cpp into more managable chunks (devices, monitors, mappings) - - add settings management to gatherer - - allow for override of some settings by command line - - more verbose/graceful error handling in gatherer during startup/database failures - -2003.07.05 v0.8 silfreed - - bug#0000002: updated logos on beta website - - bug#0000003: code to detect if type was passed in didn't take account for - already existing type - - modified view_check_auth() so that it works again on the view page - -2003.07.02 v0.8 silfreed - - new bugtracker using mantisbt (http://mantisbt.sourceforge.net) - -2003.05.26 v0.8 silfreed - - bug#7 : status images not vertically centered - - bug#8 : monitors.php: no script options for new monitor - - viewgraph now implemented on device_tree.php w/ different - images for items w/ associated items or not - -2003.05.15 v0.8 balleman - - enclose_graph.php reworked - - capability for 'zooming' on both axes - - ability to apply arbitrary templates - -2003.05.08 v0.8 balleman - - abstract all mysql_* calls to db_* calls - - db_escape_string deployed where seemingly useful - -2003.05.06 v0.8 balleman - - "Make Graph" functionality restored for interfaces - - graph duplication fixed (custom and template) - -2003.04.21 v0.8 balleman - - graph templating exists (and works!) - -2003.04.21 v0.8 silfreed - - bug#2 : can't fix ifName/IfDescr link - - bug#3 : fixed javascript bug w/ slashes - - bug#4 : device_tree.php expand/collapse bug - -2003.04.17 v0.8 silfreed - - format.php: - * cleanup/documentation - * reworking make_display_table() and make_display_item() to get - rid of $custom_add_link and make the code easier to read/use - - www/*.php: modifying all pages that use above functions to use new way - -2003.04.15 v0.8 balleman - - reworking 'views' in preparation of graph templating - -2003.04.01 v0.8 silfreed - - making subpages CSS happy; still need to alternate list items - -2003.03.31 v0.8 balleman - - killed remainder of "mon_" files and tables - -2003.03.24 v0.8 silfreed - - more graphics (svg is good) - - mostly got image specfiles working - -2003.03.11 v0.8 balleman - - change how graphs and graph items work - - notifications and responses now work - -2003.03.07 v0.8 silfreed - - public website has a good majority of it finished. almost ready to post - -2003.02.03 v0.8 balleman - - event log working - - bug in move up/down fixed (used to break after an item was deleted) - -2003.01.25 v0.8 balleman - - C++ program performs disk and interface caching - - web interface has been updated to accept this - -2003.01.19 v0.8 silfreed - - created http://lists.netmrg.net using phpBB - -2003.01.18 v0.8 silfreed - - created http://bugs.netmrg.net and crossed one more thing off my TODO - - changing my public email for netmrg to be 'silfred@netmrg.net' - -2003.01.15 v0.8 silfreed - - implemented external http auth support (untested) - -2003.01.13 v0.8 silfreed - - updated copyright info on every .php page to refer to doc/LICENSE - - new versioning/changelog scheme - -2003.01.12 v0.8 silfreed - - wrote device_tree.php (based on last_status.php) - - auth code much more complete - * will logout a user if they've been logged in too long - * will logout a user if they're from a new IP - * implemented on every page - - menu.php updated to use static array (in stat.php) - * includes support for displaying links based on auth levels - - -== versions before 2002.11.19 didn't have a date assocated with them == -0.79.3a - - CVS-ification - - continue rewrite of C++ code - - extensive use of CSS - - update of all web pages to work with 'register_globals' off - * this requires PHP 4.1+ - - use php long start tags instead of short ones - - C++ code supports net-snmp library - -0.79.2a - - reconstruction of C++ code - -0.79.1a - - sub-devices and database restructuring. - - menu and title bar redesign - -0.79.0a - - First version with a change log. - - alternating table row colors - - numeric sorting of if_index in snmp_cache - - working multiple simultaneous pthreads - - tiered deletion (facilitating orphan prevention) - - make color selections static - - allow for nested groups - - removed cookie expiration for device tree - - fixed some major inefficiencies in the device tree - - popup color chooser - - javascript-based delete confirmation - diff -Nurb netmrg-0.19/share/doc/dirtree netmrg-0.20/ChangeLog/share/doc/dirtree --- netmrg-0.19/share/doc/dirtree 2003-08-03 01:39:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/dirtree 1970-01-01 05:30:00.000000000 +0530 @@ -1,39 +0,0 @@ -ideal cvs tree - migration - bin - cmd -> libexec - dat -> var/log - db -> share/ - doc -> share/doc - images -> share/images - include -> www/include - lib -> www/lib - rrd -> var/lib/rrd - src - www -> var/webfiles - ends up like - bin - etc - libexec - share - /doc - /images - src - /include - www - /include - /lib - /webfiles - var - /log - /lib -ideal install - $(EPREFIX)/bin (netmrg-gatherer) - $(EPREFIX)/etc (netmrg.conf) - $(EPREFIX)/libexec (tests) - $(EPREFIX)/share/netmrg (images, db) - $(EPREFIX)/share/doc/netmrg (docs) - $(PREFIX)/var/www/netmrg (include, lib, webfiles) - $(PREFIX)/var/lib/netmrg (rrd) - $(PREFIX)/var/log/netmrg (lockfile) - diff -Nurb netmrg-0.19/share/doc/html/contact.html netmrg-0.20/ChangeLog/share/doc/html/contact.html --- netmrg-0.19/share/doc/html/contact.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/contact.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,101 +0,0 @@ - - - - - - - Contact Information - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
Prev 
-
-
- -
-

Chapter 7. Contact - Information

- -

We have great aspirations for what NetMRG could become, but - as with all open-source software, such aspriations can only be - achieved with the active participation of the open-source - community. Please do your part and support software that you - use by helping to answer support questions on forums and report - bugs to developers. Thanks!

- - -
- -
-
- - - - - - - - - - - - - - - - - -
PrevHome 
- netmrg-gatherer  
-
- - diff -Nurb netmrg-0.19/share/doc/html/index.html netmrg-0.20/ChangeLog/share/doc/html/index.html --- netmrg-0.19/share/doc/html/index.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/index.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,114 +0,0 @@ - - - - - - - The NetMRG Reference - - - - - - -
- - -
-

The NetMRG - Reference

- -

Brady - Alleman

- -

Douglas E. - Warner

- -

Copyright - © 2003-2006 Brady Alleman and Douglas E. Warner

-
-
- -
-
-
Table of Contents
- -
I. Overview
- -
-
-
1. Introduction
- -
2. Revision - History
-
-
- -
II. Installation
- -
-
-
3. Software - Requirements
- -
4. Satisfying - Requirements
- -
5. Installation - Procedure
- -
6. Upgrade - Procedure
-
-
- -
III. Reference
- -
-
-
I. Manual Pages
- -
-
-
netmrg-gatherer -- Gathers - data from devices.
-
-
-
-
- -
7. Contact Information
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
  Next
  Overview
-
- - diff -Nurb netmrg-0.19/share/doc/html/installation.html netmrg-0.20/ChangeLog/share/doc/html/installation.html --- netmrg-0.19/share/doc/html/installation.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/installation.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,96 +0,0 @@ - - - - - - - Installation - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
- - -
-

II. Installation

- -
-
-
Table of Contents
- -
3. Software - Requirements
- -
4. Satisfying - Requirements
- -
5. Installation - Procedure
- -
6. Upgrade Procedure
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Revision - History Software - Requirements
-
- - diff -Nurb netmrg-0.19/share/doc/html/install.html netmrg-0.20/ChangeLog/share/doc/html/install.html --- netmrg-0.19/share/doc/html/install.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/install.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,206 +0,0 @@ - - - - - - - Installation Procedure - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 5. Installation - Procedure

- -
    -
  1. -

    Untar to some directory like /tmp/ (it will untar into a - 'netmrg' directory)

    - 
    -cd /tmp
-wget http://www.netmrg.net/download/release/netmrg.tar.gz
-tar xzvf netmrg.tar.gz
-
    -
    2. - -
  2. -

    Now we need to compile and install the source. cd into the directory made by your tar command and type the following:

    - 
    -./configure
-make
-make install
-
    - -
    -
    -

    Note: If configure - fails to locate the needed libraries they can be - manually specified. Run ./configure - --help for details on the necessary options.

    -
    -
    -
    3. - -
  3. -

    Setup the database

    - -

    Now we need to setup the database. Please change at - least the password (netmrgpass below).

    - 
    -mysqladmin create netmrg
-mysql -u root -p netmrg < share/netmrg.mysql
-mysql -u root -p
-> grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpass';
-
    -
    4. - -
  4. -

    You need to modify your apache config in order to make - your NetMRG installation live (commonly in /etc/httpd/conf/httpd.conf).

    - -

    The first is to alias /netmrg to the installed web - directory (commonly /usr/local/var/www/netmrg/webfiles).

    - 
    -Alias /netmrg "/usr/local/var/www/netmrg/webfiles"
-
    - -

    The easier way (if you're running Apache >= 1.3) is - to just Include the conf file we've created anywhere in - your file (near the bottom is fine).

    - 
    -Include /usr/local/etc/netmrg.conf
-
    - -

    You will need to restart your Apache after making config - changes. Telling it to reload its config should be good - enough

    - 
    -killall -HUP httpd
-
    -
    5. - -
  5. -

    Configure the Installation

    - -

    All of NetMRG's common configuration options are - controlled by an XML file, normally located at /usr/local/etc/netmrg.xml. You should edit - this file to make any necessary changes before continuing - with installation.

    - -

    For most installations, you will at least need to edit - netmrg.xml to reflect your - database username and password.

    -
    6. - -
  6. -

    Setup Permissions

    - -

    NetMRG does not need superuser permissions to run, - therefore we will setup a user for it.

    - 
    -# useradd netmrg
-# chown netmrg:netmrg /usr/local/var/log/netmrg
-# chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd
-
    -
    7. - -
  7. -

    Setup crontab

    - -

    You can setup the crontab entries in two places: either - edit /etc/crontab, or run - crontab -e as the netmrg user. For - 'crontab -e', use an entry similar to this:

    - 
    -*/5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi"
-
    - -

    To edit the master crontab, edit /etc/crontab and add a line similar to - this:

    - 
    -*/5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi"
-
    -
    8. - -
  8. -

    Point your web browser at your install, and start - graphing things! The default login is admin and the default password is - nimda. Point your web browser - at the host you built this on (something similar to - http://yourhost.com/netmrg/) and - please change your password!

    -
    9. -
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Satisfying - RequirementsUpUpgrade - Procedure
-
- - diff -Nurb netmrg-0.19/share/doc/html/intro.html netmrg-0.20/ChangeLog/share/doc/html/intro.html --- netmrg-0.19/share/doc/html/intro.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/intro.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,87 +0,0 @@ - - - - - - - Introduction - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 1. Introduction

- -

Welcome to NetMRG! NetMRG is a database-driven network - monitoring and graphing tool for use on Linux systems. It - offers an intuitive web-based configuration, customized - monitoring capabilities for unusual situations, a fast - multi-threaded polling application, and brilliant graphs - rendered by RRDTOOL.

- -

This document aims to guide you swiftly through the - installation and configuration of NetMRG, as well as act as a - reference for those with existing installations.

-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
OverviewUpRevision - History
-
- - diff -Nurb netmrg-0.19/share/doc/html/LICENSE.html netmrg-0.20/ChangeLog/share/doc/html/LICENSE.html --- netmrg-0.19/share/doc/html/LICENSE.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/LICENSE.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - -
- - - - -
The NetMRG Reference
-
-
- -
- - -

This project is licensed under the terms of the MIT - License.

- -

Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions:

- -

The above copyright notice and this permission notice shall - be included in all copies or substantial portions of the - Software.

- -

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE - WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE.

- -

All product names are property of their respective owners. - Such names are used for identification purposes only and are - not indicative of endorsement by or of any company, - organization, product, or platform.

-
- -
-
- - - - - - - - - -
 Home 
-
- - diff -Nurb netmrg-0.19/share/doc/html/manpage.html netmrg-0.20/ChangeLog/share/doc/html/manpage.html --- netmrg-0.19/share/doc/html/manpage.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/manpage.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,89 +0,0 @@ - - - - - - - Manual Pages - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
- - -
-

I. Manual Pages

- -
-
-
Table of Contents
- -
netmrg-gatherer -- Gathers - data from devices.
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
ReferenceUp - netmrg-gatherer
-
- - diff -Nurb netmrg-0.19/share/doc/html/netmrgdoc.css netmrg-0.20/ChangeLog/share/doc/html/netmrgdoc.css --- netmrg-0.19/share/doc/html/netmrgdoc.css 2004-10-31 01:08:38.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/netmrgdoc.css 1970-01-01 05:30:00.000000000 +0530 @@ -1,81 +0,0 @@ -BODY { - background-color : #FFFFFF; - color : #000000; - font-size : 1em; - font-family : serif; -} - -TABLE, TH, TR, TD { - margin : 0; - padding : 0; - border : 0; -} - -DIV, P, PRE, BLOCKQUOTE { - margin : 0; - padding : 0; - margin-bottom : 0.5em; -} - -IMG { - border : 0; -} - -.TITLEPAGE { - background-image : url(netmrg-logo-medium.png); - background-position : top right; - background-repeat : no-repeat; -} - -.TITLE { - font-size : 2em; - font-weight : bold; - font-family : sans-serif; - letter-spacing : 0.2em; -} - -.NAVHEADER th { - height : 35px; - background-image : url(netmrg-logo-small.png); - background-position : top right; - background-repeat : no-repeat; - font-size : 1em; - font-weight : bold; - font-family : sans-serif; - letter-spacing : 0.2em; -} - -.AUTHOR { - font-size : 1em; - font-weight : bold; - margin : 0; -} - -.FILENAME { - color: #007A00; -} - -.SCREEN { - background-color : #E5E5E5; - border : 1px dashed #D0D0D0; -} - -.PROGRAMLISTING { - background-color : #E5E5E5; - border : 1px dashed #D0D0D0; -} - -BLOCKQUOTE.NOTE { - background-color : #F6FFBD; - border-top : 1px dashed #FFE856; - border-bottom : 1px dashed #FFE856; - margin-left : 2em; - margin-right : 2em; - padding-left : 0.2em; - padding-right : 0.2em; -} - -BLOCKQUOTE.NOTE P{ - padding : 0; -} - diff -Nurb netmrg-0.19/share/doc/html/netmrg-gatherer.html netmrg-0.20/ChangeLog/share/doc/html/netmrg-gatherer.html --- netmrg-0.19/share/doc/html/netmrg-gatherer.html 2006-01-31 04:44:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/netmrg-gatherer.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,381 +0,0 @@ - - - - - - - netmrg-gatherer - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -

netmrg-gatherer

- -
- - -

Name

netmrg-gatherer -- Gathers data from - devices. -
- -
- - -

Synopsis

- -

netmrg-gatherer [OPTIONS]

-
- -
- - -

Description

- -

netmrg-gatherer performs tests on all - enabled hosts in NetMRG. It will store results in RRD files - using RRDTOOL(1) and perform actions in response to events.

- -
- - -

Global Options

- -
-
-

- -h
-
- -
-

Displays usage information and exits.

-
- -

- -v
-
- -
-

Displays software version and exits.

-
-
-
-
- -
- - -

Operating Options

- -
-
-

- -t num threads
-
- -
-

Run no more than the specified number of threads - simultaneously.

-
- -

- -X
-
- -
-

Become a daemon.

-
- -

- -M mode
-
- -
-

Mode of operation. This option controls the manner - in which the gatherer operates. The modes currently - supported are "once" (the default, best used manually - or via cron) which runs all tests once then exits, and - "wait" (best used when daemonized) which will run all - tests, wait for the gatherer interval to expire, and - then repeat.

-
-
-
- -
-
-

Note: To run netmrg-gatherer daemonized, the - recommended set of options at this point is "-X -S -M - wait" which will daemonize, repeat the gather cycle on - each interval, and write output to syslog.

-
-
-
- -
- - -

Logging, Debugging and Verbosity Options

- -
-
-

- -S
-
- -
-

Syslog. Logs messages to syslog instead of - stdout.

-
- -

- -b
-
- -
-

Bland. Disables color output. By default, - netmrg-gatherer will - display color output when connected to a terminal, but - will use bland output when its output is written to a - file. This option should only be needed when the - detection mechanism has failed, or the user doesn't - want to see colors when running the program by - hand.

-
- -

- -a
-
- -
-

All. Displays all log messages.

-
- -

- -m
-
- -
-

Most. Displays more messages than default.

-
- -

- -q
-
- -
-

Quiet. Silences all output.

-
- -

- -l level mask
-
- -
-

Only outputs messages that match the specified level - mask.

-
- -

- -c component mask
-
- -
-

Only outputs messages that match the specified - component mask.

-
- -

- -s
-
- -
-

Safe. Tries to keep sensitive information out of the - displayed messages.

-
-
-
-
- -
- - -

Configuration File Options

- -
-
-

- -C config file
-
- -
-

Uses the specified XML configuration file.

-
- -

- -K config file
-
- -
-

Parses the specified XML configuration file and - exits.

-
-
-
-
- -
- - -

Database Options

- -
-
-

- -H host
-
- -
-

Uses the specified host name for connecting to the - database.

-
- -

- -D database
-
- -
-

Uses the specified database name.

-
- -

- -u user name
-
- -
-

Uses the specified user name for connecting to the - database.

-
- -

- -p [password]
-
- -
-

Uses the specified password for connecting to the - database. If no password is specified, the user is - prompted to enter one.

-
-
-
-
- -
- - -

Recaching Options

- -
-
-

- -i device id
-
- -
-

Performs an interface recache on the specified - device.

-
- -

- -d device id
-
- -
-

Performs a disk recache on the specified device.

-
-
-
- -
-
-

Note: Recaching options are intended for use by - the web interface. These options should not be generally - used by end users.

-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Manual PagesUpContact - Information
-
- - Binary files netmrg-0.19/share/doc/html/netmrg-logo-medium.png and netmrg-0.20/ChangeLog/share/doc/html/netmrg-logo-medium.png differ Binary files netmrg-0.19/share/doc/html/netmrg-logo-small.png and netmrg-0.20/ChangeLog/share/doc/html/netmrg-logo-small.png differ diff -Nurb netmrg-0.19/share/doc/html/overview.html netmrg-0.20/ChangeLog/share/doc/html/overview.html --- netmrg-0.19/share/doc/html/overview.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/overview.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,88 +0,0 @@ - - - - - - - Overview - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
- - -
-

I. Overview

- -
-
-
Table of Contents
- -
1. Introduction
- -
2. Revision History
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
The NetMRG - Reference  - Introduction
-
- - diff -Nurb netmrg-0.19/share/doc/html/reference.html netmrg-0.20/ChangeLog/share/doc/html/reference.html --- netmrg-0.19/share/doc/html/reference.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/reference.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,86 +0,0 @@ - - - - - - - Reference - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
- - -
-

III. Reference

- -
-
-
Table of Contents
- -
I. Manual Pages
-
-
-
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Upgrade - Procedure Manual - Pages
-
- - diff -Nurb netmrg-0.19/share/doc/html/revisions.html netmrg-0.20/ChangeLog/share/doc/html/revisions.html --- netmrg-0.19/share/doc/html/revisions.html 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/revisions.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,245 +0,0 @@ - - - - - - - Revision History - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 2. Revision - History

- -
    -
  • -

    0.19

    - -

    2006.02.03

    - -

    Major Feature Enhancements and Bug Fixes; Major Web - Interface redesign to give more room for graphs and ease - overall use. Security enhancements behind the scenes to - ensure correct permissions checking. Added a search - interface that will search groups, devices, sub devies, and - sub device parameters. RRDtool 1.2 support (including graph - smoothing); Depricated use of netmrg_cron.sh in favor of - using netmrg-gatherer; migrated bulk of docs to wiki; - numerous other bugfixes and enhancements.

    -
    • - -
  • -

    0.18.2

    - -

    2004.11.09

    - -

    Minor Bug Fixes; Fixed some escaping problems on the - interface cache page, disabled the 'quickprint' Net-SNMP - option for better compatibility, fixed the snmp-failure - test, fixed an SVO-user view issue, and added failover for - duplicate ifNames when adding interfaces.

    -
    • - -
  • -

    0.18.1

    - -

    2004.11.01

    - -

    Minor Bug Fixes; Fixed a small bug where the gatherer - would not register negative values.

    -
    • - -
  • -

    0.18

    - -

    2004.10.25

    - -

    Major Bug Fixes; Fixed an issue preventing form - submissions on some browsers, fixed PHP string escaping - problems, fixed inability to create inverted stacked - graphs, and fixed parameter substituion and documentation - regarding notifications and responses. Added better support - on FreeBSDs (4.8-5.2) and x86-64 architectures (Linux and - FreeBSD), the ability to multiply summed values, MySQL - timeouts, simple value parsing (to get the numeric content - out of quoted numbers, etc), graphic icons for most - actions, support for a default external auth user (with - regards to permissions), and cleaned up the gatherer build - process output.

    -
    • - -
  • -

    0.17

    - -

    2004.09.13

    - -

    Minor Feature Enhancements; Added colorized gatherer - output, checkbox support on multiple pages, the ability to - disable users, fixed a potential SQL-injection bug, updated - navigation on group pages, updated tutorials.

    -
    • - -
  • -

    0.16

    - -

    2004.06.10

    - -

    Minor Bugfixes and Feature Enhancements; fixed a user - management bug and several bugs related to 'single view - only' users not being able to see graphs, added the ability - to ignore SNMP uptime checks for devices (permitting the - monitoring of broken devices), added the ability to do an - SNMP walk of an OID (useful for the Windows SNMP agent), - enhanced group/device management, cleaned up autoconf (now - supports FC2), and added experimental syslog and daemon - support in the gatherer.

    -
    • - -
  • -

    0.15

    - -

    2004.05.20

    - -

    Minor Bugfixes and Feature Enhancements; fixes for - various db errors (including the infamous one on - snmp_cache_view.php), better cross-platform compilation, - select all/none/invert checkbox support, support for - choosing what graph to apply to an interface, better - support for php < 4.2.0, and some security fixes for - single-view-only users.

    -
    • - -
  • -

    0.14

    - -

    2004.03.10

    - -

    Minor Bugfixes and Feature Enhancements; escaping issues - in template dereferencing, broken links on various pages, - security issues regarding manual SNMP recaching, broken - duplication on non-cutting-edge MySQL, more parameter - substitution in SQL tests, better date parsing for advanced - graph view, nav-bar and group navigation enhancements, - advanced view capability for monitor-only graphs.

    -
    • - -
  • -

    0.13

    - -

    2003.12.19

    - -

    Minor Bugfixes and Feature Enhancements; slide show - ordering, previous slide, resume slide show, better - formatting of 'sums', errors on view editing, fixes to - permissions checking, and an occassional segfault in the - gatherer was fixed.

    -
    • - -
  • -

    0.12

    - -

    2003.12.15

    - -

    Major Feature Enhancents and Bugfixes; added SNMPv2 - support, fixed a bug that would cause a device to be - deleted from all groups, fixed session timeout when using - external auth, added checkbox support to interface/disk - cache pages, slide show enhancements, fixed permission - issue where unauthorized users could view/edit test_* - pages

    -
    • - -
  • -

    0.10

    - -

    2003.10.05

    - -

    Major bug fix; fixes a db error when trying to view - monitors, a bug that would always set the width and height - to zero when creating graphs, and makes conditions with - 'rate of change' work. Many documentation upgrades.

    -
    • - -
  • -

    0.10pre2

    - -

    2003.09.15

    - -

    This release focuses on adding new features and - sqaushing bugs. In addition, there is now an 'updater.php' - that is required to be run between versions. A minor change - needs to be made to everyone's 'netmrg.xml' to add an - 'externalauth' field inside the 'website' section.

    -
    • - -
  • -

    0.10pre1

    - -

    2003.07.28

    - -

    Initial publication

    -
    • -
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
IntroductionUp - Installation
-
- - diff -Nurb netmrg-0.19/share/doc/html/satisfyreq.html netmrg-0.20/ChangeLog/share/doc/html/satisfyreq.html --- netmrg-0.19/share/doc/html/satisfyreq.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/satisfyreq.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,254 +0,0 @@ - - - - - - - Satisfying Requirements - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 4. - Satisfying Requirements

- -

Specific instructions to satisfy dependencies for certain - platforms are presented below. They should be used more as - suggestions, not necessarily step-by-step instructions. You may - need to do more than what is listed, or much less, depending on - the options you selected when installing your operating - system.

- -
    -
  • -

    Red Hat - Linux

    - -
      -
    • -

      In order to satisfy the libstdc++ requirement, - Redhat 8.0 or above is required. NetMRG may not be - stable on older versions of libstdc++.

      -
      • - -
    • -

      Install the following RPMs from your Red Hat - installation media:

      - -
        -
      • -

        httpd

        -
        • - -
      • -

        php

        -
        • - -
      • -

        php-mysql

        -
        • - -
      • -

        mysql

        -
        • - -
      • -

        mysql-server

        -
        • - -
      • -

        mysql-devel

        -
        • - -
      • -

        libxml2

        -
        • - -
      • -

        libxml2-devel

        -
        • - -
      • -

        net-snmp

        -
        • - -
      • -

        net-snmp-devel

        -
        • - -
      • -

        net-snmp-utils

        -
        • -
      -
      • - -
    • -

      Installing RRDTOOL

      - - -
      • - -
    • -

      Installing precompiled NetMRG RPM

      - -

      Download the latest NetMRG RPM and install it as - follows:

      - 
      -$ rpm -Uvh netmrg-0.10.rpm
-
      - -

      You will still have to perform the following tasks - listed in the Install Instructions:

      - -
        -
      • -

        Setup the Database

        -
        • - -
      • -

        Configure Apache

        -
        • - -
      • -

        Configure the Installation

        -
        • - -
      • -

        Setup Crontab

        -
        • -
      -
      • -
    -
    • - -
  • -

    FreeBSD - (4.8)

    - -
      -
    • -

      Install the following ports:

      - -
        -
      • -

        www/apache13

        -
        • - -
      • -

        rrdtool

        -
        • - -
      • -

        net-snmp

        -
        • - -
      • -

        libxml2

        -
        • - -
      • -

        mod_php4 (specify - MySQL support)

        -
        • - -
      • -

        lang/gcc32

        -
        • -
      -
      • - -
    • -

      Run configure, specifying - gcc32:

      - 
      -./configure 'LDFLAGS=-L/usr/local/gcc3/lib' 'CPPFLAGS=-I/usr/local/gcc3/include' 'CXX=g++32'
-
      -
      • -
    -
    • -
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Software - RequirementsUpInstallation - Procedure
-
- - diff -Nurb netmrg-0.19/share/doc/html/softwarereq.html netmrg-0.20/ChangeLog/share/doc/html/softwarereq.html --- netmrg-0.19/share/doc/html/softwarereq.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/softwarereq.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,120 +0,0 @@ - - - - - - - Software Requirements - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 3. - Software Requirements

- -

NetMRG Requires the following packages for compilation.

- -
    -
  • -

    PHP, Version >= 4.1

    -
    • - -
  • -

    MySQL, Version - >= 3.23

    -
    • - -
  • -

    RRDTOOL, - Version >= 1.0.28

    -
    • - -
  • -

    Libxml2, Version >= 2.30

    -
    • - -
  • -

    Libstdc++, - Version >= 3.2

    - -

    Versions earlier than this may compile just fine, but - may experience runtime issues. Specifically, we experienced - software crashes on an SMP machine running version 2.96 - that were resolved by upgrading to 3.2.

    -
    • - -
  • -

    NET/UCD-SNMP, - Version >= 4.2.2

    -
    • -
-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
InstallationUpSatisfying - Requirements
-
- - diff -Nurb netmrg-0.19/share/doc/html/upgrade.html netmrg-0.20/ChangeLog/share/doc/html/upgrade.html --- netmrg-0.19/share/doc/html/upgrade.html 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/html/upgrade.html 1970-01-01 05:30:00.000000000 +0530 @@ -1,101 +0,0 @@ - - - - - - - Upgrade Procedure - - - - - - - - - -
- - - - - - - - - - - - -
The NetMRG Reference
PrevNext
-
-
- -
-

Chapter 6. Upgrade - Procedure

- -

After doing a 'make install' as described in the chapter on - Installing NetMRG, the next step is to run the web-based - updater. This is accomplished by logging into NetMRG with - administrator privileges, and following the prompts. NetMRG's - web interface will not operate normally and the gatherer will - not run until the web-based upgrade is performed. - Non-administrator users will only receive a message directing - them to contact their NetMRG administrator.

- -

If you need to perform an upgrade, the updater will prompt - you to apply all updates. - Clicking this link will perform all necessary updates for this - release.

- -

If for some reason an update fails, or you would like to - re-apply an update for any reason, you can goto the updater and - goto View all available updates. - This will present you a list of the updates that are available - and their status (applied, not applied, or error). If you have - problems updating from one version to the next, you can force - individual updates that fail so that they're considered - 'applied'. Once all updates are applied for a particular - version, the database will be automatically updated to the - latest version that has all updates applied.

-
- -
-
- - - - - - - - - - - - - - - - - -
PrevHomeNext
Installation - ProcedureUpReference
-
- - diff -Nurb netmrg-0.19/share/doc/LICENSE netmrg-0.20/ChangeLog/share/doc/LICENSE --- netmrg-0.19/share/doc/LICENSE 2006-02-01 00:28:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/LICENSE 1970-01-01 05:30:00.000000000 +0530 @@ -1,350 +0,0 @@ -Copyright (c) 2001-2006 - Brady Alleman - Douglas E. Warner - Kevin Bonner - -This project is licensed under the terms of the GPL, Version 2. Other licensing -arrangements may be available upon request. Please contact licensing@netmrg.net. - - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -Nurb netmrg-0.19/share/doc/man/man1/netmrg-gatherer.1 netmrg-0.20/ChangeLog/share/doc/man/man1/netmrg-gatherer.1 --- netmrg-0.19/share/doc/man/man1/netmrg-gatherer.1 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/man/man1/netmrg-gatherer.1 1970-01-01 05:30:00.000000000 +0530 @@ -1,95 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "NETMRG-GATHERER" "1" "03 February 2006" "" "Manual Pages" - -.SH NAME -netmrg-gatherer \- Gathers data from devices. -.SH SYNOPSIS - -\fBnetmrg-gatherer\fR [ \fBOPTIONS\fR ] - -.SH "DESCRIPTION" -.PP -\fBnetmrg-gatherer\fR performs tests on all enabled hosts in NetMRG. It will store results in RRD files using RRDTOOL(1) and perform actions in response to events. -.SS "GLOBAL OPTIONS" -.TP -\fB -h \fR -Displays usage information and exits. -.TP -\fB -v \fR -Displays software version and exits. -.SS "OPERATING OPTIONS" -.TP -\fB -t \fInum threads\fB \fR -Run no more than the specified number of threads simultaneously. -.TP -\fB -X \fR -Become a daemon. -.TP -\fB -M \fImode\fB \fR -Mode of operation. This option controls the manner in which the gatherer operates. The modes currently supported are "once" (the default, best used manually or via cron) which runs all tests once then exits, and "wait" (best used when daemonized) which will run all tests, wait for the gatherer interval to expire, and then repeat. -.sp -.RS -.B "Note:" -To run \fBnetmrg-gatherer\fR daemonized, the recommended set of options at this point is "-X -S -M wait" which will daemonize, repeat the gather cycle on each interval, and write output to syslog. -.RE -.SS "LOGGING, DEBUGGING AND VERBOSITY OPTIONS" -.TP -\fB -S \fR -Syslog. Logs messages to syslog instead of stdout. -.TP -\fB -b \fR -Bland. Disables color output. By default, \fBnetmrg-gatherer\fR will display color output when connected to a terminal, but will use bland output when its output is written to a file. This option should only be needed when the detection mechanism has failed, or the user doesn't want to see colors when running the program by hand. -.TP -\fB -a \fR -All. Displays all log messages. -.TP -\fB -m \fR -Most. Displays more messages than default. -.TP -\fB -q \fR -Quiet. Silences all output. -.TP -\fB -l \fIlevel mask\fB \fR -Only outputs messages that match the specified level mask. -.TP -\fB -c \fIcomponent mask\fB \fR -Only outputs messages that match the specified component mask. -.TP -\fB -s \fR -Safe. Tries to keep sensitive information out of the displayed messages. -.SS "CONFIGURATION FILE OPTIONS" -.TP -\fB -C \fIconfig file\fB \fR -Uses the specified XML configuration file. -.TP -\fB -K \fIconfig file\fB \fR -Parses the specified XML configuration file and exits. -.SS "DATABASE OPTIONS" -.TP -\fB -H \fIhost\fB \fR -Uses the specified host name for connecting to the database. -.TP -\fB -D \fIdatabase\fB \fR -Uses the specified database name. -.TP -\fB -u \fIuser name\fB \fR -Uses the specified user name for connecting to the database. -.TP -\fB -p [ \fIpassword\fB ] \fR -Uses the specified password for connecting to the database. If no password is specified, the user is prompted to enter one. -.SS "RECACHING OPTIONS" -.TP -\fB -i \fIdevice id\fB \fR -Performs an interface recache on the specified device. -.TP -\fB -d \fIdevice id\fB \fR -Performs a disk recache on the specified device. -.sp -.RS -.B "Note:" -Recaching options are intended for use by the web interface. These options should not be generally used by end users. -.RE diff -Nurb netmrg-0.19/share/doc/netmrgdoc.css netmrg-0.20/ChangeLog/share/doc/netmrgdoc.css --- netmrg-0.19/share/doc/netmrgdoc.css 2004-10-31 01:08:38.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/netmrgdoc.css 1970-01-01 05:30:00.000000000 +0530 @@ -1,81 +0,0 @@ -BODY { - background-color : #FFFFFF; - color : #000000; - font-size : 1em; - font-family : serif; -} - -TABLE, TH, TR, TD { - margin : 0; - padding : 0; - border : 0; -} - -DIV, P, PRE, BLOCKQUOTE { - margin : 0; - padding : 0; - margin-bottom : 0.5em; -} - -IMG { - border : 0; -} - -.TITLEPAGE { - background-image : url(netmrg-logo-medium.png); - background-position : top right; - background-repeat : no-repeat; -} - -.TITLE { - font-size : 2em; - font-weight : bold; - font-family : sans-serif; - letter-spacing : 0.2em; -} - -.NAVHEADER th { - height : 35px; - background-image : url(netmrg-logo-small.png); - background-position : top right; - background-repeat : no-repeat; - font-size : 1em; - font-weight : bold; - font-family : sans-serif; - letter-spacing : 0.2em; -} - -.AUTHOR { - font-size : 1em; - font-weight : bold; - margin : 0; -} - -.FILENAME { - color: #007A00; -} - -.SCREEN { - background-color : #E5E5E5; - border : 1px dashed #D0D0D0; -} - -.PROGRAMLISTING { - background-color : #E5E5E5; - border : 1px dashed #D0D0D0; -} - -BLOCKQUOTE.NOTE { - background-color : #F6FFBD; - border-top : 1px dashed #FFE856; - border-bottom : 1px dashed #FFE856; - margin-left : 2em; - margin-right : 2em; - padding-left : 0.2em; - padding-right : 0.2em; -} - -BLOCKQUOTE.NOTE P{ - padding : 0; -} - diff -Nurb netmrg-0.19/share/doc/netmrg.dsl netmrg-0.20/ChangeLog/share/doc/netmrg.dsl --- netmrg-0.19/share/doc/netmrg.dsl 2004-10-31 01:08:38.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/netmrg.dsl 1970-01-01 05:30:00.000000000 +0530 @@ -1,421 +0,0 @@ - - - -]]> - - -]]> - - -]]> -]> - - - - - -; Page -(define %two-side% #f) -(define %paper-type% "USletter") - -(define %page-width% - (case %paper-type% - (("A4") 210mm) - (("USletter") 8.5in) - (("USlandscape") 11in))) - -(define %page-height% - (case %paper-type% - (("A4") 297mm) - (("USletter") 11in) - (("USlandscape") 8.5in))) - -; TOC -(define %section-autolabel% #t) -(define %label-preface-sections% #f) - -; Links -(define %show-ulinks% #t) -(define %footnote-ulinks% #t) - -; Misc -(define tex-backend #t) - -; Formatting -(define %line-spacing-factor% 1.1) -(define %indent-programlisting-lines% #f) -(define %indent-screen-lines% #f) - -; Book -(define %generate-book-titlepage% #t) -(define %generate-book-titlepage-on-separate-page% #f) -(define %generate-book-toc% #t) - -; Part -(define %generate-part-toc% #f) -(define %generate-part-toc-on-titlepage% #t) -(define %generate-part-titlepage% #f) -(define %generate-partintro-on-titlepage% #t) - -; Chapter -(define %chapter-autolabel% #t) -(define %chap-app-running-head-autolabel% #t) - -; Article -(define %generate-article-titlepage% #t) -(define %generate-article-toc% #t) -(define %generate-article-titlepage-on-separate-page% #t) -(define %generate-article-toc-on-titlepage% #t) -(define %article-page-number-restart% #f) - -; Styles -(element application ($mono-seq$)) -(element filename ($mono-seq$)) -(element function ($mono-seq$)) -(element guibutton ($bold-seq$)) -(element guiicon ($bold-seq$)) -(element guilabel ($italic-seq$)) -(element guimenu ($bold-seq$)) -(element guimenuitem ($bold-seq$)) -(element hardware ($bold-mono-seq$)) -(element keycap ($bold-seq$)) -(element literal ($mono-seq$)) -(element parameter ($italic-mono-seq$)) -(element prompt ($mono-seq$)) -(element symbol ($charseq$)) -(element emphasis ($italic-seq$)) -(element question ($bold-seq$)) - -(define para-style - (style - font-size: %bf-size% - font-weight: 'medium - font-posture: 'upright - font-family-name: %body-font-family% - line-spacing: (* %bf-size% %line-spacing-factor%))) - -(define %bf-size% - (case %visual-acuity% - (("tiny") 8pt) - (("normal") 10pt) - (("presbyopic") 12pt) - (("large-type") 24pt))) - -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - (if (string=? (gi nd) (normalize "appendix")) - 0 - 1))) - -(define-unit em %bf-size%) - -; Titles -(define ($object-titles-after$) - (list (normalize "figure"))) - -; Fonts -(define %visual-acuity% "normal") -(define %title-font-family% "Helvetica") -(define %body-font-family% "Palatino") -(define %mono-font-family% "Courier New") -(define %hsize-bump-factor% 1.1) - -; Margins - -(define %left-right-margin% 6pi) -(define %header-margin% 1pi) -(define %footer-margin% 4pi) -(define %body-start-indent% 0pi) -(define %left-margin% 4pi) -(define %right-margin% 4pi) - -(define %top-margin% -(if (equal? %visual-acuity% "large-type") - 3pi - 3pi)) - -(define %bottom-margin% - (if (equal? %visual-acuity% "large-type") - 2pi - 2pi)) - -(define %text-width% (- %page-width% (+ %left-margin% %right-margin%))) -(define %body-width% (- %text-width% %body-start-indent%)) -(define %para-sep% (/ %bf-size% 2.0)) -(define %block-sep% (* %para-sep% 2.0)) -(define %block-start-indent% 0pt) - -(define %admon-graphics% - #f) - -;;Where are the admon graphics? -(define %admon-graphics-path% - "../images/") - -; Quadding -(define %default-quadding% 'justify) -(define %component-title-quadding% 'start) -(define %section-title-quadding% 'start) -(define %section-subtitle-quadding% 'start) -(define %article-title-quadding% 'center) -(define %article-subtitle-quadding% 'center) -(define %division-subtitle-quadding% 'start) -(define %component-subtitle-quadding% 'start) - -; Functions -(define (OLSTEP) - (case - (modulo (length (hierarchical-number-recursive "ORDEREDLIST")) 4) - ((1) 1.2em) - ((2) 1.2em) - ((3) 1.6em) - ((0) 1.4em))) - -(define (ILSTEP) 1.0em) - -(define (PROCSTEP ilvl) - (if (> ilvl 1) 1.8em 1.4em)) - -(define (PROCWID ilvl) - (if (> ilvl 1) 1.8em 1.4em)) - -(define ($comptitle$) - (make paragraph - font-family-name: %title-font-family% - font-weight: 'bold - font-size: (HSIZE 2) - line-spacing: (* (HSIZE 2) %line-spacing-factor%) - space-before: (* (HSIZE 2) %head-before-factor%) - space-after: (* (HSIZE 2) %head-after-factor%) - start-indent: 0pt - first-line-start-indent: 0pt - quadding: 'start - keep-with-next?: #t - (process-children-trim))) - -; Ignore -(element TITLEABBREV (empty-sosofo)) -(element SUBTITLE (empty-sosofo)) -(element SETINFO (empty-sosofo)) -(element BOOKINFO (empty-sosofo)) -(element BIBLIOENTRY (empty-sosofo)) -(element BIBLIOMISC (empty-sosofo)) -(element BOOKBIBLIO (empty-sosofo)) -(element SERIESINFO (empty-sosofo)) -(element DOCINFO (empty-sosofo)) -(element ARTHEADER (empty-sosofo)) - -(define ($peril$) - (let* ((title (select-elements - (children (current-node)) (normalize "title"))) - (has-title (not (node-list-empty? title))) - (adm-title (if has-title - (make sequence - (with-mode title-sosofo-mode - (process-node-list (node-list-first title)))) - (literal - (gentext-element-name - (current-node))))) - (hs (HSIZE 2))) - (if %admon-graphics% - ($graphical-admonition$) - (make display-group - space-before: %block-sep% - space-after: %block-sep% - font-family-name: %admon-font-family% - font-size: (- %bf-size% 1pt) - font-weight: 'medium - font-posture: 'upright - line-spacing: (* (- %bf-size% 1pt) %line-spacing-factor%) - (make box - display?: #t - box-type: 'border - line-thickness: .5pt - start-indent: (+ (inherited-start-indent) (* 2 (ILSTEP)) 2pt) - end-indent: (inherited-end-indent) - (make paragraph - space-before: %para-sep% - space-after: %para-sep% - start-indent: 1em - end-indent: 1em - font-family-name: %title-font-family% - font-weight: 'bold - font-size: hs - line-spacing: (* hs %line-spacing-factor%) - quadding: 'center - keep-with-next?: #t - adm-title) - (process-children)))))) - -;; Norm's stylesheets are smart about working out what sort of -;; object to display. But this bites us. Since we know that the -;; first item is going to be displayable, always use that. -(define (find-displayable-object objlist notlist extlist) - (let loop ((nl objlist)) - (if (node-list-empty? nl) - (empty-node-list) - (let* ((objdata (node-list-filter-by-gi - (children (node-list-first nl)) - (list (normalize "videodata") - (normalize "audiodata") - (normalize "imagedata")))) - (filename (data-filename objdata)) - (extension (file-extension filename)) - (notation (attribute-string (normalize "format") objdata))) - (node-list-first nl))))) - -;; Including bitmaps in the PS and PDF output tends to scale them -;; horribly. The solution is to scale them down by 50%. -;; -;; You could do this with 'imagedata scale="50"' in the source, -;; but that will affect all the output formats that we use (because -;; there is only one 'imagedata' per image). -;; -;; Solution is to have the authors include the "FORMAT" attribute, -;; set to PNG or EPS as appropriate, but to omit the extension. -;; If we're using the tex-backend, and the FORMAT is PNG, and the -;; author hasn't already set a scale, then set scale to 0.5. -;; Otherwise, use the supplied scale, or 1, as appropriate. -(define ($graphic$ fileref - #!optional (display #f) (format #f) - (scale #f) (align #f)) - (let* ((graphic-format (if format format "")) - (graphic-scale (if scale - (/ (string->number scale) 100) - (if (and tex-backend - (equal? graphic-format "PNG")) - 0.5 1))) - (graphic-align (cond ((equal? align (normalize "center")) - 'center) - ((equal? align (normalize "right")) - 'end) - (else - 'start)))) - (make external-graphic - entity-system-id: (graphic-file fileref) - notation-system-id: graphic-format - scale: graphic-scale - display?: display - display-alignment: graphic-align))) - - - - - - - -; HTML -(define %html-pubid% "-//W3C//DTD HTML 4.01//EN") -(define %html-ext% ".html") -(define %root-filename% "index") -(define %stylesheet% "netmrgdoc.css") -(define %use-id-as-filename% #t) - -; Book -(define %generate-book-toc% #t) -(define %generate-book-titlepage% #t) - -; Part -(define %generate-part-toc% #t) -(define %generate-part-toc-on-titlepage% #t) -(define %generate-part-titlepage% #t) -(define %generate-partintro-on-titlepage% #t) - -; Navigation -(define %header-navigation% #t) -(define %footer-navigation% #t) -(define %gentext-nav-use-tables% #t) -(define %gentext-nav-tblwidth% "100%") - -; Misc -(define %generate-legalnotice-link% #t) -(define %graphic-default-extension% "png") -(define %para-autolabel% #t) - -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - (if (string=? (gi nd) (normalize "appendix")) - 0 - 1))) - -(define ($generate-book-lot-list$) - (list (normalize "equation"))) - -(define %body-attr% - (list - (list "BGCOLOR" "#FFFFFF") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#840084") - (list "ALINK" "#0000FF"))) - -; Styles -(element emphasis ($bold-seq$)) - - - - - - - -; HTML -(define %html-pubid% "-//W3C//DTD HTML 4.01//EN") -(define %html-ext% ".html") -(define %root-filename% "index") -(define %stylesheet% "manual.css") -(define %use-id-as-filename% #t) - -; Book -(define %generate-book-toc% #t) -(define %generate-book-titlepage% #t) - -; Part -(define %generate-part-toc% #f) -(define %generate-part-toc-on-titlepage% #f) -(define %generate-part-titlepage% #f) -(define %generate-partintro-on-titlepage% #f) - -; Navigation -(define %header-navigation% #f) -(define %footer-navigation% #f) -(define %gentext-nav-use-tables% #f) -(define %gentext-nav-tblwidth% "100%") - -; Misc -(define %generate-legalnotice-link% #t) -(define %graphic-default-extension% "png") -(define %para-autolabel% #t) - -(define (toc-depth nd) - (if (string=? (gi nd) (normalize "book")) - 3 - (if (string=? (gi nd) (normalize "appendix")) - 0 - 1))) - -(define ($generate-book-lot-list$) - (list (normalize "equation"))) - -(define %body-attr% - (list - (list "BGCOLOR" "#FFFFFF") - (list "TEXT" "#000000") - (list "LINK" "#0000FF") - (list "VLINK" "#840084") - (list "ALINK" "#0000FF"))) - -; Styles -(element emphasis ($bold-seq$)) - - - - - - - Binary files netmrg-0.19/share/doc/netmrg-logo-medium.png and netmrg-0.20/ChangeLog/share/doc/netmrg-logo-medium.png differ Binary files netmrg-0.19/share/doc/netmrg-logo-small.png and netmrg-0.20/ChangeLog/share/doc/netmrg-logo-small.png differ diff -Nurb netmrg-0.19/share/doc/netmrg.sgml netmrg-0.20/ChangeLog/share/doc/netmrg.sgml --- netmrg-0.19/share/doc/netmrg.sgml 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/netmrg.sgml 1970-01-01 05:30:00.000000000 +0530 @@ -1,561 +0,0 @@ - - - - The NetMRG Reference - - - Brady - Alleman - - - Douglas - E. - Warner - - - 2006 - - 2003-2006 - Brady Alleman and Douglas E. Warner - - - - This project is licensed under the terms of the MIT License. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - -All product names are property of their respective owners. Such names are used -for identification purposes only and are not indicative of endorsement by or of -any company, organization, product, or platform. - - - - - -Overview - - Introduction - Welcome to NetMRG! NetMRG is a database-driven network monitoring and graphing tool for use on Linux systems. It offers an intuitive web-based configuration, customized monitoring capabilities for unusual situations, a fast multi-threaded polling application, and brilliant graphs rendered by RRDTOOL. - This document aims to guide you swiftly through the installation and configuration of NetMRG, as well as act as a reference for those with existing installations. - - - Revision History - - - 0.19 - 2006.02.03 - -Major Feature Enhancements and Bug Fixes; -Major Web Interface redesign to give more room for graphs and ease overall use. -Security enhancements behind the scenes to ensure correct permissions checking. -Added a search interface that will search groups, devices, sub devies, and sub -device parameters. RRDtool 1.2 support (including graph smoothing); Depricated -use of netmrg_cron.sh in favor of using netmrg-gatherer; migrated bulk of docs -to wiki; numerous other bugfixes and enhancements. - - - - 0.18.2 - 2004.11.09 - -Minor Bug Fixes; -Fixed some escaping problems on the interface cache page, disabled the -'quickprint' Net-SNMP option for better compatibility, fixed the snmp-failure -test, fixed an SVO-user view issue, and added failover for duplicate ifNames when -adding interfaces. - - - - 0.18.1 - 2004.11.01 - -Minor Bug Fixes; -Fixed a small bug where the gatherer would not register negative values. - - - - 0.18 - 2004.10.25 - -Major Bug Fixes; -Fixed an issue preventing form submissions on some browsers, fixed PHP string -escaping problems, fixed inability to create inverted stacked graphs, and fixed -parameter substituion and documentation regarding notifications and responses. -Added better support on FreeBSDs (4.8-5.2) and x86-64 architectures -(Linux and FreeBSD), the ability to multiply summed values, MySQL timeouts, -simple value parsing (to get the numeric content out of quoted numbers, etc), -graphic icons for most actions, support for a default external auth user -(with regards to permissions), and cleaned up the gatherer build process output. - - - - 0.17 - 2004.09.13 - -Minor Feature Enhancements; -Added colorized gatherer output, checkbox support on multiple pages, the -ability to disable users, fixed a potential SQL-injection bug, updated -navigation on group pages, updated tutorials. - - - - 0.16 - 2004.06.10 - -Minor Bugfixes and Feature Enhancements; -fixed a user management bug and several bugs related to 'single view only' -users not being able to see graphs, added the ability to ignore SNMP uptime checks -for devices (permitting the monitoring of broken devices), added the ability -to do an SNMP walk of an OID (useful for the Windows SNMP agent), -enhanced group/device management, cleaned up autoconf (now supports FC2), -and added experimental syslog and daemon support in the gatherer. - - - - 0.15 - 2004.05.20 - -Minor Bugfixes and Feature Enhancements; fixes for various db errors (including the infamous one on -snmp_cache_view.php), better cross-platform compilation, select all/none/invert checkbox support, support for -choosing what graph to apply to an interface, better support for php < 4.2.0, and some security fixes for -single-view-only users. - - - - 0.14 - 2004.03.10 - -Minor Bugfixes and Feature Enhancements; escaping issues in template dereferencing, broken links on -various pages, security issues regarding manual SNMP recaching, broken duplication on non-cutting-edge MySQL, -more parameter substitution in SQL tests, better date parsing for advanced graph view, nav-bar and group navigation -enhancements, advanced view capability for monitor-only graphs. - - - - 0.13 - 2003.12.19 - -Minor Bugfixes and Feature Enhancements; slide show ordering, previous slide, resume slide show, -better formatting of 'sums', errors on view editing, fixes to permissions checking, and an -occassional segfault in the gatherer was fixed. - - - - 0.12 - 2003.12.15 - -Major Feature Enhancents and Bugfixes; added SNMPv2 support, fixed a bug that -would cause a device to be deleted from all groups, fixed session timeout -when using external auth, added checkbox support to interface/disk cache pages, slide show -enhancements, fixed permission issue where unauthorized users could view/edit test_* pages - - - - 0.10 - 2003.10.05 - -Major bug fix; fixes a db error when trying to view monitors, a bug that would -always set the width and height to zero when creating graphs, and makes conditions -with 'rate of change' work. Many documentation upgrades. - - - - 0.10pre2 - 2003.09.15 - -This release focuses on adding new features and sqaushing bugs. In addition, -there is now an 'updater.php' that is required to be run between versions. A -minor change needs to be made to everyone's 'netmrg.xml' to add an 'externalauth' -field inside the 'website' section. - - - - 0.10pre1 - 2003.07.28 - Initial publication - - - - - - -Installation - - Software Requirements - NetMRG Requires the following packages for compilation. - - PHP, Version >= 4.1 - MySQL, Version >= 3.23 - RRDTOOL, Version >= 1.0.28 - Libxml2, Version >= 2.30 - Libstdc++, Version >= 3.2Versions earlier than this may compile just fine, but may experience runtime issues. Specifically, we experienced software crashes on an SMP machine running version 2.96 that were resolved by upgrading to 3.2. - NET/UCD-SNMP, Version >= 4.2.2 - - - - Satisfying Requirements - Specific instructions to satisfy dependencies for certain platforms are presented below. They should be used more as suggestions, not necessarily step-by-step instructions. You may need to do more than what is listed, or much less, depending on the options you selected when installing your operating system. - - - Red Hat Linux - - In order to satisfy the libstdc++ requirement, Redhat 8.0 or above is required. NetMRG may not be stable on older versions of libstdc++. - - Install the following RPMs from your Red Hat installation media: - - httpd - php - php-mysql - mysql - mysql-server - mysql-devel - libxml2 - libxml2-devel - net-snmp - net-snmp-devel - net-snmp-utils - - - - Installing RRDTOOL - - Download an RRDTOOL RPM from http://www.freshrpms.net/ - OR Download the RRDTOOL source from http://www.rrdtool.org/ and compile it. - - - - Installing precompiled NetMRG RPM - Download the latest NetMRG RPM and install it as follows: - $ rpm -Uvh netmrg-0.10.rpm - You will still have to perform the following tasks listed in the Install Instructions: - - Setup the Database - Configure Apache - Configure the Installation - Setup Crontab - - - - - - FreeBSD (4.8) - - - Install the following ports: - - www/apache13 - rrdtool - net-snmp - libxml2 - mod_php4 (specify MySQL support) - lang/gcc32 - - - - Run configure, specifying gcc32: - ./configure 'LDFLAGS=-L/usr/local/gcc3/lib' 'CPPFLAGS=-I/usr/local/gcc3/include' 'CXX=g++32' - - - - - - - Installation Procedure - - - Untar to some directory like /tmp/ (it will untar into a 'netmrg' directory) -cd /tmp -wget http://www.netmrg.net/download/release/netmrg.tar.gz -tar xzvf netmrg.tar.gz - - - -Now we need to compile and install the source. cd into the directory -made by your tar command and type the following: - -./configure -make -make install - If configure fails to locate the needed libraries they can be manually specified. Run ./configure --help for details on the necessary options. - - - Setup the database - -Now we need to setup the database. Please change at least the password -(netmrgpass below). - -mysqladmin create netmrg -mysql -u root -p netmrg < share/netmrg.mysql -mysql -u root -p -> grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpass'; - - - -You need to modify your apache config in order to make your NetMRG installation -live (commonly in /etc/httpd/conf/httpd.conf). - - -The first is to alias /netmrg to the installed web directory (commonly -/usr/local/var/www/netmrg/webfiles). - -Alias /netmrg "/usr/local/var/www/netmrg/webfiles" - -The easier way (if you're running Apache >= 1.3) is to just Include the conf -file we've created anywhere in your file (near the bottom is fine). - -Include /usr/local/etc/netmrg.conf - -You will need to restart your Apache after making config changes. Telling it -to reload its config should be good enough - -killall -HUP httpd - - - Configure the Installation - -All of NetMRG's common configuration options are controlled by an XML file, -normally located at /usr/local/etc/netmrg.xml. You should -edit this file to make any necessary changes before continuing with installation. - - -For most installations, you will at least need to edit netmrg.xml -to reflect your database username and password. - - - - Setup Permissions - -NetMRG does not need superuser permissions to run, therefore we will setup a user for it. - -# useradd netmrg -# chown netmrg:netmrg /usr/local/var/log/netmrg -# chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd - - - Setup crontab - -You can setup the crontab entries in two places: either edit /etc/crontab, -or run crontab -e as the netmrg user. For 'crontab -e', use an -entry similar to this: - -*/5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - -To edit the master crontab, edit /etc/crontab and add a line -similar to this: - -*/5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - - - -Point your web browser at your install, and start graphing things! The default -login is admin and the default password is -nimda. Point your web browser at the host you built -this on (something similar to http://yourhost.com/netmrg/) -and please change your password! - - - - - - Upgrade Procedure - -After doing a 'make install' as described in the chapter on Installing NetMRG, -the next step is to run the web-based updater. This is accomplished by logging -into NetMRG with administrator privileges, and following the prompts. NetMRG's -web interface will not operate normally and the gatherer will not run until -the web-based upgrade is performed. Non-administrator users will only receive a -message directing them to contact their NetMRG administrator. - - -If you need to perform an upgrade, the updater will prompt you to -apply all updates. Clicking this link will perform all -necessary updates for this release. - - -If for some reason an update fails, or you would like to re-apply an update for -any reason, you can goto the updater and goto View all available updates. -This will present you a list of the updates that are available and their status -(applied, not applied, or error). If you have problems updating from one version -to the next, you can force individual updates that fail so that they're considered -'applied'. Once all updates are applied for a particular version, the database -will be automatically updated to the latest version that has all updates applied. - - - - - -Reference - - Manual Pages - - - - netmrg-gatherer - 1 - - - netmrg-gatherer - Gathers data from devices. - - - - netmrg-gatherer - OPTIONS - - - - Description - - netmrg-gatherer performs tests on all enabled hosts in NetMRG. It will store results in RRD files using RRDTOOL(1) and perform actions in response to events. - - - Global Options - - - - Displays usage information and exits. - - - - Displays software version and exits. - - - - - Operating Options - - - num threads - Run no more than the specified number of threads simultaneously. - - - - Become a daemon. - - - mode - Mode of operation. This option controls the manner in which the gatherer operates. The modes currently supported are "once" (the default, best used manually or via cron) which runs all tests once then exits, and "wait" (best used when daemonized) which will run all tests, wait for the gatherer interval to expire, and then repeat. - - - To run netmrg-gatherer daemonized, the recommended set of options at this point is "-X -S -M wait" which will daemonize, repeat the gather cycle on each interval, and write output to syslog. - - - Logging, Debugging and Verbosity Options - - - - Syslog. Logs messages to syslog instead of stdout. - - - - Bland. Disables color output. By default, netmrg-gatherer will display color output when connected to a terminal, but will use bland output when its output is written to a file. This option should only be needed when the detection mechanism has failed, or the user doesn't want to see colors when running the program by hand. - - - - All. Displays all log messages. - - - - Most. Displays more messages than default. - - - - Quiet. Silences all output. - - - level mask - Only outputs messages that match the specified level mask. - - - component mask - Only outputs messages that match the specified component mask. - - - - Safe. Tries to keep sensitive information out of the displayed messages. - - - - - Configuration File Options - - - config file - Uses the specified XML configuration file. - - - config file - Parses the specified XML configuration file and exits. - - - - - Database Options - - - host - Uses the specified host name for connecting to the database. - - - database - Uses the specified database name. - - - user name - Uses the specified user name for connecting to the database. - - - password - Uses the specified password for connecting to the database. If no password is specified, the user is prompted to enter one. - - - - - Recaching Options - - - device id - Performs an interface recache on the specified device. - - - device id - Performs a disk recache on the specified device. - - - Recaching options are intended for use by the web interface. These options should not be generally used by end users. - - - - - - - - Contact Information - We have great aspirations for what NetMRG could become, but as with all open-source software, such aspriations can only be achieved with the active participation of the open-source community. Please do your part and support software that you use by helping to answer support questions on forums and report bugs to developers. Thanks! - - Main Website - http://www.netmrg.net/ - Online Docs- http://wiki.netmrg.net/ - Support Forum - http://lists.netmrg.net/ - Bug Reporting and Tracking - http://bugs.netmrg.net/ - - - diff -Nurb netmrg-0.19/share/doc/rrdworld.xml netmrg-0.20/ChangeLog/share/doc/rrdworld.xml --- netmrg-0.19/share/doc/rrdworld.xml 2006-01-09 07:46:06.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/rrdworld.xml 1970-01-01 05:30:00.000000000 +0530 @@ -1,20 +0,0 @@ - - - NetMRG - Brady Alleman, Douglas E. Warner, Kevin Bonner - -A network monitoring, reporting, and graphing system. -Using MySQL, PHP, C++, pthreads, and RRDTOOL, it is capable of monitoring -thousands of arbitrary values at user-configured intervals (typically 5 minutes). - - http://www.netmrg.net - 2006 1 - GPL - - - - http://demo.netmrg.net - dev@netmrg.net - - diff -Nurb netmrg-0.19/share/doc/TODO netmrg-0.20/ChangeLog/share/doc/TODO --- netmrg-0.19/share/doc/TODO 2006-02-01 00:28:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/TODO 1970-01-01 05:30:00.000000000 +0530 @@ -1,105 +0,0 @@ -== Requirements for 1.0 == -bug#38 - inline docs -bug#55 - Solaris support -bug#56 - MRTG conf importer - -== global == -documentation - Usage information (description of every page) -page titles should reflect where you're at - - names of devices, etc -user preferences - themes -a device's type can affect the list of tests that can be performed on it -when looking at a device's graphs, you should be able to click next to it - and follow it to the next device (if applicable) - - -== silfreed == -make netmrg xhtml compliant -View Graph replacement (dew) - - title as text - - comments as text - - allow links to other items (next subdevice) - - - - custom link -Web Interface redesign (dew) - - big navigations along top - - "device tree" renamed - - collapsed view - * have nav at the top w/ items immediately around where you currently are - * graphs below nav w/ items of where you're currently at -PHP Library Restructure - - split libraries into more useful items - - write a 'loadlib' function to load libries instead of ugly 'include_once's everywhere - - -== balleman == - - ability to compile against librrd instead of using a pipe (should be able to compile for either) - - rrdd support? - - portability - - freebsd - - solaris - - -== far-away features == -customized 'view' page - - on the main view page, select boxes to pick which graphs you would like to see - (makes it easier to compare some graphs) - - ability to move graphs up/down despite their original ordering (session fun) -fast-fourier transforms for what data 'should look like' -themes/skins for UI and graphs - - I'd like to see a neon theme ;) - balleman -distributed netmrg - - have other netmrg installs that can report back to a master install that - maintains all the rrd files. - - how to delegate tasks: have the master keep a list of tasks for the slaves, - and have the slaves get them periodically? this will require the - installations to be named - - new idea (2004.09.01) - derivation of other ideas - * boss/worker setup - * [boss] daemon figures out what needs done and puts that into a [jobs] table - * [worker]s clock into the [timeclock] so the [boss] can give them [jobs] - * if the [boss] notices that a [worker] forgot to clock out, it clocks - them out itself - * [worker]s report their [job_result]s back - * have the [boss] keep a schedule in a MySQL Heap table. It can reschedule - items by just bumping them up in the queue - [worker]s can then just poll the mysql table for new tasks for it - If the website allows for certain devices to only be polled by certain - [worker]s, then the [boss] can just assign tasks to that [worker] -wizards - - /wizard dir - - index.php reads in other files to know name, description, etc - - used for generating/updating special/large devices (catalyst switches, maxtnts) - - -== FOR A RELEASE == -version bump in: - configure.ac (run bootstrap) - share/netmrg.mysql - share/netmrg.spec - share/doc/VERSION - www/lib/static.php - www/webfiles/updater.php - bugs.netmrg.net -generate new template database -update docs w/ release notes -generate new docs - makedoctree : makedoctree netmrg-0_18_2 -test tutorial -test upgrade from previous version -branch SVN (ex: netmrg-0_10) -build tarball - - upload to devel, maybe release -for non-devel releases, build RPM from tarball -update docs on www.netmrg.net -update demo.netmrg.net -announce on www.netmrg.net -announce on lists.netmrg.net -announce on freshmeat.net -notify other package maintainers - -== branching svn == -svn copy trunk branches/netmrg-0_18_2 - diff -Nurb netmrg-0.19/share/doc/txt/INSTALL netmrg-0.20/ChangeLog/share/doc/txt/INSTALL --- netmrg-0.19/share/doc/txt/INSTALL 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/txt/INSTALL 1970-01-01 05:30:00.000000000 +0530 @@ -1,94 +0,0 @@ - - Chapter 5. Installation Procedure - - 1. Untar to some directory like /tmp/ (it will untar into a 'netmrg' - directory) - - cd /tmp - wget http://www.netmrg.net/download/release/netmrg.tar.gz - tar xzvf netmrg.tar.gz - - 2. Now we need to compile and install the source. cd into the directory - made by your tar command and type the following: - - ./configure - make - make install - - Note: If configure fails to locate the needed libraries they can be - manually specified. Run ./configure --help for details on the - necessary options. - - 3. Setup the database - - Now we need to setup the database. Please change at least the password - (netmrgpass below). - - mysqladmin create netmrg - mysql -u root -p netmrg < share/netmrg.mysql - mysql -u root -p - > grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpass'; - - 4. You need to modify your apache config in order to make your NetMRG - installation live (commonly in /etc/httpd/conf/httpd.conf). - - The first is to alias /netmrg to the installed web directory (commonly - /usr/local/var/www/netmrg/webfiles). - - Alias /netmrg "/usr/local/var/www/netmrg/webfiles" - - The easier way (if you're running Apache >= 1.3) is to just Include - the conf file we've created anywhere in your file (near the bottom is - fine). - - Include /usr/local/etc/netmrg.conf - - You will need to restart your Apache after making config changes. - Telling it to reload its config should be good enough - - killall -HUP httpd - - 5. Configure the Installation - - All of NetMRG's common configuration options are controlled by an XML - file, normally located at /usr/local/etc/netmrg.xml. You should edit - this file to make any necessary changes before continuing with - installation. - - For most installations, you will at least need to edit netmrg.xml to - reflect your database username and password. - - 6. Setup Permissions - - NetMRG does not need superuser permissions to run, therefore we will - setup a user for it. - - # useradd netmrg - # chown netmrg:netmrg /usr/local/var/log/netmrg - # chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd - - 7. Setup crontab - - You can setup the crontab entries in two places: either edit - /etc/crontab, or run crontab -e as the netmrg user. For 'crontab -e', - use an entry similar to this: - - */5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - - To edit the master crontab, edit /etc/crontab and add a line similar - to this: - - */5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then /usr/local/bin/netmrg-gatherer; fi" - - 8. Point your web browser at your install, and start graphing things! The - default login is admin and the default password is nimda. Point your - web browser at the host you built this on (something similar to - http://yourhost.com/netmrg/) and please change your password! - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/satisfyreq.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/upgrade.html diff -Nurb netmrg-0.19/share/doc/txt/netmrg.txt netmrg-0.20/ChangeLog/share/doc/txt/netmrg.txt --- netmrg-0.19/share/doc/txt/netmrg.txt 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/txt/netmrg.txt 1970-01-01 05:30:00.000000000 +0530 @@ -1,504 +0,0 @@ - -The NetMRG Reference - -Brady Alleman - -Douglas E. Warner - - Copyright © 2003-2006 Brady Alleman and Douglas E. Warner - - This project is licensed under the terms of the MIT License. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - All product names are property of their respective owners. Such - names are used for identification purposes only and are not - indicative of endorsement by or of any company, organization, - product, or platform. - _________________________________________________________ - - Table of Contents - I. Overview - - 1. Introduction - 2. Revision History - - II. Installation - - 3. Software Requirements - 4. Satisfying Requirements - 5. Installation Procedure - 6. Upgrade Procedure - - III. Reference - - I. Manual Pages - - netmrg-gatherer -- Gathers data from devices. - - 7. Contact Information - -I. Overview - - Table of Contents - 1. Introduction - 2. Revision History - _________________________________________________________ - -Chapter 1. Introduction - - Welcome to NetMRG! NetMRG is a database-driven network monitoring - and graphing tool for use on Linux systems. It offers an intuitive - web-based configuration, customized monitoring capabilities for - unusual situations, a fast multi-threaded polling application, and - brilliant graphs rendered by RRDTOOL. - - This document aims to guide you swiftly through the installation and - configuration of NetMRG, as well as act as a reference for those - with existing installations. - _________________________________________________________ - -Chapter 2. Revision History - - * 0.19 - 2006.02.03 - Major Feature Enhancements and Bug Fixes; Major Web Interface - redesign to give more room for graphs and ease overall use. - Security enhancements behind the scenes to ensure correct - permissions checking. Added a search interface that will search - groups, devices, sub devies, and sub device parameters. RRDtool - 1.2 support (including graph smoothing); Depricated use of - netmrg_cron.sh in favor of using netmrg-gatherer; migrated bulk - of docs to wiki; numerous other bugfixes and enhancements. - * 0.18.2 - 2004.11.09 - Minor Bug Fixes; Fixed some escaping problems on the interface - cache page, disabled the 'quickprint' Net-SNMP option for better - compatibility, fixed the snmp-failure test, fixed an SVO-user - view issue, and added failover for duplicate ifNames when adding - interfaces. - * 0.18.1 - 2004.11.01 - Minor Bug Fixes; Fixed a small bug where the gatherer would not - register negative values. - * 0.18 - 2004.10.25 - Major Bug Fixes; Fixed an issue preventing form submissions on - some browsers, fixed PHP string escaping problems, fixed - inability to create inverted stacked graphs, and fixed parameter - substituion and documentation regarding notifications and - responses. Added better support on FreeBSDs (4.8-5.2) and x86-64 - architectures (Linux and FreeBSD), the ability to multiply - summed values, MySQL timeouts, simple value parsing (to get the - numeric content out of quoted numbers, etc), graphic icons for - most actions, support for a default external auth user (with - regards to permissions), and cleaned up the gatherer build - process output. - * 0.17 - 2004.09.13 - Minor Feature Enhancements; Added colorized gatherer output, - checkbox support on multiple pages, the ability to disable - users, fixed a potential SQL-injection bug, updated navigation - on group pages, updated tutorials. - * 0.16 - 2004.06.10 - Minor Bugfixes and Feature Enhancements; fixed a user management - bug and several bugs related to 'single view only' users not - being able to see graphs, added the ability to ignore SNMP - uptime checks for devices (permitting the monitoring of broken - devices), added the ability to do an SNMP walk of an OID (useful - for the Windows SNMP agent), enhanced group/device management, - cleaned up autoconf (now supports FC2), and added experimental - syslog and daemon support in the gatherer. - * 0.15 - 2004.05.20 - Minor Bugfixes and Feature Enhancements; fixes for various db - errors (including the infamous one on snmp_cache_view.php), - better cross-platform compilation, select all/none/invert - checkbox support, support for choosing what graph to apply to an - interface, better support for php < 4.2.0, and some security - fixes for single-view-only users. - * 0.14 - 2004.03.10 - Minor Bugfixes and Feature Enhancements; escaping issues in - template dereferencing, broken links on various pages, security - issues regarding manual SNMP recaching, broken duplication on - non-cutting-edge MySQL, more parameter substitution in SQL - tests, better date parsing for advanced graph view, nav-bar and - group navigation enhancements, advanced view capability for - monitor-only graphs. - * 0.13 - 2003.12.19 - Minor Bugfixes and Feature Enhancements; slide show ordering, - previous slide, resume slide show, better formatting of 'sums', - errors on view editing, fixes to permissions checking, and an - occassional segfault in the gatherer was fixed. - * 0.12 - 2003.12.15 - Major Feature Enhancents and Bugfixes; added SNMPv2 support, - fixed a bug that would cause a device to be deleted from all - groups, fixed session timeout when using external auth, added - checkbox support to interface/disk cache pages, slide show - enhancements, fixed permission issue where unauthorized users - could view/edit test_* pages - * 0.10 - 2003.10.05 - Major bug fix; fixes a db error when trying to view monitors, a - bug that would always set the width and height to zero when - creating graphs, and makes conditions with 'rate of change' - work. Many documentation upgrades. - * 0.10pre2 - 2003.09.15 - This release focuses on adding new features and sqaushing bugs. - In addition, there is now an 'updater.php' that is required to - be run between versions. A minor change needs to be made to - everyone's 'netmrg.xml' to add an 'externalauth' field inside - the 'website' section. - * 0.10pre1 - 2003.07.28 - Initial publication - -II. Installation - - Table of Contents - 3. Software Requirements - 4. Satisfying Requirements - 5. Installation Procedure - 6. Upgrade Procedure - _________________________________________________________ - -Chapter 3. Software Requirements - - NetMRG Requires the following packages for compilation. - - * PHP, Version >= 4.1 - * MySQL, Version >= 3.23 - * RRDTOOL, Version >= 1.0.28 - * Libxml2, Version >= 2.30 - * Libstdc++, Version >= 3.2 - Versions earlier than this may compile just fine, but may - experience runtime issues. Specifically, we experienced software - crashes on an SMP machine running version 2.96 that were - resolved by upgrading to 3.2. - * NET/UCD-SNMP, Version >= 4.2.2 - _________________________________________________________ - -Chapter 4. Satisfying Requirements - - Specific instructions to satisfy dependencies for certain platforms - are presented below. They should be used more as suggestions, not - necessarily step-by-step instructions. You may need to do more than - what is listed, or much less, depending on the options you selected - when installing your operating system. - - * Red Hat Linux - + In order to satisfy the libstdc++ requirement, Redhat 8.0 - or above is required. NetMRG may not be stable on older - versions of libstdc++. - + Install the following RPMs from your Red Hat installation - media: - o httpd - o php - o php-mysql - o mysql - o mysql-server - o mysql-devel - o libxml2 - o libxml2-devel - o net-snmp - o net-snmp-devel - o net-snmp-utils - + Installing RRDTOOL - o Download an RRDTOOL RPM from http://www.freshrpms.net/ - o OR Download the RRDTOOL source from - http://www.rrdtool.org/ and compile it. - + Installing precompiled NetMRG RPM - Download the latest NetMRG RPM and install it as follows: -$ rpm -Uvh netmrg-0.10.rpm - You will still have to perform the following tasks listed - in the Install Instructions: - o Setup the Database - o Configure Apache - o Configure the Installation - o Setup Crontab - * FreeBSD (4.8) - + Install the following ports: - o www/apache13 - o rrdtool - o net-snmp - o libxml2 - o mod_php4 (specify MySQL support) - o lang/gcc32 - + Run configure, specifying gcc32: -./configure 'LDFLAGS=-L/usr/local/gcc3/lib' 'CPPFLAGS=-I/usr/local/gcc3 -/include' 'CXX=g++32' - _________________________________________________________ - -Chapter 5. Installation Procedure - - 1. Untar to some directory like /tmp/ (it will untar into a - 'netmrg' directory) -cd /tmp -wget http://www.netmrg.net/download/release/netmrg.tar.gz -tar xzvf netmrg.tar.gz - 2. Now we need to compile and install the source. cd into the - directory made by your tar command and type the following: -./configure -make -make install - - Note: If configure fails to locate the needed libraries they can - be manually specified. Run ./configure --help for details on the - necessary options. - 3. Setup the database - Now we need to setup the database. Please change at least the - password (netmrgpass below). -mysqladmin create netmrg -mysql -u root -p netmrg < share/netmrg.mysql -mysql -u root -p -> grant all on netmrg.* to netmrguser@localhost identified by 'netmrgpa -ss'; - 4. You need to modify your apache config in order to make your - NetMRG installation live (commonly in - /etc/httpd/conf/httpd.conf). - The first is to alias /netmrg to the installed web directory - (commonly /usr/local/var/www/netmrg/webfiles). -Alias /netmrg "/usr/local/var/www/netmrg/webfiles" - The easier way (if you're running Apache >= 1.3) is to just - Include the conf file we've created anywhere in your file (near - the bottom is fine). -Include /usr/local/etc/netmrg.conf - You will need to restart your Apache after making config - changes. Telling it to reload its config should be good enough -killall -HUP httpd - 5. Configure the Installation - All of NetMRG's common configuration options are controlled by - an XML file, normally located at /usr/local/etc/netmrg.xml. You - should edit this file to make any necessary changes before - continuing with installation. - For most installations, you will at least need to edit - netmrg.xml to reflect your database username and password. - 6. Setup Permissions - NetMRG does not need superuser permissions to run, therefore we - will setup a user for it. -# useradd netmrg -# chown netmrg:netmrg /usr/local/var/log/netmrg -# chown netmrg:netmrg /usr/local/var/lib/netmrg/rrd - 7. Setup crontab - You can setup the crontab entries in two places: either edit - /etc/crontab, or run crontab -e as the netmrg user. For 'crontab - -e', use an entry similar to this: -*/5 * * * * bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ]; then -/usr/local/bin/netmrg-gatherer; fi" - To edit the master crontab, edit /etc/crontab and add a line - similar to this: -*/5 * * * * netmrg bash -c "if [ -f /usr/local/var/lock/subsys/netmrg ] -; then /usr/local/bin/netmrg-gatherer; fi" - 8. Point your web browser at your install, and start graphing - things! The default login is admin and the default password is - nimda. Point your web browser at the host you built this on - (something similar to http://yourhost.com/netmrg/) and please - change your password! - _________________________________________________________ - -Chapter 6. Upgrade Procedure - - After doing a 'make install' as described in the chapter on - Installing NetMRG, the next step is to run the web-based updater. - This is accomplished by logging into NetMRG with administrator - privileges, and following the prompts. NetMRG's web interface will - not operate normally and the gatherer will not run until the - web-based upgrade is performed. Non-administrator users will only - receive a message directing them to contact their NetMRG - administrator. - - If you need to perform an upgrade, the updater will prompt you to - apply all updates. Clicking this link will perform all necessary - updates for this release. - - If for some reason an update fails, or you would like to re-apply an - update for any reason, you can goto the updater and goto View all - available updates. This will present you a list of the updates that - are available and their status (applied, not applied, or error). If - you have problems updating from one version to the next, you can - force individual updates that fail so that they're considered - 'applied'. Once all updates are applied for a particular version, - the database will be automatically updated to the latest version - that has all updates applied. - -III. Reference - - Table of Contents - I. Manual Pages - -I. Manual Pages - - Table of Contents - netmrg-gatherer -- Gathers data from devices. - -netmrg-gatherer - -Name - - netmrg-gatherer -- Gathers data from devices. - -Synopsis - - netmrg-gatherer [OPTIONS] - -Description - - netmrg-gatherer performs tests on all enabled hosts in NetMRG. It - will store results in RRD files using RRDTOOL(1) and perform actions - in response to events. - -Global Options - - -h - - Displays usage information and exits. - - -v - - Displays software version and exits. - -Operating Options - - -t num threads - - Run no more than the specified number of threads - simultaneously. - - -X - - Become a daemon. - - -M mode - - Mode of operation. This option controls the manner in which - the gatherer operates. The modes currently supported are - "once" (the default, best used manually or via cron) which - runs all tests once then exits, and "wait" (best used when - daemonized) which will run all tests, wait for the gatherer - interval to expire, and then repeat. - - Note: To run netmrg-gatherer daemonized, the recommended set of - options at this point is "-X -S -M wait" which will daemonize, - repeat the gather cycle on each interval, and write output to - syslog. - -Logging, Debugging and Verbosity Options - - -S - - Syslog. Logs messages to syslog instead of stdout. - - -b - - Bland. Disables color output. By default, netmrg-gatherer - will display color output when connected to a terminal, but - will use bland output when its output is written to a file. - This option should only be needed when the detection - mechanism has failed, or the user doesn't want to see colors - when running the program by hand. - - -a - - All. Displays all log messages. - - -m - - Most. Displays more messages than default. - - -q - - Quiet. Silences all output. - - -l level mask - - Only outputs messages that match the specified level mask. - - -c component mask - - Only outputs messages that match the specified component - mask. - - -s - - Safe. Tries to keep sensitive information out of the - displayed messages. - -Configuration File Options - - -C config file - - Uses the specified XML configuration file. - - -K config file - - Parses the specified XML configuration file and exits. - -Database Options - - -H host - - Uses the specified host name for connecting to the database. - - -D database - - Uses the specified database name. - - -u user name - - Uses the specified user name for connecting to the database. - - -p [password] - - Uses the specified password for connecting to the database. - If no password is specified, the user is prompted to enter - one. - -Recaching Options - - -i device id - - Performs an interface recache on the specified device. - - -d device id - - Performs a disk recache on the specified device. - - Note: Recaching options are intended for use by the web interface. - These options should not be generally used by end users. - _________________________________________________________ - -Chapter 7. Contact Information - - We have great aspirations for what NetMRG could become, but as with - all open-source software, such aspriations can only be achieved with - the active participation of the open-source community. Please do - your part and support software that you use by helping to answer - support questions on forums and report bugs to developers. Thanks! - - * Main Website - http://www.netmrg.net/ - * Online Docs- http://wiki.netmrg.net/ - * Support Forum - http://lists.netmrg.net/ - * Bug Reporting and Tracking - http://bugs.netmrg.net/ diff -Nurb netmrg-0.19/share/doc/txt/RELEASE-NOTES netmrg-0.20/ChangeLog/share/doc/txt/RELEASE-NOTES --- netmrg-0.19/share/doc/txt/RELEASE-NOTES 2006-02-04 06:36:25.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/txt/RELEASE-NOTES 1970-01-01 05:30:00.000000000 +0530 @@ -1,143 +0,0 @@ - - Chapter 2. Revision History - - * 0.19 - - 2006.02.03 - - Major Feature Enhancements and Bug Fixes; Major Web Interface redesign - to give more room for graphs and ease overall use. Security - enhancements behind the scenes to ensure correct permissions checking. - Added a search interface that will search groups, devices, sub devies, - and sub device parameters. RRDtool 1.2 support (including graph - smoothing); Depricated use of netmrg_cron.sh in favor of using - netmrg-gatherer; migrated bulk of docs to wiki; numerous other - bugfixes and enhancements. - - * 0.18.2 - - 2004.11.09 - - Minor Bug Fixes; Fixed some escaping problems on the interface cache - page, disabled the 'quickprint' Net-SNMP option for better - compatibility, fixed the snmp-failure test, fixed an SVO-user view - issue, and added failover for duplicate ifNames when adding - interfaces. - - * 0.18.1 - - 2004.11.01 - - Minor Bug Fixes; Fixed a small bug where the gatherer would not - register negative values. - - * 0.18 - - 2004.10.25 - - Major Bug Fixes; Fixed an issue preventing form submissions on some - browsers, fixed PHP string escaping problems, fixed inability to - create inverted stacked graphs, and fixed parameter substituion and - documentation regarding notifications and responses. Added better - support on FreeBSDs (4.8-5.2) and x86-64 architectures (Linux and - FreeBSD), the ability to multiply summed values, MySQL timeouts, - simple value parsing (to get the numeric content out of quoted - numbers, etc), graphic icons for most actions, support for a default - external auth user (with regards to permissions), and cleaned up the - gatherer build process output. - - * 0.17 - - 2004.09.13 - - Minor Feature Enhancements; Added colorized gatherer output, checkbox - support on multiple pages, the ability to disable users, fixed a - potential SQL-injection bug, updated navigation on group pages, - updated tutorials. - - * 0.16 - - 2004.06.10 - - Minor Bugfixes and Feature Enhancements; fixed a user management bug - and several bugs related to 'single view only' users not being able to - see graphs, added the ability to ignore SNMP uptime checks for devices - (permitting the monitoring of broken devices), added the ability to do - an SNMP walk of an OID (useful for the Windows SNMP agent), enhanced - group/device management, cleaned up autoconf (now supports FC2), and - added experimental syslog and daemon support in the gatherer. - - * 0.15 - - 2004.05.20 - - Minor Bugfixes and Feature Enhancements; fixes for various db errors - (including the infamous one on snmp_cache_view.php), better - cross-platform compilation, select all/none/invert checkbox support, - support for choosing what graph to apply to an interface, better - support for php < 4.2.0, and some security fixes for single-view-only - users. - - * 0.14 - - 2004.03.10 - - Minor Bugfixes and Feature Enhancements; escaping issues in template - dereferencing, broken links on various pages, security issues - regarding manual SNMP recaching, broken duplication on - non-cutting-edge MySQL, more parameter substitution in SQL tests, - better date parsing for advanced graph view, nav-bar and group - navigation enhancements, advanced view capability for monitor-only - graphs. - - * 0.13 - - 2003.12.19 - - Minor Bugfixes and Feature Enhancements; slide show ordering, previous - slide, resume slide show, better formatting of 'sums', errors on view - editing, fixes to permissions checking, and an occassional segfault in - the gatherer was fixed. - - * 0.12 - - 2003.12.15 - - Major Feature Enhancents and Bugfixes; added SNMPv2 support, fixed a - bug that would cause a device to be deleted from all groups, fixed - session timeout when using external auth, added checkbox support to - interface/disk cache pages, slide show enhancements, fixed permission - issue where unauthorized users could view/edit test_* pages - - * 0.10 - - 2003.10.05 - - Major bug fix; fixes a db error when trying to view monitors, a bug - that would always set the width and height to zero when creating - graphs, and makes conditions with 'rate of change' work. Many - documentation upgrades. - - * 0.10pre2 - - 2003.09.15 - - This release focuses on adding new features and sqaushing bugs. In - addition, there is now an 'updater.php' that is required to be run - between versions. A minor change needs to be made to everyone's - 'netmrg.xml' to add an 'externalauth' field inside the 'website' - section. - - * 0.10pre1 - - 2003.07.28 - - Initial publication - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/overview.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/intro.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html diff -Nurb netmrg-0.19/share/doc/txt/UPGRADE netmrg-0.20/ChangeLog/share/doc/txt/UPGRADE --- netmrg-0.19/share/doc/txt/UPGRADE 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/txt/UPGRADE 1970-01-01 05:30:00.000000000 +0530 @@ -1,31 +0,0 @@ - - Chapter 6. Upgrade Procedure - - After doing a 'make install' as described in the chapter on Installing - NetMRG, the next step is to run the web-based updater. This is - accomplished by logging into NetMRG with administrator privileges, and - following the prompts. NetMRG's web interface will not operate normally - and the gatherer will not run until the web-based upgrade is performed. - Non-administrator users will only receive a message directing them to - contact their NetMRG administrator. - - If you need to perform an upgrade, the updater will prompt you to apply - all updates. Clicking this link will perform all necessary updates for - this release. - - If for some reason an update fails, or you would like to re-apply an - update for any reason, you can goto the updater and goto View all - available updates. This will present you a list of the updates that are - available and their status (applied, not applied, or error). If you have - problems updating from one version to the next, you can force individual - updates that fail so that they're considered 'applied'. Once all updates - are applied for a particular version, the database will be automatically - updated to the latest version that has all updates applied. - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/install.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/reference.html diff -Nurb netmrg-0.19/share/doc/VERSION netmrg-0.20/ChangeLog/share/doc/VERSION --- netmrg-0.19/share/doc/VERSION 2006-01-10 06:28:13.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/doc/VERSION 1970-01-01 05:30:00.000000000 +0530 @@ -1 +0,0 @@ -0.19 diff -Nurb netmrg-0.19/share/images/default/applytemplate.svg netmrg-0.20/ChangeLog/share/images/default/applytemplate.svg --- netmrg-0.19/share/images/default/applytemplate.svg 2004-10-08 21:03:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/applytemplate.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,52 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/arrow_limit.svg netmrg-0.20/ChangeLog/share/images/default/arrow_limit.svg --- netmrg-0.19/share/images/default/arrow_limit.svg 2005-11-04 07:14:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/arrow_limit.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,47 +0,0 @@ - - - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/arrow.svg netmrg-0.20/ChangeLog/share/images/default/arrow.svg --- netmrg-0.19/share/images/default/arrow.svg 2003-11-20 20:51:10.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/arrow.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,42 +0,0 @@ - - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/delete.svg netmrg-0.20/ChangeLog/share/images/default/delete.svg --- netmrg-0.19/share/images/default/delete.svg 2004-10-08 21:03:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/delete.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,26 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/disk.svg netmrg-0.20/ChangeLog/share/images/default/disk.svg --- netmrg-0.19/share/images/default/disk.svg 2003-03-25 09:13:45.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/disk.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,44 +0,0 @@ - - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/duplicate.svg netmrg-0.20/ChangeLog/share/images/default/duplicate.svg --- netmrg-0.19/share/images/default/duplicate.svg 2004-10-08 21:03:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/duplicate.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,43 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/edit.svg netmrg-0.20/ChangeLog/share/images/default/edit.svg --- netmrg-0.19/share/images/default/edit.svg 2004-05-27 07:09:34.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/edit.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,81 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/imagespec.php netmrg-0.20/ChangeLog/share/images/default/imagespec.php --- netmrg-0.19/share/images/default/imagespec.php 2005-11-04 07:14:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/imagespec.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,51 +0,0 @@ - "applytemplate.png", - "edit" => "edit.png", - "logo" => "netmrg-logo-small.png", - "delete" => "delete.png", - "disk" => "disk.png", - "duplicate" => "duplicate.png", - "arrow-up" => "arrow-up.png", - "arrow-right" => "arrow-right.png", - "arrow-down" => "arrow-down.png", - "arrow-left" => "arrow-left.png", - "arrow-up-disabled" => "arrow-up-disabled.png", - "arrow-right-disabled" => "arrow-right-disabled.png", - "arrow-down-disabled" => "arrow-down-disabled.png", - "arrow-left-disabled" => "arrow-left-disabled.png", - "arrow_limit-up" => "arrow_limit-up.png", - "arrow_limit-right" => "arrow_limit-right.png", - "arrow_limit-down" => "arrow_limit-down.png", - "arrow_limit-left" => "arrow_limit-left.png", - "arrow_limit-up-disabled" => "arrow_limit-up-disabled.png", - "arrow_limit-right-disabled" => "arrow_limit-right-disabled.png", - "arrow_limit-down-disabled" => "arrow_limit-down-disabled.png", - "arrow_limit-left-disabled" => "arrow_limit-left-disabled.png", - "parameters" => "parameters.png", - "view" => "view.png", - "recachedisk" => "recachedisk.png", - "viewdisk" => "viewdisk.png", - "recacheinterface" => "recacheinterface.png", - "viewinterface" => "viewinterface.png", - "viewgraph-on" => "viewgraph-on.png", - "viewgraph-off" => "viewgraph-off.png", - "slideshow" => "slideshow.png", - "status-good-trig" => "status-good-trig.png", - "status-good-untrig" => "status-good-untrig.png", - "status-warning-trig" => "status-warning-trig.png", - "status-warning-untrig" => "status-warning-untrig.png", - "status-critical-trig" => "status-critical-trig.png", - "status-critical-untrig" => "status-critical-untrig.png", - "status-unknown-trig" => "status-unknown-trig.png", - "status-unknown-untrig" => "status-unknown-untrig.png" -); -?> diff -Nurb netmrg-0.19/share/images/default/Makefile netmrg-0.20/ChangeLog/share/images/default/Makefile --- netmrg-0.19/share/images/default/Makefile 2005-11-04 07:14:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/Makefile 1970-01-01 05:30:00.000000000 +0530 @@ -1,71 +0,0 @@ -.SUFFIXES: .svg - -BATIK = batik-rasterizer -FILES = status-unknown-trig.svg status-unknown-untrig.svg status-good-trig.svg status-good-untrig.svg status-warning-trig.svg status-warning-untrig.svg status-critical-trig.svg status-critical-untrig.svg viewgraph-on.svg viewgraph-off.svg - -all : $(FILES) - @$(BATIK) -h 15 applytemplate.svg - @$(BATIK) -h 15 edit.svg - @$(BATIK) -h 15 delete.svg - @$(BATIK) -h 15 disk.svg - @$(BATIK) -h 15 duplicate.svg - @$(BATIK) -h 15 recachedisk.svg - @$(BATIK) -h 15 recacheinterface.svg - @$(BATIK) -h 15 parameters.svg - @$(BATIK) -h 15 slideshow.svg - @$(BATIK) -h 15 view.svg - @$(BATIK) -h 15 viewdisk.svg - @$(BATIK) -h 15 viewinterface.svg - @$(BATIK) -h 15 viewgraph-on.svg - @$(BATIK) -h 15 viewgraph-off.svg - @$(BATIK) -h 35 -d netmrg-logo-small.png netmrg-logo.svg - @$(BATIK) -h 100 -d netmrg-logo-medium.png netmrg-logo.svg - @$(BATIK) -h 250 -d netmrg-logo-large.png netmrg-logo.svg - -arrow: - @cp arrow.svg arrow-up.svg - @$(BATIK) -h 15 arrow-up.svg - @convert -rotate 90 arrow-up.png arrow-right.png - @convert -rotate 180 arrow-up.png arrow-down.png - @convert -rotate 270 arrow-up.png arrow-left.png - @cat arrow-up.svg | perl -ne 's/#000000/#808080/; s/#333333/#A0A0A0/; print;' > arrow-up-disabled.svg - @$(BATIK) -h 15 arrow-up-disabled.svg - @convert -rotate 90 arrow-up-disabled.png arrow-right-disabled.png - @convert -rotate 180 arrow-up-disabled.png arrow-down-disabled.png - @convert -rotate 270 arrow-up-disabled.png arrow-left-disabled.png - -arrow_limit: - @cp arrow_limit.svg arrow_limit-up.svg - @$(BATIK) -h 15 arrow_limit-up.svg - @convert -rotate 90 arrow_limit-up.png arrow_limit-right.png - @convert -rotate 180 arrow_limit-up.png arrow_limit-down.png - @convert -rotate 270 arrow_limit-up.png arrow_limit-left.png - @cat arrow_limit-up.svg | perl -ne 's/#000000/#808080/; s/#333333/#A0A0A0/; print;' > arrow_limit-up-disabled.svg - @$(BATIK) -h 15 arrow_limit-up-disabled.svg - @convert -rotate 90 arrow_limit-up-disabled.png arrow_limit-right-disabled.png - @convert -rotate 180 arrow_limit-up-disabled.png arrow_limit-down-disabled.png - @convert -rotate 270 arrow_limit-up-disabled.png arrow_limit-left-disabled.png - -status: - @$(MAKE) -s createstatus C1="#ff0000" C2="#ff4c4c" NAME="status-critical-trig.svg" - @$(MAKE) -s createstatus C1="#ff0000" C2="#7f4c4c" NAME="status-critical-untrig.svg" - @$(MAKE) -s createstatus C1="#009000" C2="#009000" NAME="status-good-trig.svg" - @$(MAKE) -s createstatus C1="#009000" C2="#002000" NAME="status-good-untrig.svg" - @$(MAKE) -s createstatus C1="#0000bf" C2="#4c4cc0" NAME="status-unknown-trig.svg" - @$(MAKE) -s createstatus C1="#0000bf" C2="#4c4c7f" NAME="status-unknown-untrig.svg" - @$(MAKE) -s createstatus C1="#e6e600" C2="#e6e500" NAME="status-warning-trig.svg" - @$(MAKE) -s createstatus C1="#e6e600" C2="#999900" NAME="status-warning-untrig.svg" - -viewgraph: - @cp -f viewgraph.svg viewgraph-on.svg - @cat viewgraph.svg | perl -ne 's/stroke:#e67f00;/stroke:#606060;/; s/fill:#e67f00;/fill:#606060;/; print;' > viewgraph-off.svg - -createstatus: - @cat status.svg | perl -ne 's/#7f7f7f/$(C1)/; s/#4c4c4c/$(C2)/; print;' > $(NAME) - -%.svg: status viewgraph arrow - @$(BATIK) -h 15 $@ - -clean: - rm -f $(FILES) - diff -Nurb netmrg-0.19/share/images/default/netmrg-logo.svg netmrg-0.20/ChangeLog/share/images/default/netmrg-logo.svg --- netmrg-0.19/share/images/default/netmrg-logo.svg 2003-04-24 09:25:08.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/netmrg-logo.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,50 +0,0 @@ - - - - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/parameters.svg netmrg-0.20/ChangeLog/share/images/default/parameters.svg --- netmrg-0.19/share/images/default/parameters.svg 2004-10-14 08:01:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/parameters.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,28 +0,0 @@ - - - -%_ diff -Nurb netmrg-0.19/share/images/default/recachedisk.svg netmrg-0.20/ChangeLog/share/images/default/recachedisk.svg --- netmrg-0.19/share/images/default/recachedisk.svg 2004-10-14 08:01:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/recachedisk.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,82 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/recacheinterface.svg netmrg-0.20/ChangeLog/share/images/default/recacheinterface.svg --- netmrg-0.19/share/images/default/recacheinterface.svg 2004-10-14 08:01:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/recacheinterface.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,150 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/slideshow.svg netmrg-0.20/ChangeLog/share/images/default/slideshow.svg --- netmrg-0.19/share/images/default/slideshow.svg 2003-12-15 06:34:21.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/slideshow.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/status.svg netmrg-0.20/ChangeLog/share/images/default/status.svg --- netmrg-0.19/share/images/default/status.svg 2003-04-24 07:00:56.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/status.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,34 +0,0 @@ - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/viewdisk.svg netmrg-0.20/ChangeLog/share/images/default/viewdisk.svg --- netmrg-0.19/share/images/default/viewdisk.svg 2004-10-14 08:01:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/viewdisk.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,81 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/viewgraph.svg netmrg-0.20/ChangeLog/share/images/default/viewgraph.svg --- netmrg-0.19/share/images/default/viewgraph.svg 2003-05-27 09:48:37.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/viewgraph.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ - - - - - - - - - diff -Nurb netmrg-0.19/share/images/default/viewinterface.svg netmrg-0.20/ChangeLog/share/images/default/viewinterface.svg --- netmrg-0.19/share/images/default/viewinterface.svg 2004-10-14 08:01:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/viewinterface.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,149 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/images/default/view.svg netmrg-0.20/ChangeLog/share/images/default/view.svg --- netmrg-0.19/share/images/default/view.svg 2004-10-08 21:03:33.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/images/default/view.svg 1970-01-01 05:30:00.000000000 +0530 @@ -1,65 +0,0 @@ - - - - diff -Nurb netmrg-0.19/share/netmrg.mysql netmrg-0.20/ChangeLog/share/netmrg.mysql --- netmrg-0.19/share/netmrg.mysql 2006-01-10 06:48:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/netmrg.mysql 1970-01-01 05:30:00.000000000 +0530 @@ -1,748 +0,0 @@ --- MySQL dump 10.9 --- --- Host: localhost Database: netmrg --- ------------------------------------------------------ --- Server version 4.1.16 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `conditions` --- - -DROP TABLE IF EXISTS `conditions`; -CREATE TABLE `conditions` ( - `id` int(11) NOT NULL auto_increment, - `event_id` int(11) NOT NULL default '0', - `value` bigint(20) NOT NULL default '0', - `condition` smallint(6) NOT NULL default '0', - `logic_condition` smallint(6) NOT NULL default '0', - `value_type` smallint(6) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `event_id` (`event_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `conditions` --- - - -/*!40000 ALTER TABLE `conditions` DISABLE KEYS */; -LOCK TABLES `conditions` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `conditions` ENABLE KEYS */; - --- --- Table structure for table `data_types` --- - -DROP TABLE IF EXISTS `data_types`; -CREATE TABLE `data_types` ( - `id` tinyint(4) NOT NULL auto_increment, - `rrd_type` varchar(50) NOT NULL default '', - `name` varchar(50) NOT NULL default '', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `data_types` --- - - -/*!40000 ALTER TABLE `data_types` DISABLE KEYS */; -LOCK TABLES `data_types` WRITE; -INSERT INTO `data_types` VALUES (1,'GAUGE','Gauge'),(2,'COUNTER','Counter'),(3,'DERIVE','Derive (a counter without overflow protection)'),(4,'ABSOLUTE','Absolute (a counter reset when read)'),(-1,'','Not Graphed'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `data_types` ENABLE KEYS */; - --- --- Table structure for table `dev_parents` --- - -DROP TABLE IF EXISTS `dev_parents`; -CREATE TABLE `dev_parents` ( - `grp_id` int(11) NOT NULL default '0', - `dev_id` int(11) NOT NULL default '0', - KEY `grp_id` (`grp_id`,`dev_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `dev_parents` --- - - -/*!40000 ALTER TABLE `dev_parents` DISABLE KEYS */; -LOCK TABLES `dev_parents` WRITE; -INSERT INTO `dev_parents` VALUES (1,1); -UNLOCK TABLES; -/*!40000 ALTER TABLE `dev_parents` ENABLE KEYS */; - --- --- Table structure for table `dev_types` --- - -DROP TABLE IF EXISTS `dev_types`; -CREATE TABLE `dev_types` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - `comment` varchar(250) NOT NULL default '', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `dev_types` --- - - -/*!40000 ALTER TABLE `dev_types` DISABLE KEYS */; -LOCK TABLES `dev_types` WRITE; -INSERT INTO `dev_types` VALUES (8,'Linux Box',''); -UNLOCK TABLES; -/*!40000 ALTER TABLE `dev_types` ENABLE KEYS */; - --- --- Table structure for table `devices` --- - -DROP TABLE IF EXISTS `devices`; -CREATE TABLE `devices` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(50) NOT NULL default '', - `ip` varchar(50) NOT NULL default '', - `snmp_read_community` varchar(200) NOT NULL default '', - `dev_type` int(11) NOT NULL default '0', - `snmp_recache_method` smallint(6) NOT NULL default '0', - `disabled` tinyint(4) NOT NULL default '0', - `snmp_avoided` tinyint(4) NOT NULL default '0', - `snmp_uptime` bigint(20) default '0', - `snmp_ifnumber` int(11) NOT NULL default '0', - `snmp_version` tinyint(4) NOT NULL default '1', - `snmp_timeout` int(10) unsigned NOT NULL default '1000000', - `snmp_retries` tinyint(3) unsigned NOT NULL default '3', - `snmp_port` smallint(5) unsigned NOT NULL default '161', - `status` smallint(6) NOT NULL default '0', - `no_snmp_uptime_check` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `disabled` (`disabled`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `devices` --- - - -/*!40000 ALTER TABLE `devices` DISABLE KEYS */; -LOCK TABLES `devices` WRITE; -INSERT INTO `devices` VALUES (1,'Template Linux Box','127.0.0.1','',8,1,1,0,0,0,0,1000000,3,161,0,0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `devices` ENABLE KEYS */; - --- --- Table structure for table `event_log` --- - -DROP TABLE IF EXISTS `event_log`; -CREATE TABLE `event_log` ( - `id` bigint(20) NOT NULL auto_increment, - `event_id` int(11) NOT NULL default '0', - `date` bigint(20) NOT NULL default '0', - `time_since_last_change` bigint(20) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `event_id` (`event_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `event_log` --- - - -/*!40000 ALTER TABLE `event_log` DISABLE KEYS */; -LOCK TABLES `event_log` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `event_log` ENABLE KEYS */; - --- --- Table structure for table `events` --- - -DROP TABLE IF EXISTS `events`; -CREATE TABLE `events` ( - `id` int(11) NOT NULL auto_increment, - `mon_id` int(11) NOT NULL default '0', - `trigger_type` tinyint(4) NOT NULL default '2', - `last_status` int(11) NOT NULL default '0', - `situation` int(11) NOT NULL default '0', - `name` varchar(100) NOT NULL default '', - `last_triggered` bigint(20) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `monid_trigger` (`mon_id`,`trigger_type`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `events` --- - - -/*!40000 ALTER TABLE `events` DISABLE KEYS */; -LOCK TABLES `events` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `events` ENABLE KEYS */; - --- --- Table structure for table `graph_ds` --- - -DROP TABLE IF EXISTS `graph_ds`; -CREATE TABLE `graph_ds` ( - `id` int(11) NOT NULL auto_increment, - `mon_id` int(11) NOT NULL default '0', - `color` varchar(10) NOT NULL default '', - `type` tinyint(2) NOT NULL default '0', - `graph_id` int(11) NOT NULL default '0', - `label` varchar(100) NOT NULL default '', - `alignment` tinyint(2) NOT NULL default '1', - `stats` set('CURRENT','AVERAGE','MAXIMUM','SUMS','INTEGER','MULTSUM') NOT NULL default 'CURRENT,AVERAGE,MAXIMUM', - `position` int(11) NOT NULL default '0', - `multiplier` varchar(100) NOT NULL default '1', - `start_time` varchar(20) NOT NULL default '', - `end_time` varchar(20) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `graph_id` (`graph_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `graph_ds` --- - - -/*!40000 ALTER TABLE `graph_ds` DISABLE KEYS */; -LOCK TABLES `graph_ds` WRITE; -INSERT INTO `graph_ds` VALUES (1,2,'#FF6600',4,1,'System',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(2,1,'#3366FF',5,1,'User',1,'CURRENT,AVERAGE,MAXIMUM',2,'1','',''),(3,3,'#00CC66',5,1,'Nice',1,'CURRENT,AVERAGE,MAXIMUM',3,'1','',''),(4,-2,'#000000',1,1,'Total',1,'CURRENT,AVERAGE,MAXIMUM',4,'1','',''),(5,4,'#FF9900',4,2,'1 Minute',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(6,5,'#330066',2,2,'5 Minute',1,'CURRENT,AVERAGE,MAXIMUM',2,'1','',''),(7,6,'#990000',2,2,'15 Minute',1,'CURRENT,AVERAGE,MAXIMUM',3,'1','',''),(8,7,'#330066',4,3,'TCP Connections',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(9,8,'#330066',4,4,'Users',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(10,9,'#330066',4,5,'Processes',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(11,11,'#CC3300',4,6,'Swap',1,'CURRENT,AVERAGE,MAXIMUM',1,'1024','',''),(12,10,'#FF9933',5,6,'RAM',1,'CURRENT,AVERAGE,MAXIMUM',2,'1024','',''),(13,-2,'#000000',1,6,'Total',1,'CURRENT,AVERAGE,MAXIMUM',3,'1','',''),(14,12,'#00CC00',4,7,'Inbound',1,'CURRENT,AVERAGE,MAXIMUM',1,'1','',''),(15,13,'#0000CC',2,7,'Outbound',1,'CURRENT,AVERAGE,MAXIMUM',2,'1','',''),(16,16,'#333399',4,8,'Used',1,'CURRENT,AVERAGE,MAXIMUM',1,'1024','',''),(17,15,'#3399FF',5,8,'Available',1,'CURRENT,AVERAGE,MAXIMUM',2,'1024','',''),(18,-2,'#000000',1,8,'Total',1,'CURRENT,AVERAGE,MAXIMUM',3,'1','',''); -UNLOCK TABLES; -/*!40000 ALTER TABLE `graph_ds` ENABLE KEYS */; - --- --- Table structure for table `graphs` --- - -DROP TABLE IF EXISTS `graphs`; -CREATE TABLE `graphs` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(100) NOT NULL default '', - `title` varchar(100) NOT NULL default '', - `comment` varchar(255) NOT NULL default '', - `width` smallint(4) NOT NULL default '0', - `height` smallint(4) NOT NULL default '0', - `vert_label` varchar(100) NOT NULL default '', - `type` enum('custom','template') NOT NULL default 'custom', - `options` set('nolegend','logarithmic') NOT NULL default '', - `base` int(11) NOT NULL default '1000', - `max` int(11) default NULL, - `min` int(11) default NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `graphs` --- - - -/*!40000 ALTER TABLE `graphs` DISABLE KEYS */; -LOCK TABLES `graphs` WRITE; -INSERT INTO `graphs` VALUES (1,'Linux Box - CPU Utilization','%dev_name% - CPU Utilization','',575,100,'% Usage','template','',1000,NULL,NULL),(2,'Linux Box - Load Average','%dev_name% - Load Average','',575,100,'run queue size','template','',1000,NULL,NULL),(3,'Linux Box - TCP Connections','%dev_name% - TCP Connections','',575,100,'Connections','template','',1000,NULL,NULL),(4,'Linux Box - Logged In Users','%dev_name% - Logged In Users','',575,100,'Users','template','',1000,NULL,NULL),(5,'Linux Box - System Processes','%dev_name% - System Processes','',575,100,'Processes','template','',1000,NULL,NULL),(6,'Linux Box - Available Memory','%dev_name% - Available Memory','',575,100,'Bytes','template','',1024,NULL,NULL),(7,'Linux Box - LAN Traffic','%dev_name% - %ifDescr%','Interface: %ifDescr%%n IP: %ifIP%',575,100,'bytes / sec','template','',1000,NULL,NULL),(8,'Linux Box - Disk Utilization','%dev_name% - %dskPath%','',575,100,'Bytes','template','',1024,NULL,NULL); -UNLOCK TABLES; -/*!40000 ALTER TABLE `graphs` ENABLE KEYS */; - --- --- Table structure for table `groups` --- - -DROP TABLE IF EXISTS `groups`; -CREATE TABLE `groups` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(100) NOT NULL default '', - `comment` varchar(200) NOT NULL default '', - `parent_id` int(11) default NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `groups` --- - - -/*!40000 ALTER TABLE `groups` DISABLE KEYS */; -LOCK TABLES `groups` WRITE; -INSERT INTO `groups` VALUES (1,'Template Group','',0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `groups` ENABLE KEYS */; - --- --- Table structure for table `log` --- - -DROP TABLE IF EXISTS `log`; -CREATE TABLE `log` ( - `id` bigint(20) NOT NULL auto_increment, - `date` datetime NOT NULL default '0000-00-00 00:00:00', - `dev_id` int(11) default NULL, - `subdev_id` int(11) default NULL, - `mon_id` int(11) default NULL, - `level` int(11) NOT NULL default '0', - `component` int(11) NOT NULL default '0', - `message` varchar(200) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `date` (`date`), - KEY `dev_id` (`dev_id`), - KEY `subdev_id` (`subdev_id`), - KEY `mon_id` (`mon_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `log` --- - - -/*!40000 ALTER TABLE `log` DISABLE KEYS */; -LOCK TABLES `log` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `log` ENABLE KEYS */; - --- --- Table structure for table `monitors` --- - -DROP TABLE IF EXISTS `monitors`; -CREATE TABLE `monitors` ( - `id` int(11) NOT NULL auto_increment, - `sub_dev_id` int(11) NOT NULL default '0', - `data_type` tinyint(4) NOT NULL default '0', - `min_val` bigint(20) default NULL, - `max_val` bigint(20) default NULL, - `tuned` tinyint(4) NOT NULL default '0', - `test_type` tinyint(4) NOT NULL default '0', - `test_id` int(11) NOT NULL default '0', - `test_params` varchar(150) NOT NULL default '', - `last_val` bigint(20) default NULL, - `delta_val` bigint(20) default NULL, - `last_time` datetime default NULL, - `delta_time` bigint(20) default NULL, - `status` smallint(6) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `sub_dev_id` (`sub_dev_id`), - KEY `template_index` (`sub_dev_id`,`test_id`,`test_type`,`test_params`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `monitors` --- - - -/*!40000 ALTER TABLE `monitors` DISABLE KEYS */; -LOCK TABLES `monitors` WRITE; -INSERT INTO `monitors` VALUES (1,1,2,0,405,0,2,5,'',NULL,NULL,NULL,NULL,0),(2,1,2,0,405,0,2,7,'',NULL,NULL,NULL,NULL,0),(3,1,2,0,405,0,2,8,'',NULL,NULL,NULL,NULL,0),(4,1,1,NULL,NULL,0,2,9,'',NULL,NULL,NULL,NULL,0),(5,1,1,NULL,NULL,0,2,10,'',NULL,NULL,NULL,NULL,0),(6,1,1,NULL,NULL,0,2,11,'',NULL,NULL,NULL,NULL,0),(7,1,1,NULL,NULL,0,2,18,'',NULL,NULL,NULL,NULL,0),(8,1,1,NULL,NULL,0,2,3,'',NULL,NULL,NULL,NULL,0),(9,1,1,NULL,NULL,0,2,2,'',NULL,NULL,NULL,NULL,0),(10,1,1,NULL,NULL,0,2,13,'',NULL,NULL,NULL,NULL,0),(11,1,1,NULL,NULL,0,2,12,'',NULL,NULL,NULL,NULL,0),(12,2,2,0,10000000,0,2,39,'',NULL,NULL,NULL,NULL,0),(13,2,2,0,100000000,0,2,38,'',NULL,NULL,NULL,NULL,0),(14,2,2,0,100000000,0,2,40,'',NULL,NULL,NULL,NULL,0),(15,3,1,NULL,NULL,0,2,43,'',NULL,NULL,NULL,NULL,0),(16,3,1,NULL,NULL,0,2,44,'',NULL,NULL,NULL,NULL,0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `monitors` ENABLE KEYS */; - --- --- Table structure for table `notifications` --- - -DROP TABLE IF EXISTS `notifications`; -CREATE TABLE `notifications` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(100) NOT NULL default '', - `command` varchar(250) NOT NULL default '', - `disabled` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `notifications` --- - - -/*!40000 ALTER TABLE `notifications` DISABLE KEYS */; -LOCK TABLES `notifications` WRITE; -INSERT INTO `notifications` VALUES (1,'Broadcast message to linux users','wall \'%dev_name%: %event_name%\'',0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `notifications` ENABLE KEYS */; - --- --- Table structure for table `responses` --- - -DROP TABLE IF EXISTS `responses`; -CREATE TABLE `responses` ( - `id` int(11) NOT NULL auto_increment, - `event_id` int(11) NOT NULL default '0', - `notification_id` int(11) NOT NULL default '0', - `parameters` varchar(100) default NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `responses` --- - - -/*!40000 ALTER TABLE `responses` DISABLE KEYS */; -LOCK TABLES `responses` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `responses` ENABLE KEYS */; - --- --- Table structure for table `snmp_disk_cache` --- - -DROP TABLE IF EXISTS `snmp_disk_cache`; -CREATE TABLE `snmp_disk_cache` ( - `dev_id` int(11) NOT NULL default '0', - `disk_index` int(11) NOT NULL default '0', - `disk_path` varchar(255) default NULL, - `disk_device` varchar(255) default NULL, - KEY `dev_id` (`dev_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `snmp_disk_cache` --- - - -/*!40000 ALTER TABLE `snmp_disk_cache` DISABLE KEYS */; -LOCK TABLES `snmp_disk_cache` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `snmp_disk_cache` ENABLE KEYS */; - --- --- Table structure for table `snmp_interface_cache` --- - -DROP TABLE IF EXISTS `snmp_interface_cache`; -CREATE TABLE `snmp_interface_cache` ( - `dev_id` int(11) NOT NULL default '0', - `ifIndex` int(11) NOT NULL default '0', - `ifName` varchar(255) default NULL, - `ifDescr` varchar(255) default NULL, - `ifAlias` varchar(255) default NULL, - `ifIP` varchar(15) default NULL, - `ifMAC` varchar(30) default NULL, - `ifType` smallint(6) NOT NULL default '0', - `ifAdminStatus` smallint(6) NOT NULL default '0', - `ifOperStatus` smallint(6) NOT NULL default '0', - `ifSpeed` int(11) NOT NULL default '0', - KEY `ifIndex` (`dev_id`,`ifIndex`), - KEY `ifName` (`dev_id`,`ifName`), - KEY `ifDescr` (`dev_id`,`ifDescr`), - KEY `ifAlias` (`dev_id`,`ifAlias`), - KEY `ifIP` (`dev_id`,`ifIP`), - KEY `ifMAC` (`dev_id`,`ifMAC`), - KEY `dev_id` (`dev_id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `snmp_interface_cache` --- - - -/*!40000 ALTER TABLE `snmp_interface_cache` DISABLE KEYS */; -LOCK TABLES `snmp_interface_cache` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `snmp_interface_cache` ENABLE KEYS */; - --- --- Table structure for table `sub_dev_variables` --- - -DROP TABLE IF EXISTS `sub_dev_variables`; -CREATE TABLE `sub_dev_variables` ( - `sub_dev_id` int(11) NOT NULL default '0', - `name` varchar(255) NOT NULL default '', - `value` varchar(255) NOT NULL default '', - `type` enum('static','dynamic') NOT NULL default 'static', - KEY `id_type` (`sub_dev_id`,`type`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `sub_dev_variables` --- - - -/*!40000 ALTER TABLE `sub_dev_variables` DISABLE KEYS */; -LOCK TABLES `sub_dev_variables` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `sub_dev_variables` ENABLE KEYS */; - --- --- Table structure for table `sub_devices` --- - -DROP TABLE IF EXISTS `sub_devices`; -CREATE TABLE `sub_devices` ( - `id` int(11) NOT NULL auto_increment, - `dev_id` int(11) NOT NULL default '0', - `type` int(11) NOT NULL default '0', - `name` varchar(80) default NULL, - `status` smallint(6) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `id_2` (`id`,`dev_id`,`type`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `sub_devices` --- - - -/*!40000 ALTER TABLE `sub_devices` DISABLE KEYS */; -LOCK TABLES `sub_devices` WRITE; -INSERT INTO `sub_devices` VALUES (1,1,1,'System',0),(2,1,2,'Network Interface',0),(3,1,3,'Disk Drive',0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `sub_devices` ENABLE KEYS */; - --- --- Table structure for table `tests_internal` --- - -DROP TABLE IF EXISTS `tests_internal`; -CREATE TABLE `tests_internal` ( - `id` tinyint(4) NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - PRIMARY KEY (`id`), - UNIQUE KEY `id` (`id`), - KEY `id_2` (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `tests_internal` --- - - -/*!40000 ALTER TABLE `tests_internal` DISABLE KEYS */; -LOCK TABLES `tests_internal` WRITE; -INSERT INTO `tests_internal` VALUES (1,'Count Lines in File'),(2,'Lucent TNT \"Good\" Modems (available modems minus suspect modems)'),(3,'UCD CPU Load (user + system)'),(4,'Windows Disk Usage (percent)'),(5,'UCD Swap Usage (percent)'),(6,'Read Value from File'),(7,'SNMP Failure'),(8,'Windows CPU Load'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `tests_internal` ENABLE KEYS */; - --- --- Table structure for table `tests_script` --- - -DROP TABLE IF EXISTS `tests_script`; -CREATE TABLE `tests_script` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - `cmd` varchar(200) NOT NULL default '', - `data_type` int(11) NOT NULL default '0', - `dev_type` int(11) NOT NULL default '0', - `priority` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `tests_script` --- - - -/*!40000 ALTER TABLE `tests_script` DISABLE KEYS */; -LOCK TABLES `tests_script` WRITE; -INSERT INTO `tests_script` VALUES (1,'Custom','',2,0,0),(2,'Ping Latency','ping_time.pl %ip%',2,8,0),(3,'SNMP Diff','snmpdiff.php',2,8,0),(4,'Win2k SNMP CPU','win2kcpu.pl',2,8,0),(5,'Livingston Portmaster Active Modems','pmmodems.pl %snmp_read_community% %ip%',2,0,0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `tests_script` ENABLE KEYS */; - --- --- Table structure for table `tests_snmp` --- - -DROP TABLE IF EXISTS `tests_snmp`; -CREATE TABLE `tests_snmp` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - `oid` varchar(250) NOT NULL default '', - `dev_type` int(11) NOT NULL default '0', - `type` tinyint(4) NOT NULL default '0', - `subitem` int(11) NOT NULL default '0', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `tests_snmp` --- - - -/*!40000 ALTER TABLE `tests_snmp` DISABLE KEYS */; -LOCK TABLES `tests_snmp` WRITE; -INSERT INTO `tests_snmp` VALUES (1,'TNT - Modems Online','.1.3.6.1.4.1.529.10.6.0',8,0,0),(2,'Host - System Processes','.1.3.6.1.2.1.25.1.6.0',8,0,0),(3,'Host - Logged in Users','.1.3.6.1.2.1.25.1.5.0',8,0,0),(4,'Cisco - CPU Utilization','.1.3.6.1.4.1.9.2.1.58.0',8,0,0),(5,'UCD - CPU Percent User','enterprises.ucdavis.systemStats.ssCpuRawUser.0',8,0,0),(6,'UCD - CPU Percent Idle','enterprises.ucdavis.systemStats.ssCpuRawIdle.0',8,0,0),(7,'UCD - CPU Percent System','enterprises.ucdavis.systemStats.ssCpuRawSystem.0',8,0,0),(8,'UCD - CPU Percent Nice','enterprises.ucdavis.systemStats.ssCpuRawNice.0',8,0,0),(9,'UCD - Load Average - 1 min','laLoad.1',8,0,0),(10,'UCD - Load Average - 5 min','laLoad.2',2,0,0),(11,'UCD - Load Average - 15 min','laLoad.3',2,0,0),(12,'UCD - Available Swap','memAvailSwap.0',2,0,0),(13,'UCD - Available Physical RAM','memAvailReal.0',2,0,0),(19,'C5k - % Bandwidth','.1.3.6.1.4.1.9.5.1.1.8.0',2,0,0),(18,'Open TCP Connections','tcp.tcpCurrEstab.0',2,0,0),(21,'C7k Free Memory (Processor)','.1.3.6.1.4.1.9.9.48.1.1.1.6.1',2,0,0),(22,'C7k Free Memory (Fast)','.1.3.6.1.4.1.9.9.48.1.1.1.6.5',2,0,0),(23,'C7k Used Memory (Fast)','.1.3.6.1.4.1.9.9.48.1.1.1.5.5',2,0,0),(24,'UCD - Executable 1','enterprises.ucdavis.extTable.extEntry.extOutput.1',2,0,0),(25,'DNS - A Records','enterprises.ucdavis.extTable.extEntry.extOutput.1',2,0,0),(26,'DNS - PTR Records','enterprises.ucdavis.extTable.extEntry.extOutput.2',2,0,0),(27,'DNS - MX Records','enterprises.ucdavis.extTable.extEntry.extOutput.3',2,0,0),(28,'DNS - CNAME Records','enterprises.ucdavis.extTable.extEntry.extOutput.4',2,0,0),(29,'DNS - ANY Records','enterprises.ucdavis.extTable.extEntry.extOutput.5',2,0,0),(30,'Cisco - RSP - Inlet Temperature (C)','enterprises.9.9.13.1.3.1.3.1',5,0,0),(31,'Cisco - RSP - Hotpoint Temperature (C)','enterprises.9.9.13.1.3.1.3.2',5,0,0),(32,'Cisco - RSP - Exhaust Temperature (C)','enterprises.9.9.13.1.3.1.3.3',5,0,0),(33,'TNT - Dead Modems','.1.3.6.1.4.1.529.15.7.0',4,0,0),(34,'TNT - Disabled Modems','.1.3.6.1.4.1.529.15.5.0',4,0,0),(35,'TNT - Suspect Modems','.1.3.6.1.4.1.529.15.3.0',4,0,0),(36,'TNT - Available Modems','.1.3.6.1.4.1.529.15.1.0',4,0,0),(37,'TNT - Busy Modems','.1.3.6.1.4.1.529.15.9.0',4,0,0),(38,'Interfaces - Bytes Out','ifOutOctets.%ifIndex%',8,0,0),(39,'Interfaces - Bytes In','ifInOctets.%ifIndex%',8,0,0),(40,'Interfaces - Errors In','ifInErrors.%ifIndex%',8,0,0),(41,'TNT - Connected DS0s','.1.3.6.1.4.1.529.4.21.1.7.%ifIndex%',8,0,0),(42,'Disk - Size (kB)','dskTotal.%dskIndex%',8,0,0),(43,'Disk - Available (kB)','dskAvail.%dskIndex%',8,0,0),(44,'Disk - Used (kB)','dskUsed.%dskIndex%',8,0,0),(45,'Disk - Percent Used','dskPercent.%dskIndex%',8,0,0),(46,'Disk - Percent Node Usage','dskPercentNode.%dskIndex%',8,0,0); -UNLOCK TABLES; -/*!40000 ALTER TABLE `tests_snmp` ENABLE KEYS */; - --- --- Table structure for table `tests_sql` --- - -DROP TABLE IF EXISTS `tests_sql`; -CREATE TABLE `tests_sql` ( - `id` int(11) NOT NULL auto_increment, - `name` varchar(200) NOT NULL default '', - `sub_dev_type` int(11) NOT NULL default '0', - `host` varchar(50) NOT NULL default '', - `user` varchar(50) NOT NULL default '', - `password` varchar(50) NOT NULL default '', - `query` varchar(255) NOT NULL default '', - `column_num` tinyint(4) NOT NULL default '0', - `timeout` int(11) NOT NULL default '10', - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `tests_sql` --- - - -/*!40000 ALTER TABLE `tests_sql` DISABLE KEYS */; -LOCK TABLES `tests_sql` WRITE; -INSERT INTO `tests_sql` VALUES (1,'MySQL Questions',8,'localhost','root','sqlroot','show status like \"Questions\"',1,10),(3,'NetMRG - Active Script Monitors',8,'localhost','netmrgread','netmrgread','select count(*) from netmrg.monitors, netmrg.sub_devices, netmrg.devices where monitors.sub_dev_id=sub_devices.id and sub_devices.dev_id=devices.id and devices.disabled = 0 and monitors.test_type=1',0,10),(4,'NetMRG - Active SNMP Monitors',8,'localhost','netmrgread','netmrgread',' select count(*) from netmrg.monitors, netmrg.sub_devices, netmrg.devices where monitors.sub_dev_id=sub_devices.id and sub_devices.dev_id=devices.id and devices.disabled = 0 and monitors.test_type=2',0,10),(5,'NetMRG - Active SQL Monitors',8,'localhost','netmrgread','netmrgread','select count(*) from netmrg.monitors, netmrg.sub_devices, netmrg.devices where monitors.sub_dev_id=sub_devices.id and sub_devices.dev_id=devices.id and devices.disabled = 0 and monitors.test_type=3',0,10),(6,'NetMRG - Active Internal Monitors',8,'localhost','netmrgread','netmrgread','select count(*) from netmrg.monitors, netmrg.sub_devices, netmrg.devices where monitors.sub_dev_id=sub_devices.id and sub_devices.dev_id=devices.id and devices.disabled = 0 and monitors.test_type=4',0,10); -UNLOCK TABLES; -/*!40000 ALTER TABLE `tests_sql` ENABLE KEYS */; - --- --- Table structure for table `updates` --- - -DROP TABLE IF EXISTS `updates`; -CREATE TABLE `updates` ( - `update_version` varchar(16) NOT NULL default '', - `name` varchar(160) NOT NULL default '', - `version_applied_to` varchar(16) NOT NULL default '', - `dateapplied` datetime NOT NULL default '0000-00-00 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `updates` --- - - -/*!40000 ALTER TABLE `updates` DISABLE KEYS */; -LOCK TABLES `updates` WRITE; -INSERT INTO `updates` VALUES ('0.10pre2','Graph Options','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Options2','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Item Times','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Item Times2','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Title','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Item Muliplier','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','SNMP ifSpeed','pre-0.17','2004-10-25 20:59:06'),('0.10pre2','Graph Title Fill-in','pre-0.17','2004-10-25 20:59:06'),('0.12','SNMP Version Support','pre-0.17','2004-10-25 20:59:06'),('0.12','SNMP Timeout','pre-0.17','2004-10-25 20:59:06'),('0.12','User Prefs','pre-0.17','2004-10-25 20:59:06'),('0.12','User Prefs Slideshow Default','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP Recache Method','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP Recache Method Default','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP Recache Method Default2','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP Recache Method Default3','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP Recache Drop','pre-0.17','2004-10-25 20:59:06'),('0.14','SNMP ifNumber Drop','pre-0.17','2004-10-25 20:59:06'),('0.14','Log Table','pre-0.17','2004-10-25 20:59:06'),('0.14','User Index Drop','pre-0.17','2004-10-25 20:59:06'),('0.14','User Unique Index','pre-0.17','2004-10-25 20:59:06'),('0.16','Device SNMP Uptime Check Option','pre-0.17','2004-10-25 20:59:06'),('0.16','SNMP Test Type','pre-0.17','2004-10-25 20:59:06'),('0.16','Graph Min/Max','pre-0.17','2004-10-25 20:59:06'),('0.17','Internal Test Name Lengthen','pre-0.17','2004-10-25 20:59:06'),('0.17','Script Test Name Lengthen','pre-0.17','2004-10-25 20:59:06'),('0.17','SQL Test Name Lengthen','pre-0.17','2004-10-25 20:59:06'),('0.17','New Internal Test - Lucent TNT Good Modems','pre-0.17','2004-10-25 20:59:06'),('0.17','New Internal Test - UCD CPU Load','pre-0.17','2004-10-25 20:59:06'),('0.17','New Internal Test - Windows Disk Usage','pre-0.17','2004-10-25 20:59:06'),('0.17','New Internal Test - UCD Swap Usage','pre-0.17','2004-10-25 20:59:06'),('0.17','New Internal Test - Read Value from File','pre-0.17','2004-10-25 20:59:06'),('0.17','User Disabled Support','pre-0.17','2004-10-25 20:59:06'),('0.18','Graph Multiply Sum Support','0.17','2004-10-25 20:59:35'),('0.18','New Internal Test - SNMP Failure','0.17','2004-10-25 20:59:35'),('0.18','SQL Test Timeout','0.17','2004-10-25 20:59:35'),('0.19','Increase size of monitors.type_id','0.19','2006-01-09 20:09:39'),('0.19','Increase size of view.pos','0.19','2006-01-09 20:09:42'),('0.19','Livingston Portmaster Modems Script Test','0.19','2006-01-09 20:09:54'),('0.19','Graph Min NULL Fix','0.19','2006-01-09 20:09:56'),('0.19','Graph Max NULL Fix','0.19','2006-01-09 20:09:59'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `updates` ENABLE KEYS */; - --- --- Table structure for table `user` --- - -DROP TABLE IF EXISTS `user`; -CREATE TABLE `user` ( - `id` int(11) NOT NULL auto_increment, - `user` varchar(50) NOT NULL default '', - `pass` varchar(50) NOT NULL default '', - `permit` tinyint(4) NOT NULL default '0', - `fullname` varchar(200) default NULL, - `group_id` int(11) NOT NULL default '0', - `disabled` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`id`), - UNIQUE KEY `user` (`user`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `user` --- - - -/*!40000 ALTER TABLE `user` DISABLE KEYS */; -LOCK TABLES `user` WRITE; -INSERT INTO `user` VALUES (1,'admin','ee10c315eba2c75b403ea99136f5b48d',3,'Administrator',0,0),(2,'NETMRG_DEFAULT_MAP','d41d8cd98f00b204e9800998ecf8427e',0,'Administrator',0,1); -UNLOCK TABLES; -/*!40000 ALTER TABLE `user` ENABLE KEYS */; - --- --- Table structure for table `user_prefs` --- - -DROP TABLE IF EXISTS `user_prefs`; -CREATE TABLE `user_prefs` ( - `id` int(11) NOT NULL auto_increment, - `uid` int(11) NOT NULL default '0', - `module` varchar(64) NOT NULL default '', - `pref` varchar(64) NOT NULL default '', - `value` varchar(64) NOT NULL default '', - PRIMARY KEY (`id`), - KEY `uid` (`uid`), - KEY `uid_module_pref` (`uid`,`module`,`pref`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `user_prefs` --- - - -/*!40000 ALTER TABLE `user_prefs` DISABLE KEYS */; -LOCK TABLES `user_prefs` WRITE; -INSERT INTO `user_prefs` VALUES (1,1,'SlideShow','AutoScroll','1'),(2,2,'SlideShow','AutoScroll','1'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `user_prefs` ENABLE KEYS */; - --- --- Table structure for table `versioninfo` --- - -DROP TABLE IF EXISTS `versioninfo`; -CREATE TABLE `versioninfo` ( - `module` varchar(64) NOT NULL default '', - `version` varchar(16) NOT NULL default '' -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `versioninfo` --- - - -/*!40000 ALTER TABLE `versioninfo` DISABLE KEYS */; -LOCK TABLES `versioninfo` WRITE; -INSERT INTO `versioninfo` VALUES ('Main','0.19'); -UNLOCK TABLES; -/*!40000 ALTER TABLE `versioninfo` ENABLE KEYS */; - --- --- Table structure for table `view` --- - -DROP TABLE IF EXISTS `view`; -CREATE TABLE `view` ( - `id` int(11) NOT NULL auto_increment, - `object_id` int(11) NOT NULL default '0', - `object_type` enum('group','device','subdevice') NOT NULL default 'group', - `graph_id` int(11) NOT NULL default '0', - `type` enum('graph','template','separator') NOT NULL default 'separator', - `pos` int(11) NOT NULL default '0', - `separator_text` varchar(100) NOT NULL default '', - `subdev_id` int(11) NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `VIEW_INDEX` (`object_id`,`object_type`) -) ENGINE=MyISAM DEFAULT CHARSET=latin1; - --- --- Dumping data for table `view` --- - - -/*!40000 ALTER TABLE `view` DISABLE KEYS */; -LOCK TABLES `view` WRITE; -UNLOCK TABLES; -/*!40000 ALTER TABLE `view` ENABLE KEYS */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - diff -Nurb netmrg-0.19/share/netmrg.spec netmrg-0.20/ChangeLog/share/netmrg.spec --- netmrg-0.19/share/netmrg.spec 2006-02-01 01:38:52.000000000 +0530 +++ netmrg-0.20/ChangeLog/share/netmrg.spec 1970-01-01 05:30:00.000000000 +0530 @@ -1,116 +0,0 @@ -%define _localdatadir %{_var} - -Summary: Network Monitoring package using PHP, MySQL, and RRDtool -Name: netmrg -Version: 0.19 -Release: 1 -#Epoch: 1 -License: GPLv2 -Group: Application/System -Source0: netmrg-%{version}.tar.gz -#Source1: -#Patch0: -#Patch1: -URL: http://www.netmrg.net -BuildRoot: %{_tmppath}/%{name}-root -Requires: php, php-mysql, mysql, webserver, rrdtool, libxml2 -BuildRequires: mysql-devel, libxml2-devel -%{!?_with_ucd:Requires: net-snmp} -%{!?_with_ucd:BuildRequires: net-snmp-devel} -%{?_with_ucd:Requires: ucd-snmp} -%{?_with_ucd:BuildRequires: ucd-snmp-devel} - - -%description -NetMRG is a tool for network monitoring, reporting, and graphing. Based -on RRDTOOL, the best of open source graphing systems, NetMRG is capable -of creating graphs of any parameter of your network. - -%prep -%define _wwwdir %{_localstatedir}/www/%{name} -%setup -q -%configure \ - --with-wwwdir=%{_wwwdir} - -%build -make %{_smp_mflags} - -%install -rm -rf %{buildroot} -make \ - prefix=%{?buildroot:%{buildroot}}%{_prefix} \ - exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \ - bindir=%{?buildroot:%{buildroot}}%{_bindir} \ - sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \ - sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \ - datadir=%{?buildroot:%{buildroot}}%{_datadir} \ - includedir=%{?buildroot:%{buildroot}}%{_includedir} \ - libdir=%{?buildroot:%{buildroot}}%{_libdir} \ - libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \ - localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \ - sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \ - mandir=%{?buildroot:%{buildroot}}%{_mandir} \ - infodir=%{?buildroot:%{buildroot}}%{_infodir} \ - netmrg_wwwdir=%{?buildroot:%{buildroot}}%{_wwwdir} \ - install - -install -d %{buildroot}/%{_sysconfdir}/cron.d -install -m 644 etc/cron.d-netmrg %{buildroot}/%{_sysconfdir}/cron.d/netmrg -install -d %{buildroot}/%{_sysconfdir}/rc.d/init.d -install -m 755 etc/init.d-netmrg %{buildroot}/%{_sysconfdir}/rc.d/init.d/netmrg -rm -f %{buildroot}/${_datadir}/doc/%{name}-%{version}/cron.d-netmrg -rm -f %{buildroot}/${_datadir}/doc/%{name}-%{version}/init.d-netmrg - -%clean -rm -rf %{buildroot} - -%pre -if [ $1 = 1 ]; then - useradd -d %{_localstatedir}/lib/netmrg netmrg > /dev/null 2>&1 || true - chmod 755 %{_localstatedir}/lib/netmrg -fi - -%post -if [ $1 = 1 ]; then - chkconfig --add netmrg -fi - -%preun -if [ $1 = 0 ]; then - service netmrg stop > /dev/null 2>&1 - /sbin/chkconfig --del netmrg -fi - -%postun -if [ $1 = 0 ]; then - userdel netmrg -fi - -%files -%defattr(-, root, root) -%doc %{_datadir}/doc/* -%config(noreplace) %{_sysconfdir}/%{name}.xml -%config(noreplace) %{_sysconfdir}/%{name}.conf -%config %{_sysconfdir}/cron.d/netmrg -%config %{_sysconfdir}/rc.d/init.d/netmrg -%{_bindir}/* -%{_datadir}/%{name}/* -%{_mandir}/man1/* -%{_localstatedir}/www/* -%attr(-, netmrg, netmrg) %dir %{_localstatedir}/log/netmrg -%attr(-, netmrg, netmrg) %{_localstatedir}/lib/netmrg/* -%{_libexecdir}/* - -%changelog -* Thu Oct 14 2004 Douglas E. Warner -- fix homedir for netmrg - -* Fri May 28 2004 Douglas E. Warner -- added new init and cron scripts - -* Sat May 19 2004 Kevin Bonner -- added build option '--with ucd' to allow building on older RH boxes - -* Sat Oct 06 2003 Douglas E. Warner -- Initial RPM release. - diff -Nurb netmrg-0.19/src/db.cpp netmrg-0.20/ChangeLog/src/db.cpp --- netmrg-0.19/src/db.cpp 2004-10-20 05:22:55.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/db.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,106 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* db.cpp -* NetMRG Gatherer Database Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include "common.h" -#include "db.h" -#include "locks.h" -#include "utils.h" -#include "settings.h" - - -// db_connect -// -// make a new MySQL connection to the NetMRG database - -int db_connect(MYSQL *connection) -{ - const char * socket = NULL; - if (get_setting(setDBSock) != "") - { - socket = get_setting(setDBSock).c_str(); - } - - int port = 0; - if (get_setting_int(setDBPort) > 0) - { - port = get_setting_int(setDBPort); - } - - netmrg_mutex_lock(lkMySQL); - mysql_init(connection); - uint timeout = get_setting_int(setDBTimeout); - mysql_options(connection, MYSQL_OPT_CONNECT_TIMEOUT, (const char *) &timeout); - - if (!(mysql_real_connect(connection, get_setting(setDBHost).c_str(), get_setting(setDBUser).c_str(), get_setting(setDBPass).c_str(), get_setting(setDBDB).c_str(), port, socket, 0))) - { - netmrg_mutex_unlock(lkMySQL); - debuglogger(DEBUG_MYSQL, LEVEL_ERROR, NULL, "MySQL Connection Failure. (" + string(mysql_error(connection)) + ")"); - return 0; - } - else - { - netmrg_mutex_unlock(lkMySQL); - return 1; - } -} - -// db_query -// -// perform a MySQL query and return the results - -MYSQL_RES *db_query(MYSQL *mysql, const DeviceInfo *info, const string & query) -{ - MYSQL_RES *mysql_res = NULL; - - if (mysql_query(mysql, query.c_str())) - { - debuglogger(DEBUG_MYSQL, LEVEL_ERROR, info, "MySQL Query Failed. (" + query + ") (" + mysql_error(mysql) + ")"); - } - else - if (!(mysql_res = mysql_store_result(mysql))) - { - debuglogger(DEBUG_MYSQL, LEVEL_ERROR, info, "MySQL Store Result failed. (" + string(mysql_error(mysql)) + ")"); - } - else - { - debuglogger(DEBUG_MYSQL, LEVEL_DEBUG, info, "Mysql Query Succeeded. (" + query + ")"); - } - - return mysql_res; -} - -// db_update -// -// query the database, but disregard the results and log any failure - -void db_update(MYSQL *mysql, const DeviceInfo *info, const string & query) -{ - if (mysql_query(mysql, query.c_str())) - { - debuglogger(DEBUG_MYSQL, LEVEL_ERROR, info, "MySQL Update Failed. (" + query + ") (" + mysql_error(mysql) + ")"); - } - else - { - debuglogger(DEBUG_MYSQL, LEVEL_DEBUG, info, "MySQL Update Succeeded. (" + query + ")"); - } -} - -// db_escape -// -// turn a string into one appropriate for inclusion in an SQL query - -string db_escape(const string & input) -{ - char *raw_output = new char[input.length() * 2 + 1]; - // mysql_real_escape avoided due to its requirement of a mysql connection - mysql_escape_string(raw_output, input.c_str(), input.length()); - string output = string(raw_output); - delete [] raw_output; - return output; -} diff -Nurb netmrg-0.19/src/devices.cpp netmrg-0.20/ChangeLog/src/devices.cpp --- netmrg-0.19/src/devices.cpp 2005-01-27 07:13:17.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/devices.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,386 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* devices.cpp -* NetMRG Gatherer Devices Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include "devices.h" - -#include "snmp.h" -#include "utils.h" -#include "monitors.h" -#include "mappings.h" -#include "settings.h" - -uint process_sub_device(DeviceInfo info, MYSQL *mysql) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - uint status = 0; - int subdev_status = 0; - - debuglogger(DEBUG_SUBDEVICE, LEVEL_INFO, &info, "Starting Subdevice."); - - // setup subdevice specific parameters - info.parameters.push_front(ValuePair("subdev_name", info.subdevice_name)); - - // create an array containing the parameters for the subdevice - - string query = - string("SELECT name, value FROM sub_dev_variables WHERE type = 'static' AND sub_dev_id = ") + - inttostr(info.subdevice_id); - - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - info.parameters.push_front(ValuePair(mysql_row[0], mysql_row[1])); - } - - mysql_free_result(mysql_res); - - // depending on the subdevice type, assign values to more parameters - switch (info.subdevice_type) - { - case 1: break; // group - - case 2: subdev_status = setup_interface_parameters(&info, mysql); - break; // interface - - case 3: subdev_status = setup_disk_parameters(&info, mysql); - break; // disk - - default: debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, &info, "Unknown subdevice type (" + - inttostr(info.subdevice_type) + ")"); - subdev_status = -3; - - } // end subdevice type switch - - // delete the old dynamic entries from the cache - db_update(mysql, &info, "DELETE FROM sub_dev_variables WHERE type = 'dynamic' AND sub_dev_id = " - + inttostr(info.subdevice_id)); - - // insert the new dynamic entries - for (list::iterator current = info.parameters.begin(); current != info.parameters.end(); current++) - { - db_update(mysql, &info, "INSERT DELAYED INTO sub_dev_variables SET type = 'dynamic', sub_dev_id = " - + inttostr(info.subdevice_id) + ", name = '" + current->name + "', value = '" + db_escape(current->value) - + "'"); - } - - if (subdev_status < 0) - { - debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, &info, "Subdevice aborted due to previous errors."); - return 0; - } - - // query the monitors for this subdevice - - query = - string("SELECT ") + - string("monitors.data_type, ") + // 0 - string("data_types.rrd_type, ") + // 1 - string("monitors.min_val, ") + // 2 - string("monitors.max_val, ") + // 3 - string("monitors.tuned, ") + // 4 - string("monitors.test_type, ") + // 5 - string("monitors.test_id, ") + // 6 - string("monitors.test_params, ") + // 7 - string("monitors.last_val, ") + // 8 - string("monitors.id, ") + // 9 - string("NOW() - monitors.last_time ") + // 10 - string("FROM monitors ") + - string("LEFT JOIN data_types ON monitors.data_type=data_types.id ") + - string("WHERE sub_dev_id = ") + inttostr(info.subdevice_id); - - - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - - info.monitor_id = strtoint(mysql_row[9]); - info.test_type = strtoint(mysql_row[5]); - info.test_id = strtoint(mysql_row[6]); - info.test_params = mysql_row[7]; - - if (mysql_row[8] != NULL) - { - info.last_val = mysql_row[8]; - } - - if (mysql_row[10] != NULL) - { - info.delta_time = strtoint(mysql_row[10]); - } - - RRDInfo rrd; - - // if we're using RRD - if (strtoint(mysql_row[0]) > 0) - { - if (mysql_row[1] != NULL) - { - rrd.data_type = mysql_row[1]; - } - if (mysql_row[2] != NULL) - { - rrd.min_val = mysql_row[2]; - } - if (mysql_row[3] != NULL) - { - rrd.max_val = mysql_row[3]; - } - - rrd.tuned = strtoint(mysql_row[4]); - } // end using rrd - - // process each monitor - status = worstof(status, process_monitor(info, mysql, rrd)); - - } // end for each monitor - - mysql_free_result(mysql_res); - db_update(mysql, &info, "UPDATE sub_devices SET status=" + inttostr(status) + " WHERE id=" + inttostr(info.subdevice_id)); - return status; - -} // end process subdevice - - -uint process_sub_devices(DeviceInfo info, MYSQL *mysql) -{ - - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - uint status = 0; - - string query = string("SELECT id, type, name FROM sub_devices WHERE dev_id=") + inttostr(info.device_id); - - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - - // setup subdevice variables - info.subdevice_id = strtoint(mysql_row[0]); - info.subdevice_type = strtoint(mysql_row[1]); - info.subdevice_name = mysql_row[2]; - - status = worstof(status, process_sub_device(info, mysql)); - } - - mysql_free_result(mysql_res); - - return status; -} - -void process_device(int dev_id) -{ - MYSQL mysql; - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - uint status = 0; - time_t start_time = time( NULL ); - DeviceInfo info; - - info.device_id = dev_id; - - // connect to db, get info for this device - - debuglogger(DEBUG_DEVICE, LEVEL_NOTICE, &info, "Starting device thread at " + timetostr(start_time) + "."); - if (!db_connect(&mysql)) return; - debuglogger(DEBUG_DEVICE, LEVEL_INFO, &info, "MySQL connection established."); - info.mysql = (void *) &mysql; - - string query = string("SELECT ") + - string("name, ") + // 0 - string("ip, ") + // 1 - string("snmp_version, ") + // 2 - string("snmp_read_community, ") + // 3 - string("snmp_recache_method, ") + // 4 - string("snmp_uptime, ") + // 5 - string("snmp_ifnumber, ") + // 6 - string("snmp_port, ") + // 7 - string("snmp_timeout, ") + // 8 - string("snmp_retries, ") + // 9 - string("no_snmp_uptime_check ") + // 10 - string("FROM devices ") + - string("WHERE id=") + inttostr(dev_id); - - mysql_res = db_query(&mysql, &info, query); - mysql_row = mysql_fetch_row(mysql_res); - - info.name = mysql_row[0]; - info.ip = mysql_row[1]; - info.snmp_version = strtoint(mysql_row[2]); - - debuglogger(DEBUG_DEVICE, LEVEL_INFO, &info, info.name + " / {" + info.ip + "}"); - - // setup device-wide parameters - info.parameters.push_front(ValuePair("dev_name", mysql_row[0])); - info.parameters.push_front(ValuePair("ip", mysql_row[1])); - - // get SNMP-level info, if SNMP is used. - if (info.snmp_version > 0) - { - // set SNMP parameters - info.snmp_read_community = mysql_row[3]; - info.snmp_port = strtoint(mysql_row[7]); - info.snmp_timeout = strtoint(mysql_row[8]); - info.snmp_retries = strtoint(mysql_row[9]); - int snmp_recache_method = strtoint(mysql_row[4]); - int check_snmp_uptime = strtoint(mysql_row[10]) ? 0 : 1; - - // add SNMP parameters to list - info.parameters.push_front(ValuePair("snmp_read_community", mysql_row[3])); - - // init device snmp session - snmp_session_init(info); - - if (check_snmp_uptime) - { - // get uptime - info.snmp_uptime = get_snmp_uptime(info); - debuglogger(DEBUG_SNMP, LEVEL_INFO, &info, "SNMP Uptime is " + - format_time_elapsed(info.snmp_uptime / 100) + - + " (" + inttostr(info.snmp_uptime) + " centiseconds)"); - - // store new uptime - db_update(&mysql, &info, "UPDATE devices SET snmp_uptime=" + inttostr(info.snmp_uptime) + - " WHERE id=" + inttostr(dev_id)); - } - else - { - debuglogger(DEBUG_DEVICE, LEVEL_WARNING, &info, "Not checking SNMP uptime as per configuration."); - debuglogger(DEBUG_DEVICE, LEVEL_WARNING, &info, "This option should only be used as a last resort."); - } - - if ( check_snmp_uptime && (info.snmp_uptime == 0) ) - { - // device is snmp-dead - info.snmp_avoid = 1; - debuglogger(DEBUG_DEVICE, LEVEL_WARNING, &info, "Device is SNMP-dead. Avoiding SNMP tests."); - } - else - { - if (snmp_recache_method >= 1) - { - // we care about SNMP agent restarts - - if (check_snmp_uptime) - { - if (strtoint(mysql_row[5]) == 0) - { - // device came back from the dead - info.snmp_recache = 1; - debuglogger(DEBUG_DEVICE, LEVEL_NOTICE, &info, "Device has returned from SNMP-death."); - } - - if (info.snmp_uptime < strtoint(mysql_row[5])) - { - // uptime went backwards - info.snmp_recache = 1; - debuglogger(DEBUG_SNMP, LEVEL_NOTICE, &info, "SNMP Agent Restart."); - } - } - } - - if (snmp_recache_method >= 2) - { - // we care about ifNumber - - info.snmp_ifnumber = strtoint(snmp_get(info, string("interfaces.ifNumber.0"))); - - debuglogger(DEBUG_SNMP, LEVEL_INFO, &info, - "Number of Interfaces is " + inttostr(info.snmp_ifnumber)); - - if (info.snmp_ifnumber != strtoint(mysql_row[6])) - { - // ifNumber changed - info.snmp_recache = 1; - db_update(&mysql, &info, "UPDATE devices SET snmp_ifnumber = " + - inttostr(info.snmp_ifnumber) + string(" WHERE id = ") + - inttostr(dev_id)); - debuglogger(DEBUG_SNMP, LEVEL_NOTICE, &info, - "Number of interfaces changed from " + string(mysql_row[6]) + " to " + inttostr(info.snmp_ifnumber)); - } - else - if (snmp_recache_method >= 3) - { - // we care about interface cache matching ifNumber - MYSQL_RES *cache_mysql_res; - MYSQL_ROW cache_mysql_row; - - cache_mysql_res = db_query(&mysql, &info, string("SELECT count(*) FROM snmp_interface_cache WHERE dev_id = ") + inttostr(info.device_id)); - cache_mysql_row = mysql_fetch_row(cache_mysql_res); - int interface_cache_count = strtoint(cache_mysql_row[0]); - mysql_free_result(cache_mysql_res); - - if (info.snmp_ifnumber != interface_cache_count) - { - // ifNumber doesn't match the interface cache in the database - info.snmp_recache = 1; - debuglogger(DEBUG_SNMP, LEVEL_NOTICE, &info, - "Number of cached interfaces (" + inttostr(interface_cache_count) + ") " + - "doesn't match reported number of interfaces."); - } - } - } - - if (strtoint(mysql_row[4]) == 4) - { - // we recache this one every time. - info.snmp_recache = 1; - } - } // end snmp_uptime > 0 - - if (info.snmp_recache) - { - // we need to recache. - debuglogger(DEBUG_SNMP, LEVEL_NOTICE, &info, "Performing SNMP Recache."); - do_snmp_interface_recache(&info, &mysql); - do_snmp_disk_recache(&info, &mysql); - } - } // end snmp-enabled - else - { - debuglogger(DEBUG_SNMP, LEVEL_INFO, &info, "This device is configured with no SNMP support; avoiding SNMP tests."); - info.snmp_avoid = 1; - } - - mysql_free_result(mysql_res); - - // process sub-devices - status = process_sub_devices(info, &mysql); - - db_update(&mysql, &info, "UPDATE devices SET status=" + inttostr(status) + - ", snmp_avoided=" + inttostr(info.snmp_avoid) + " WHERE id=" + inttostr(dev_id)); - - if (info.snmp_sess_p) - { - snmp_session_cleanup(info); - } - - // trim event log for device - debuglogger(DEBUG_DEVICE, LEVEL_INFO, &info, "Trimming device event log."); - mysql_res = db_query(&mysql, &info, "SELECT id FROM log WHERE dev_id=" + inttostr(info.device_id) + " ORDER BY id"); - int count = mysql_num_rows(mysql_res); - for (int i = 0; i < count - get_setting_int(setMaxDeviceLogEntries); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - db_update(&mysql, &info, string("DELETE FROM log WHERE id=") + mysql_row[0]); - } - mysql_free_result(mysql_res); - - mysql_close(&mysql); - info.mysql = NULL; - - debuglogger(DEBUG_DEVICE, LEVEL_NOTICE, &info, "Ending device thread at " + timetostr(time( NULL )) + ", after a duration of " + inttostr(time(NULL) - start_time) + " seconds."); - -} // end process_device diff -Nurb netmrg-0.19/src/events.cpp netmrg-0.20/ChangeLog/src/events.cpp --- netmrg-0.19/src/events.cpp 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/events.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,185 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* events.cpp -* NetMRG Gatherer Events Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include "events.h" -#include "utils.h" -#include "settings.h" -#include "monitors.h" - -string situations[4] = { "Disabled", "Normal", "Warning", "Critical" }; - -uint process_events(DeviceInfo info, MYSQL *mysql) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - uint status = 0; - - string query = "SELECT id, trigger_type, last_status, situation, last_triggered, name FROM events WHERE mon_id=" + inttostr(info.monitor_id) + " AND trigger_type = 1"; - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - info.event_id = strtoint(mysql_row[0]); - if (process_event(info, mysql, strtoint(mysql_row[1]), strtoint(mysql_row[2]), strtoint(mysql_row[3]), strtoint(mysql_row[4]), mysql_row[5])) - { - status = worstof(status, strtoint(mysql_row[3])); - } - } - - mysql_free_result(mysql_res); - - return status; -} // end process_events() - - -uint process_event(DeviceInfo info, MYSQL *mysql, int trigger_type, int last_status, int situation, long int last_triggered, string name) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - uint status = 0; - - string query = "SELECT value, value_type, `condition`, logic_condition FROM conditions WHERE event_id=" + inttostr(info.event_id) + " ORDER BY id"; - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - - if (i == 0) - { - status = process_condition(info, strtoint(mysql_row[0]), strtoint(mysql_row[1]), strtoint(mysql_row[2])); - } - else - { - switch (strtoint(mysql_row[3])) - { - case 0: status = status && process_condition(info, strtoint(mysql_row[0]), strtoint(mysql_row[1]), strtoint(mysql_row[2])); - break; - case 1: status = status || process_condition(info, strtoint(mysql_row[0]), strtoint(mysql_row[1]), strtoint(mysql_row[2])); - break; - } - } - } - - mysql_free_result(mysql_res); - - if (status == 0) - { - debuglogger(DEBUG_EVENT, LEVEL_INFO, &info, "Not Triggered."); - db_update(mysql, &info, "UPDATE events SET last_status=0 WHERE id=" + inttostr(info.event_id)); - return 0; - } - else - { - debuglogger(DEBUG_EVENT, LEVEL_INFO, &info, "Triggered."); - - // setup parameters for the response to use. - info.parameters.push_front(ValuePair("event_name", name)); - info.parameters.push_front(ValuePair("situation", situations[situation])); - - if ((uint) last_status != status) - { - db_update(mysql, &info, "UPDATE events SET last_triggered=UNIX_TIMESTAMP(NOW()), last_status=1 WHERE id=" + inttostr(info.event_id)); - db_update(mysql, &info, "INSERT INTO event_log SET date=UNIX_TIMESTAMP(NOW()), time_since_last_change=UNIX_TIMESTAMP(NOW())-" + inttostr(last_triggered) + ", event_id=" + inttostr(info.event_id)); - - process_responses(info, mysql); - } - - return 1; - } -} // end process_event() - -uint process_condition(DeviceInfo info, long long int compare_value, int value_type, int condition) -{ - long long int actual_value = 0; - - switch (value_type) - { - case 0: - if (info.curr_val == "U") - return 0; - actual_value = strtoint(info.curr_val); - break; - - case 1: - if (info.delta_val == "U") - return 0; - actual_value = strtoint(info.delta_val); - break; - - case 2: - if (info.rate_val == "U") - return 0; - actual_value = strtoint(info.rate_val); - break; - - case 3: - if (info.last_val == "U") - return 0; - actual_value = strtoint(info.last_val); - break; - } - - switch (condition) - { - case 0: if (actual_value < compare_value) - return 1; - break; - - case 1: if (actual_value == compare_value) - return 1; - break; - - case 2: if (actual_value > compare_value) - return 1; - break; - - case 3: if (actual_value <= compare_value) - return 1; - break; - - case 4: if (actual_value != compare_value) - return 1; - break; - - case 5: if (actual_value >= compare_value) - return 1; - break; - } - - return 0; -} // end process_condition() - -void process_responses(DeviceInfo info, MYSQL *mysql) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - - string query = string("SELECT notifications.command, responses.parameters, responses.id ") + - string("FROM responses, notifications ") + - string("WHERE responses.event_id=") + inttostr(info.event_id) + " " + - string("AND responses.notification_id=notifications.id AND notifications.disabled = 0"); - - mysql_res = db_query(mysql, &info, query); - - for (uint i = 0; i < mysql_num_rows(mysql_res); i++) - { - mysql_row = mysql_fetch_row(mysql_res); - info.response_id = strtoint(mysql_row[2]); - string command = string(mysql_row[0]) + " " + string(mysql_row[1]); - command = expand_parameters(info, command); - if (command[0] != '/') - command = get_setting(setPathLibexec) + "/" + command; - debuglogger(DEBUG_RESPONSE, LEVEL_INFO, &info, "Running Response: " + command); - system(command.c_str()); - } - -} // end process_responses() - diff -Nurb netmrg-0.19/src/include/common.h netmrg-0.20/ChangeLog/src/include/common.h --- netmrg-0.19/src/include/common.h 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/common.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,48 +0,0 @@ -#ifndef NETMRG_COMMON_H -#define NETMRG_COMMON_H 1 - -#include - -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include - -#if HAVE_UNISTD_H -# include -# include -#endif - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include - -#if !HAVE_MEMMOVE -# define memmove(d, s, n) memcpy ((d), (s), (n)) -#endif - -#if HAVE_NETINET_IN_H -# include -#endif - -/* steinm@debian.org: gettext.h doesn't work on amd64 */ -/* #include "gettext.h" */ -#include -#define _(String) gettext(String) - -#if HAVE_SYS_WAIT_H -# include -#endif - -#endif /* NETMRG_COMMON_H */ - diff -Nurb netmrg-0.19/src/include/config.h.in netmrg-0.20/ChangeLog/src/include/config.h.in --- netmrg-0.19/src/include/config.h.in 2005-07-09 05:41:12.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/config.h.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,143 +0,0 @@ -/* src/include/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - -/* Define to 1 if you have the header file. */ -#undef HAVE_CSTDIO - -/* Define to 1 if you have the header file. */ -#undef HAVE_CSTDLIB - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - -/* Define to 1 if you have the `dl' library (-ldl). */ -#undef HAVE_LIBDL - -/* Define to 1 if you have the `intl' library (-lintl). */ -#undef HAVE_LIBINTL - -/* Define to 1 if you have the `mysqlclient' library (-lmysqlclient). */ -#undef HAVE_LIBMYSQLCLIENT - -/* Define to 1 if you have the `snmp' library (-lsnmp). */ -#undef HAVE_LIBSNMP - -/* Define to 1 if you have the `stdc++' library (-lstdc++). */ -#undef HAVE_LIBSTDC__ - -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIST - -/* Define to 1 if you have the `llround' function. */ -#undef HAVE_LLROUND - -/* scanf supports long long */ -#undef HAVE_LONG_LONG_SCANF - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Net-SNMP Version */ -#undef HAVE_NET_SNMP - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Old MySQL version */ -#undef OLD_MYSQL - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `unsigned' if does not define. */ -#undef size_t diff -Nurb netmrg-0.19/src/include/db.h netmrg-0.20/ChangeLog/src/include/db.h --- netmrg-0.19/src/include/db.h 2004-01-25 21:29:23.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/db.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* db.h -* NetMRG Gatherer Database Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_DB -#define NETMRG_DB - -#include "common.h" -#include "types.h" -#include - -int db_connect(MYSQL *connection); -MYSQL_RES * db_query(MYSQL *mysql, const DeviceInfo *info, const string & query); -void db_update(MYSQL *mysql, const DeviceInfo *info, const string & query); -string db_escape(const string & input); - -#endif diff -Nurb netmrg-0.19/src/include/devices.h netmrg-0.20/ChangeLog/src/include/devices.h --- netmrg-0.19/src/include/devices.h 2003-07-07 01:02:18.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/devices.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,23 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* devices.h -* NetMRG Gatherer Devices Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_DEVICES -#define NETMRG_DEVICES - -#include "types.h" -#include "db.h" - -// Device processing -void process_device(int dev_id); - -// Sub-device processing -uint process_sub_devices(DeviceInfo info, MYSQL *mysql); -uint process_sub_device(DeviceInfo info, MYSQL *mysql); - -#endif diff -Nurb netmrg-0.19/src/include/events.h netmrg-0.20/ChangeLog/src/include/events.h --- netmrg-0.19/src/include/events.h 2004-10-05 07:12:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/events.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* events.h -* NetMRG Gatherer Events Header File -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_EVENTS -#define NETMRG_EVENTS - -#include "types.h" -#include "db.h" - -uint process_events(DeviceInfo info, MYSQL *mysql); -uint process_event(DeviceInfo info, MYSQL *mysql, int trigger_type, int last_status, int situation, long int last_triggered, string name); -uint process_condition(DeviceInfo info, long long int compare_value, int value_type, int condition); -void process_responses(DeviceInfo info, MYSQL *mysql); - - -#endif diff -Nurb netmrg-0.19/src/include/gettext.h netmrg-0.20/ChangeLog/src/include/gettext.h --- netmrg-0.19/src/include/gettext.h 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/gettext.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,69 +0,0 @@ -/* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include - -#else - -/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which - chokes if dcgettext is defined as a macro. So include it now, to make - later inclusions of a NOP. We don't include - as well because people using "gettext.h" will not include , - and also including would fail on SunOS 4, whereas - is OK. */ -#if defined(__sun) -# include -#endif - -/* Disabled NLS. - The casts to 'const char *' serve the purpose of producing warnings - for invalid uses of the value returned from these functions. - On pre-ANSI systems without 'const', the config.h file is supposed to - contain "#define const". */ -# define gettext(Msgid) ((const char *) (Msgid)) -# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) -# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) - -#endif - -/* A pseudo function call that serves as a marker for the automated - extraction of messages, but does not call gettext(). The run-time - translation is done at a different place in the code. - The argument, String, should be a literal string. Concatenated strings - and other string expressions won't work. - The macro's expansion is not parenthesized, so that it is suitable as - initializer for static 'char[]' or 'const char[]' variables. */ -#define gettext_noop(String) String - -#endif /* _LIBGETTEXT_H */ diff -Nurb netmrg-0.19/src/include/locks.h netmrg-0.20/ChangeLog/src/include/locks.h --- netmrg-0.19/src/include/locks.h 2004-05-07 07:44:21.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/locks.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,26 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* locks.h -* NetMRG Gatherer Locks Header File -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_LOCKS -#define NETMRG_LOCKS - -#include "common.h" - -enum Lock { lkActiveThreads, lkMySQL, lkSNMP, lkRRD, lkSettings, lkPipe }; -enum Cond { cActiveThreads }; - -void netmrg_mutex_lock(Lock); -void netmrg_mutex_unlock(Lock); -int netmrg_mutex_trylock(Lock); - -void netmrg_cond_signal(Cond); -void netmrg_cond_wait(Cond, Lock); - -#endif - diff -Nurb netmrg-0.19/src/include/mappings.h netmrg-0.20/ChangeLog/src/include/mappings.h --- netmrg-0.19/src/include/mappings.h 2003-12-24 07:08:29.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/mappings.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,30 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* mappings.h -* NetMRG Gatherer Mappings Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_MAPPINGS -#define NETMRG_MAPPINGS - -#include "types.h" -#include "db.h" - -// types -enum IfMIBType { imtStandard, imtCatOS, imtOldCiscoSwitch, imtOldCiscoRouter }; - -// caching functions -void do_snmp_interface_recache(DeviceInfo *info, MYSQL *mysql); -void do_snmp_disk_recache(DeviceInfo *info, MYSQL *mysql); - -// parameter setup functions -int setup_interface_parameters(DeviceInfo *info, MYSQL *mysql); -int setup_disk_parameters(DeviceInfo *info, MYSQL *mysql); - -// misc functions -void parse_fancy_alias(DeviceInfo *info, string alias); - -#endif diff -Nurb netmrg-0.19/src/include/monitors.h netmrg-0.20/ChangeLog/src/include/monitors.h --- netmrg-0.19/src/include/monitors.h 2006-01-05 04:19:14.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/monitors.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,32 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* monitors.h -* NetMRG Gatherer Monitors Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_MONITORS -#define NETMRG_MONITORS - -#include "types.h" -#include "db.h" - -// global monitor processing -uint process_monitor(DeviceInfo info, MYSQL *mysql, RRDInfo rrd); - -// processing for specific monitor types -string process_internal_monitor(DeviceInfo info, MYSQL *mysql); -string process_sql_monitor(DeviceInfo info, MYSQL *mysql); -string process_script_monitor(DeviceInfo info, MYSQL *mysql); -string process_snmp_monitor(DeviceInfo info, MYSQL *mysql); - -// support functions -void update_monitor_db(DeviceInfo info, MYSQL *mysql, RRDInfo rrd); -string expand_parameters(DeviceInfo &info, string input); -void params_to_env(DeviceInfo &info, char ** &env); -void free_env(DeviceInfo &info, char ** &env); - - -#endif diff -Nurb netmrg-0.19/src/include/netmrg.h.in netmrg-0.20/ChangeLog/src/include/netmrg.h.in --- netmrg-0.19/src/include/netmrg.h.in 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/netmrg.h.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,50 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* config.h -* Gatherer Configuration Header File -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_CONFIG -#define NETMRG_CONFIG - -#ifdef __linux__ -#define _PTHREADS -#define _P __P -#endif - -#define NETMRG_VERSION "@PACKAGE_VERSION@" - -// The remaining options are the default values -// used if not overridden on the command line or config file. - - -// Paths -#define DEF_CONFIG_FILE "@sysconfdir@/netmrg.xml" -#define DEF_LOCKFILE "@localstatedir@/log/netmrg/lockfile" -#define DEF_RUNTIME_FILE "@localstatedir@/log/netmrg/runtime" -#define DEF_RRDTOOL "@RRDTOOL@" -#define DEF_RRDS "@localstatedir@/lib/netmrg/rrd" -#define DEF_LIBEXEC "@libexecdir@/netmrg/" -#define DEF_LOCALE "@datadir@/netmrg/locale" - -// Threading -#define DEF_THREAD_COUNT 5 // number of simultaneous threads - -// Database Credentials -#define DEF_DB_HOST "localhost" -#define DEF_DB_USER "netmrgwrite" -#define DEF_DB_PASS "netmrgwrite" -#define DEF_DB_DB "netmrg" -#define DEF_DB_SOCK "" -#define DEF_DB_PORT 0 -#define DEF_DB_TIMEOUT 10 - -// Other -#define DEF_POLL_INTERVAL 300 -#define DEF_MAX_DEV_LOG 500 -#define DEF_SYSLOG_FACILITY "LOG_DAEMON" - -#endif diff -Nurb netmrg-0.19/src/include/rrd.h netmrg-0.20/ChangeLog/src/include/rrd.h --- netmrg-0.19/src/include/rrd.h 2003-05-07 02:08:27.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/rrd.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,41 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* rrd.h -* NetMRG Gatherer RRDTOOL integration -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_RRD -#define NETMRG_RRD - -#include "types.h" -#include - -// create a connection to RRD -void rrd_init(); - -// clean up connection to RRD -void rrd_cleanup(); - -// send a string to RRDTOOL -void rrd_cmd(DeviceInfo info, string cmd); - -// returns the file name for the .rrd file -string get_rrd_file(string mon_id); - -// creates a new rrd file -void create_rrd(DeviceInfo info, RRDInfo rrd); - -// alters the parameters of an rrd file -void tune_rrd(DeviceInfo info, RRDInfo rrd); - -// updates the data in an rrd file -void update_rrd(DeviceInfo info, RRDInfo rrd); - -// create, update, and/or tune an rrd file as needed -void update_monitor_rrd(DeviceInfo info, RRDInfo rrd); - -#endif - diff -Nurb netmrg-0.19/src/include/settings.h netmrg-0.20/ChangeLog/src/include/settings.h --- netmrg-0.19/src/include/settings.h 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/settings.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,53 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* settings.h -* NetMRG Gatherer Settings Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_SETTINGS -#define NETMRG_SETTINGS -#include "types.h" - -using std::string; - -const int settings_count = 17; - -enum Setting -{ - setDBHost, - setDBUser, - setDBPass, - setDBDB, - setDBSock, - setDBPort, - setThreadCount, - setPathRRDTOOL, - setPathLockFile, - setPathRuntimeFile, - setPathLibexec, - setPathLocale, - setPathRRDs, - setPollInterval, - setMaxDeviceLogEntries, - setSyslogFacility, - setDBTimeout -}; - -// functions to set and get settings -string get_setting(Setting); -long int get_setting_int(Setting); -void set_setting(Setting, const string &); -void set_setting_int(Setting, long int); - -// functions to load settings -void load_settings_default(); -void load_settings_file(const string & filename); - -// other functions -void print_settings(); -void setup_intl(); - -#endif diff -Nurb netmrg-0.19/src/include/snmp.h netmrg-0.20/ChangeLog/src/include/snmp.h --- netmrg-0.19/src/include/snmp.h 2003-09-12 06:40:37.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/snmp.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,30 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* snmp.h -* NetMRG Gatherer SNMP Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_SNMP -#define NETMRG_SNMP - -#include "common.h" -#include "types.h" -#include -#include - -void snmp_init(); -void snmp_cleanup(); -void snmp_session_init(DeviceInfo & info); -void snmp_session_cleanup(DeviceInfo & info); -string snmp_get(DeviceInfo info, string oidstring); -string snmp_diff(DeviceInfo info, string oid1, string oid2); -list snmp_trim_rootoid(list input, string rootoid); -list snmp_swap_index_value(list input); -list snmp_walk(DeviceInfo info, string oidstring); -long long int get_snmp_uptime(DeviceInfo info); - -#endif - diff -Nurb netmrg-0.19/src/include/types.h netmrg-0.20/ChangeLog/src/include/types.h --- netmrg-0.19/src/include/types.h 2004-06-01 02:29:39.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/types.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,172 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* types.h -* NetMRG Data Structures -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_TYPES -#define NETMRG_TYPES - -#include "common.h" -#include -#include - -using std::string; -using std::list; - -// ValuePair -// -// Used to store a name and value for a parameter used in -// to expand parameters beforing being passed to external -// scripts or used as part of a query. - -struct ValuePair -{ - string name; - string value; - - ValuePair(string setname, string setvalue) - { - name = setname; - value = setvalue; - } -}; - -// DeviceInfo -// -// Used to provide any subroutine working on a device or -// a component of one with all information necessary. -// This allows the information to be added to in only this -// location and where it is needed, not as a parameter -// in all interim functions. - -struct DeviceInfo -{ - int device_id; - int subdevice_id; - int monitor_id; - int event_id; - int response_id; - - uint status; - - void * mysql; - - void * snmp_sess_p; - uint snmp_avoid; - uint snmp_recache; - uint snmp_ifnumber; - long long int snmp_uptime; - - uint subdevice_type; - - int test_type; - int test_id; - - string name; - string ip; - string subdevice_name; - string test_params; - - string curr_val; - string last_val; - string delta_val; - string rate_val; - long long int delta_time; - - unsigned short snmp_version; - string snmp_read_community; - unsigned long snmp_timeout; - unsigned int snmp_retries; - unsigned short snmp_port; - - list parameters; - - DeviceInfo() - { - device_id = -1; - subdevice_id = -1; - monitor_id = -1; - event_id = -1; - response_id = -1; - - status = 0; - - mysql = NULL; - - snmp_avoid = 0; - snmp_recache = 0; - snmp_ifnumber = 0; - snmp_uptime = 0; - - subdevice_type = 0; - - test_type = -1; - test_id = -1; - //test_params = ""; - - delta_time = 0; - - curr_val = "U"; - last_val = "U"; - delta_val = "U"; - rate_val = "U"; - - snmp_version = 0; - snmp_timeout = 1000000; - snmp_retries = 4; - snmp_port = 161; - - snmp_sess_p = NULL; - } -}; - -// RRDInfo -// -// Provides the information needed for creating -// or updating an RRD file. - -struct RRDInfo -{ - string max_val; - string min_val; - - int tuned; - - string value; - - string data_type; - - RRDInfo() - { - max_val = "U"; - min_val = "U"; - tuned = 0; - data_type = ""; - } -}; - -// SNMPPair -// essentially the same as ValuePair, but for -// oid/value pairs needed for SNMP walks - -struct SNMPPair -{ - string oid; - string value; - - SNMPPair(string setoid, string setvalue) - { - oid = setoid; - value = setvalue; - } -}; - -// Schedule - -enum ScheduleType { schOnce, schWait }; - -#endif diff -Nurb netmrg-0.19/src/include/utils.h netmrg-0.20/ChangeLog/src/include/utils.h --- netmrg-0.19/src/include/utils.h 2004-10-24 02:36:18.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/include/utils.h 1970-01-01 05:30:00.000000000 +0530 @@ -1,112 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* utils.h -* NetMRG Gatherer Utilities Library Header -* -* see doc/LICENSE for copyright information -********************************************/ - -#ifndef NETMRG_UTILS -#define NETMRG_UTILS - -#include "common.h" -#include "types.h" -#include "db.h" -#include -#include - -using std::string; - -// NetMRG Components -const int DEBUG_GLOBAL = 1; -const int DEBUG_THREAD = 2; -const int DEBUG_DEVICE = 4; -const int DEBUG_SUBDEVICE = 8; -const int DEBUG_MONITOR = 16; -const int DEBUG_EVENT = 32; -const int DEBUG_RESPONSE = 64; -const int DEBUG_RRD = 128; -const int DEBUG_SNMP = 256; -const int DEBUG_GATHERER = 512; -const int DEBUG_MYSQL = 1024; -const int DEBUG_LOGGING = 2048; - -const int DEBUG_ALL = 4095; -const int DEBUG_MOST = DEBUG_ALL; -const int DEBUG_DEFAULT = DEBUG_ALL; - -// Logging Levels (see syslog(3) manpage for definitions) -const int LEVEL_EMERG = 1; -const int LEVEL_ALERT = 2; -const int LEVEL_CRITICAL = 4; // this is the worst condition currently used -const int LEVEL_ERROR = 8; -const int LEVEL_WARNING = 16; -const int LEVEL_NOTICE = 32; -const int LEVEL_INFO = 64; -const int LEVEL_DEBUG = 128; - -const int LEVEL_ALL = 255; -const int LEVEL_MOST = 127; -const int LEVEL_DEFAULT = 63; - -// Logging Output Modes -const int LOG_METHOD_STDOUT = 1; -const int LOG_METHOD_SYSLOG = 2; -const int LOG_METHOD_VT100 = 4; - -// Terminal Constants -const char ESC = 0x1b; -const int ATTR_RESET = 0; -const int ATTR_BRIGHT = 1; -const int ATTR_DIM = 2; -const int ATTR_UNDER = 4; -const int ATTR_BLINK = 5; -const int ATTR_REVER = 7; -const int ATTR_HIDDEN = 8; - -const int COLOR_BLACK = 30; -const int COLOR_RED = 31; -const int COLOR_GREEN = 32; -const int COLOR_BROWN = 33; -const int COLOR_BLUE = 34; -const int COLOR_MAGENTA = 35; -const int COLOR_CYAN = 36; -const int COLOR_WHITE = 37; - -// terminal functions -bool vt100_compatible(); - -// general functions -int file_exists(string filename); -string strstripnl(string input); -string token_replace(string &source, string token, string value); -u_char *u_string(string source, u_char *out); -string inttostr(long long int int_to_convert); -string timetostr(const time_t timestamp); -long long int strtoint(string string_to_convert); -string inttopadstr(int integer, int padlen); -string count_file_lines(DeviceInfo info); -string read_value_from_file(DeviceInfo info); -void U_to_NULL(string & input); -uint worstof(uint a, uint b); -string format_time_elapsed(long long int num_secs); -string remove_nonnumerics(string input); -double strtodec(string input); - -// debugging functions -void init_logging(); -int get_debug_level(); -void set_debug_level(int level); -int get_debug_components(); -void set_debug_components(int components); -bool get_debug_safety(); -void set_debug_safety(bool safety); -void set_log_method(int method); -int get_log_method(); - -string censor_message(const string & message); -string remove_braces(const string & message); -void debuglogger(int component, int level, const DeviceInfo *, const string & message); - -#endif diff -Nurb netmrg-0.19/src/locks.cpp netmrg-0.20/ChangeLog/src/locks.cpp --- netmrg-0.19/src/locks.cpp 2004-05-16 00:53:52.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/locks.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,88 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* locks.cpp -* NetMRG Gatherer Locks -* -* see doc/LICENSE for copyright information -********************************************/ - -#include "locks.h" -#include "utils.h" - -// Create mutex locks -static pthread_mutex_t active_threads_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t mysql_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t snmp_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t rrdtool_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t settings_lock = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t pipe_lock = PTHREAD_MUTEX_INITIALIZER; - -// Create conditional variables -static pthread_cond_t active_threads_cv = PTHREAD_COND_INITIALIZER; - -pthread_mutex_t* get_lock(Lock myLock) -{ - switch (myLock) - { - case lkActiveThreads: return &active_threads_lock; - case lkMySQL: return &mysql_lock; - case lkSNMP: return &snmp_lock; - case lkRRD: return &rrdtool_lock; - case lkSettings: return &settings_lock; - case lkPipe: return &pipe_lock; - } - return NULL; -} - -pthread_cond_t* get_cond(Cond myCond) -{ - switch (myCond) - { - case cActiveThreads: return &active_threads_cv; - } - return NULL; -} - -string get_lock_name(Lock myLock) -{ - switch (myLock) - { - case lkActiveThreads: return "ActiveThreads"; - case lkMySQL: return "MySQL"; - case lkSNMP: return "SNMP"; - case lkRRD: return "RRD"; - case lkSettings: return "Settings"; - case lkPipe: return "Pipe"; - } - return ""; -} - -void netmrg_mutex_lock(Lock myLock) -{ - debuglogger(DEBUG_THREAD, LEVEL_DEBUG, NULL, "Locking " + get_lock_name(myLock)); - pthread_mutex_lock(get_lock(myLock)); -} - -void netmrg_mutex_unlock(Lock myLock) -{ - debuglogger(DEBUG_THREAD, LEVEL_DEBUG, NULL, "Unlocking " + get_lock_name(myLock)); - pthread_mutex_unlock(get_lock(myLock)); -} - -int netmrg_mutex_trylock(Lock myLock) -{ - debuglogger(DEBUG_THREAD, LEVEL_DEBUG, NULL, "Trying to lock " + get_lock_name(myLock)); - return pthread_mutex_trylock(get_lock(myLock)); -} - -void netmrg_cond_signal(Cond myCond) -{ - pthread_cond_signal(get_cond(myCond)); -} - -void netmrg_cond_wait(Cond myCond, Lock myLock) -{ - pthread_cond_wait(get_cond(myCond), get_lock(myLock)); -} - diff -Nurb netmrg-0.19/src/Makefile.am netmrg-0.20/ChangeLog/src/Makefile.am --- netmrg-0.19/src/Makefile.am 2004-10-21 12:21:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,51 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -SUBDIRS = . - -netmrg_gatherer_SOURCES = db.cpp devices.cpp events.cpp locks.cpp mappings.cpp monitors.cpp netmrg.cpp rrd.cpp settings.cpp snmp.cpp utils.cpp - -noinst_HEADERS = include/common.h include/db.h include/devices.h include/events.h include/locks.h include/mappings.h include/monitors.h include/netmrg.h include/rrd.h include/settings.h include/snmp.h include/types.h include/utils.h - -bin_PROGRAMS = netmrg-gatherer - -INCLUDES = -I./include - - -.cpp.o: - @echo " CXX $@" -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -netmrg-gatherer$(EXEEXT): $(netmrg_gatherer_OBJECTS) $(netmrg_gatherer_DEPENDENCIES) - @echo " LINK $@" - @rm -f netmrg-gatherer$(EXEEXT) - $(CXXLINK) $(netmrg_gatherer_LDFLAGS) $(netmrg_gatherer_OBJECTS) $(netmrg_gatherer_LDADD) $(LIBS) - -mostlyclean-compile: - @echo " RM *.$(OBJEXT)" - -rm -f *.$(OBJEXT) - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || ( \ - echo " RM $(bin_PROGRAMS)"; \ - rm -f $(bin_PROGRAMS) ) - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @echo " INST $(bin_PROGRAMS)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - diff -Nurb netmrg-0.19/src/Makefile.in netmrg-0.20/ChangeLog/src/Makefile.in --- netmrg-0.19/src/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,573 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake - - -SOURCES = $(netmrg_gatherer_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/Make.inc -bin_PROGRAMS = netmrg-gatherer$(EXEEXT) -subdir = src -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_netmrg_gatherer_OBJECTS = db.$(OBJEXT) devices.$(OBJEXT) \ - events.$(OBJEXT) locks.$(OBJEXT) mappings.$(OBJEXT) \ - monitors.$(OBJEXT) netmrg.$(OBJEXT) rrd.$(OBJEXT) \ - settings.$(OBJEXT) snmp.$(OBJEXT) utils.$(OBJEXT) -netmrg_gatherer_OBJECTS = $(am_netmrg_gatherer_OBJECTS) -netmrg_gatherer_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/include -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(netmrg_gatherer_SOURCES) -DIST_SOURCES = $(netmrg_gatherer_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -HEADERS = $(noinst_HEADERS) -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - -SUBDIRS = . -netmrg_gatherer_SOURCES = db.cpp devices.cpp events.cpp locks.cpp mappings.cpp monitors.cpp netmrg.cpp rrd.cpp settings.cpp snmp.cpp utils.cpp -noinst_HEADERS = include/common.h include/db.h include/devices.h include/events.h include/locks.h include/mappings.h include/monitors.h include/netmrg.h include/rrd.h include/settings.h include/snmp.h include/types.h include/utils.h -INCLUDES = -I./include -all: all-recursive - -.SUFFIXES: -.SUFFIXES: .cpp .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devices.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/locks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mappings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/monitors.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netmrg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rrd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. $(distdir)/include - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile $(PROGRAMS) $(HEADERS) -installdirs: installdirs-recursive -installdirs-am: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-recursive ctags \ - ctags-recursive distclean distclean-compile distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am - -@SET_MAKE@ - -.cpp.o: - @echo " CXX $@" -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -netmrg-gatherer$(EXEEXT): $(netmrg_gatherer_OBJECTS) $(netmrg_gatherer_DEPENDENCIES) - @echo " LINK $@" - @rm -f netmrg-gatherer$(EXEEXT) - $(CXXLINK) $(netmrg_gatherer_LDFLAGS) $(netmrg_gatherer_OBJECTS) $(netmrg_gatherer_LDADD) $(LIBS) - -mostlyclean-compile: - @echo " RM *.$(OBJEXT)" - -rm -f *.$(OBJEXT) - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || ( \ - echo " RM $(bin_PROGRAMS)"; \ - rm -f $(bin_PROGRAMS) ) - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @echo " INST $(bin_PROGRAMS)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/src/mappings.cpp netmrg-0.20/ChangeLog/src/mappings.cpp --- netmrg-0.19/src/mappings.cpp 2005-08-24 11:57:38.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/mappings.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,368 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* mappings.cpp -* NetMRG Gatherer Mappings Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include "mappings.h" -#include "utils.h" -#include "snmp.h" -#include "db.h" - -string remove_surrounding_quotes(string input) -{ - if (input[0] == '"') - input.erase(0,1); - if (input[input.length() - 1] == '"') - input.erase(input.length() - 1, 1); - return input; -} - -void do_snmp_interface_recache(DeviceInfo *info, MYSQL *mysql) -{ - // clear cache for this device - db_update(mysql, info, "DELETE FROM snmp_interface_cache WHERE dev_id=" + inttostr(info->device_id)); - - // this is a hack to see if we're on a CatOS platform - string sysdescr = snmp_get(*info, "system.sysDescr.0"); - - IfMIBType mibtype = imtStandard; - - if (sysdescr.find("WS-C") != string::npos) - mibtype = imtCatOS; - - if (sysdescr.find("Cisco Systems Catalyst 1900") != string::npos) - mibtype = imtOldCiscoSwitch; - - list ifIndexList = snmp_walk(*info, "ifIndex"); - - for (list::iterator current = ifIndexList.begin(); current != ifIndexList.end(); current++) - { - string ifIndex = current->value; - string ifName = snmp_get(*info, "ifName." + ifIndex); - - if ((mibtype == imtStandard) && - (sysdescr.find("Cisco") != string::npos) && - (sysdescr.find("IOS") != string::npos) && - (ifName == "U") - ) - { - mibtype = imtOldCiscoRouter; - } - - string ifDescr = snmp_get(*info, "ifDescr." + ifIndex); - // use CatOS port name in place of ifAlias - string ifAlias; - if (mibtype == imtCatOS) - { - // CatOS port names are indexed by slot and port, not by ifIndex - string::size_type slash_pos = ifName.find("/"); - int slot = strtoint(ifName.substr(0, slash_pos)); - int port = strtoint(ifName.substr(slash_pos + 1, ifName.length() - 1)); - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, info, "ifname='" + ifName + "', slash_pos=" + inttostr(slash_pos) + ", slot=" + inttostr(slot) + ", port=" + inttostr(port)); - if ( (slot != 0) && (port != 0) ) - { - ifAlias = snmp_get(*info, ".1.3.6.1.4.1.9.5.1.4.1.1.4." + inttostr(slot) + "." + inttostr(port)); - ifAlias.erase(0, 1); - ifAlias.erase(ifAlias.length() - 1, 1); - } - } - else if (mibtype == imtOldCiscoSwitch) - { - ifAlias = snmp_get(*info, ".1.3.6.1.4.1.437.1.1.3.3.1.1.3." + ifIndex); - ifAlias = remove_surrounding_quotes(ifAlias); - ifName = ifDescr; - } - else if (mibtype == imtOldCiscoRouter) - { - ifAlias = snmp_get(*info, ".1.3.6.1.4.1.9.2.2.1.1.28." + ifIndex); - ifAlias = remove_surrounding_quotes(ifAlias); - ifName = ifDescr; - } - else - { - ifAlias = snmp_get(*info, "ifAlias." + ifIndex); - } - U_to_NULL(ifAlias); - U_to_NULL(ifName); - U_to_NULL(ifDescr); - string ifType = snmp_get(*info, "ifType." + ifIndex); - string ifMAC = snmp_get(*info, "ifPhysAddress." + ifIndex); - U_to_NULL(ifMAC); - string ifOperStatus = snmp_get(*info, "ifOperStatus." + ifIndex); - string ifAdminStatus = snmp_get(*info, "ifAdminStatus." + ifIndex); - string ifSpeed = snmp_get(*info, "ifSpeed." + ifIndex); - - db_update(mysql, info, string("INSERT INTO snmp_interface_cache SET ") + - "dev_id = " + inttostr((*info).device_id) + ", " + - "ifIndex = '" + ifIndex + "', " + - "ifName = " + ifName + ", " + - "ifDescr = " + ifDescr + ", " + - "ifAlias = " + ifAlias + ", " + - "ifType = '" + ifType + "', " + - "ifMAC = " + ifMAC + ", " + - "ifOperStatus = '" + ifOperStatus + "', " + - "ifAdminStatus = '" + ifAdminStatus + "', " - "ifSpeed = '" + ifSpeed + "'"); - - } - - list ifIPList = snmp_walk(*info, "ipAdEntIfIndex"); - ifIPList = snmp_trim_rootoid(ifIPList, ".1.3.6.1.2.1.4.20.1.2."); - - for (list::iterator current = ifIPList.begin(); current != ifIPList.end(); current++) - { - string ip = (*current).oid; - string ifIndex = (*current).value; - - db_update(mysql, info, string("UPDATE snmp_interface_cache SET ifIP = '") + - ip + "' WHERE dev_id=" + inttostr((*info).device_id) + - " AND ifIndex=" + ifIndex); - } -} - -void do_snmp_disk_recache(DeviceInfo *info, MYSQL *mysql) -{ - // clear cache for this device - db_update(mysql, info, "DELETE FROM snmp_disk_cache WHERE dev_id=" + inttostr((*info).device_id)); - - // try UCD Disk MIB - - list dskIndexList = snmp_walk(*info, "dskIndex"); - - for (list::iterator current = dskIndexList.begin(); current != dskIndexList.end(); current++) - { - string dskIndex = (*current).value; - string dskPath = snmp_get(*info, "dskPath." + dskIndex); U_to_NULL(dskPath); - string dskDevice = snmp_get(*info, "dskDevice." + dskIndex); U_to_NULL(dskDevice); - - db_update(mysql, info, string("INSERT INTO snmp_disk_cache SET ") + - "dev_id = " + inttostr((*info).device_id) + ", " + - "disk_index = " + dskIndex + ", " + - "disk_device = " + dskDevice + ", " + - "disk_path = " + dskPath); - } - - // try Windows Disk MIB - - if (dskIndexList.empty()) - { - string dskPath, dskIndex; - dskIndexList = snmp_walk(*info, ".1.3.6.1.2.1.25.2.3.1.1"); - for (list::iterator current = dskIndexList.begin(); current != dskIndexList.end(); current++) - { - dskIndex = (*current).value; - dskPath = snmp_get(*info, ".1.3.6.1.2.1.25.2.3.1.3." + dskIndex); U_to_NULL(dskPath); - if (dskPath[1] == '\\' && dskPath[2] == '"' && - dskPath[dskPath.size()-3] == '\\' && dskPath[dskPath.size()-2] == '"') - { - dskPath.erase(1, 2); - dskPath.erase(dskPath.size()-3, 2); - } - string::size_type i = dskPath.find(" ", 0); - if (i != string::npos) - { - dskPath = dskPath.substr(0, i+1) + "'"; - } - db_update(mysql, info, string("INSERT INTO snmp_disk_cache SET ") + - "dev_id = " + inttostr((*info).device_id) + ", " + - "disk_index = " + dskIndex + ", " + - "disk_device = " + dskPath + ", " + - "disk_path = " + dskPath); - } - } - -} - -int setup_interface_parameters(DeviceInfo *info, MYSQL *mysql) -{ - - // This function examines the parameters for the subdevice and determines if any - // are to be used as SNMP index values. If so, it adds parameters with all available - // information from the snmp_cache, so that things like %ifIndex% and %ifName% in monitors - // will get expanded into the correct values when the monitors are processed. - - string index = ""; - string value = ""; - - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - - int retval = 0; - - for (list::iterator current = info->parameters.begin(); current != info->parameters.end(); current++) - { - value = current->value; - - if ( - current->name == "ifIndex" || - current->name == "ifName" || - current->name == "ifDescr" || - current->name == "ifAlias" || - current->name == "ifIP" || - current->name == "ifMAC" - ) - { - index = current->name; - break; - } - - } // end for each parameter - - if (index == "") - { - debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, info, "Interface subdevice has no interface parameters."); - retval = -1; - } - else - { - string query = - string("SELECT ifIndex, ifName, ifIP, ifDescr, ifAlias, ifMAC, ifSpeed FROM snmp_interface_cache WHERE dev_id=") + - inttostr(info->device_id) + string(" AND ") + index + "='" + db_escape(value) + "'"; - - mysql_res = db_query(mysql, info, query); - - if (mysql_num_rows(mysql_res) > 0) - { - mysql_row = mysql_fetch_row(mysql_res); - - if ((mysql_row[0] != NULL) && (index != "ifIndex")) - { - info->parameters.push_front(ValuePair("ifIndex", mysql_row[0])); - } - - if ((mysql_row[1] != NULL) && (index != "ifName")) - { - info->parameters.push_front(ValuePair("ifName", mysql_row[1])); - } - - if ((mysql_row[2] != NULL) && (index != "ifIP")) - { - info->parameters.push_front(ValuePair("ifIP", mysql_row[2])); - } - - if ((mysql_row[3] != NULL) && (index != "ifDescr")) - { - info->parameters.push_front(ValuePair("ifDescr", mysql_row[3])); - } - - if ((mysql_row[4] != NULL) && (index != "ifAlias")) - { - info->parameters.push_front(ValuePair("ifAlias", mysql_row[4])); - parse_fancy_alias(info, mysql_row[4]); - } - - if ((mysql_row[5] != NULL) && (index != "ifMAC")) - { - info->parameters.push_front(ValuePair("ifMAC", mysql_row[5])); - } - - if (mysql_row[6] != NULL) - info->parameters.push_front(ValuePair("ifSpeed", mysql_row[6])); - } - else - { - debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, info, "Interface index not found."); - retval = -2; - } - mysql_free_result(mysql_res); - } - return retval; -} - -void parse_fancy_alias(DeviceInfo *info, string alias) -{ - // see if the interface description looks parsible, and parse it. - if (alias.find("(",0) != string::npos) - { - info->parameters.push_front(ValuePair("ifCktName", alias.substr(0, alias.find("(",0)))); - info->parameters.push_front(ValuePair("ifCktID", alias.substr(alias.find("(",0) + 1, alias.length() - alias.find("(",0) - 2))); - } - else - { - info->parameters.push_front(ValuePair("ifCktName", alias)); - info->parameters.push_front(ValuePair("ifCktID", "N/A")); - } -} - -int setup_disk_parameters(DeviceInfo *info, MYSQL *mysql) -{ - // just like setup_interface_parameters, but for disks instead - - string index = ""; - string value = ""; - - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - - int retval = 0; - - for (list::iterator current = info->parameters.begin(); current != info->parameters.end(); current++) - { - value = current->value; - - if (current->name == "dskIndex") - { - index = "disk_index"; - break; - } - else - if (current->name == "dskPath") - { - index = "disk_path"; - break; - } - else - if (current->name == "dskDevice") - { - index = "disk_device"; - break; - } - - } // end for each parameter - - if (index == "") - { - debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, info, "Disk subdevice has no disk parameters."); - retval = -1; - } - else - { - string query = - string("SELECT disk_index, disk_path, disk_device FROM snmp_disk_cache WHERE dev_id=") + - inttostr(info->device_id) + string(" AND ") + index + "='" + db_escape(value) + "'"; - - mysql_res = db_query(mysql, info, query); - - if (mysql_num_rows(mysql_res) > 0) - { - mysql_row = mysql_fetch_row(mysql_res); - - if ((mysql_row[0] != NULL) && (index != "disk_index")) - { - info->parameters.push_front(ValuePair("dskIndex", mysql_row[0])); - } - - if ((mysql_row[1] != NULL) && (index != "disk_path")) - { - info->parameters.push_front(ValuePair("dskPath", mysql_row[1])); - } - - if ((mysql_row[2] != NULL) && (index != "disk_device")) - { - info->parameters.push_front(ValuePair("dskDevice", mysql_row[2])); - } - } - else - { - debuglogger(DEBUG_SUBDEVICE, LEVEL_WARNING, info, "Disk index not found."); - retval = -2; - } - mysql_free_result(mysql_res); - } - return retval; -} - diff -Nurb netmrg-0.19/src/monitors.cpp netmrg-0.20/ChangeLog/src/monitors.cpp --- netmrg-0.19/src/monitors.cpp 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/monitors.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,613 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* monitors.cpp -* NetMRG Gatherer Monitors Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include -#include - -#include "monitors.h" - -#include "snmp.h" -#include "utils.h" -#include "rrd.h" -#include "locks.h" -#include "events.h" -#include "settings.h" - -#include - -#ifdef OLD_MYSQL -#define MYSQL_CONNECT(a,b,c,d,e,f,g,h) mysql_connect(a,b,c,d) -#else -#define MYSQL_CONNECT(a,b,c,d,e,f,g,h) mysql_real_connect(a,b,c,d,e,f,g,h) -#endif - -#ifdef HAVE_LLROUND -#define ROUND_VAL llround -#else -#define ROUND_VAL (uint) -#endif - -string process_internal_monitor(DeviceInfo info, MYSQL *mysql) -{ - string test_result = "U", temp, temp2; - float disk_total, disk_used; - unsigned int nCPUs, sum; - list WinCPUList; - - switch(info.test_id) - { - // count lines in a file - case 1: test_result = count_file_lines(info); - break; - - // TNT "good" modems (that is, available modems - suspect modems) - case 2: test_result = snmp_diff(info, ".1.3.6.1.4.1.529.15.1.0", ".1.3.6.1.4.1.529.15.3.0"); - break; - - // UCD CPU combined load (user + system) - case 3: temp = snmp_get(info, ".1.3.6.1.4.1.2021.11.9.0"); - temp2 = snmp_get(info, ".1.3.6.1.4.1.2021.11.10.0"); - if ( (temp != "U") && (temp2 != "U") ) - { - test_result = inttostr(strtoint(temp) + strtoint(temp2)); - } - break; - - // Windows disk usage % - case 4: - temp = snmp_get(info, expand_parameters(info, ".1.3.6.1.2.1.25.2.3.1.5.%dskIndex%")); - disk_total = (float) strtoul(temp.c_str(), NULL, 10); - temp = snmp_get(info, expand_parameters(info, ".1.3.6.1.2.1.25.2.3.1.6.%dskIndex%")); - disk_used = (float) strtoul(temp.c_str(), NULL, 10); - if (disk_total != 0) - test_result = inttostr((int) (100*disk_used/disk_total)); - break; - - // UCD Swap utilization % - case 5: - temp = snmp_get(info, ".1.3.6.1.4.1.2021.4.3.0"); - disk_total = (float) strtoul(temp.c_str(), NULL, 10); - temp = snmp_get(info, ".1.3.6.1.4.1.2021.4.4.0"); - disk_used = (float) strtoul(temp.c_str(), NULL, 10); - if (disk_total != 0) - test_result = inttostr((int) (100 - 100*disk_used/disk_total)); - break; - - // read value from file - case 6: test_result = read_value_from_file(info); - break; - - // report SNMP avoidance status - case 7: test_result = inttostr(info.snmp_avoid); - break; - - // Windows CPU usage % - case 8: - WinCPUList = snmp_walk(info, ".1.3.6.1.2.1.25.3.3.1.2"); // hrProcessorLoad - - nCPUs = 0; sum = 0; - for (list::iterator current = WinCPUList.begin(); - current != WinCPUList.end(); - current++) { - - nCPUs++; - sum += strtoul(current->value.c_str(), NULL, 10); - } - if (nCPUs > 0) { - test_result = inttostr(sum / nCPUs); - } else { - test_result = "U"; - } - break; - - default: debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown Internal Test (" + inttostr(info.test_id) + ")"); - } - - return test_result; -} - -string process_sql_monitor(DeviceInfo info, MYSQL *mysql) -{ - MYSQL test_mysql; - MYSQL_RES *mysql_res, *test_res; - MYSQL_ROW mysql_row, test_row; - string value = "U"; - - string query = - string("SELECT host, user, password, query, column_num, timeout FROM tests_sql WHERE id = ") + inttostr(info.test_id); - mysql_res = db_query(mysql, &info, query); - - // if the sql test exists - if (mysql_res && - (mysql_num_rows(mysql_res) == 1) && - (mysql_row = mysql_fetch_row(mysql_res)) && - (mysql_row[0] != NULL)) - { - string host = expand_parameters(info, mysql_row[0]); - string user = expand_parameters(info, mysql_row[1]); - string password = expand_parameters(info, mysql_row[2]); - string test_query = expand_parameters(info, mysql_row[3]); - debuglogger(DEBUG_GATHERER, LEVEL_DEBUG, &info, "MySQL Query Test ({'" + - host + "'}, {'" + user + "'}, {'" + password + "'}, '" + test_query + "', '" + - string(mysql_row[4]) + "')"); - - netmrg_mutex_lock(lkMySQL); - mysql_init(&test_mysql); - uint timeout = strtoint(mysql_row[5]); - mysql_options(&test_mysql, MYSQL_OPT_CONNECT_TIMEOUT, (const char *) &timeout); - - if (!(MYSQL_CONNECT(&test_mysql,host.c_str(),user.c_str(),password.c_str(), NULL, 0, NULL, 0))) - { - netmrg_mutex_unlock(lkMySQL); - debuglogger(DEBUG_GATHERER, LEVEL_WARNING, &info, "Test MySQL Connection Failure."); - } - else - { - netmrg_mutex_unlock(lkMySQL); - if (mysql_query(&test_mysql, test_query.c_str())) - { - debuglogger(DEBUG_GATHERER, LEVEL_WARNING, &info, "Test MySQL Query Failed (" + test_query + ")"); - } - else - if (!(test_res = mysql_store_result(&test_mysql))) - { - debuglogger(DEBUG_GATHERER, LEVEL_WARNING, &info, "Test MySQL Store Result failed."); - } - else - { - test_row = mysql_fetch_row(test_res); - if (test_row != NULL) - { - if (test_row[strtoint(mysql_row[4])] != NULL) - { - value = string(test_row[strtoint(mysql_row[4])]); - } - else - { - debuglogger(DEBUG_GATHERER, LEVEL_NOTICE, &info, "Selected column is NULL."); - } - } - else - { - debuglogger(DEBUG_GATHERER, LEVEL_NOTICE, &info, "There are no rows."); - } - mysql_free_result(test_res); - mysql_close(&test_mysql); - } - } - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown SQL Test (" + inttostr(info.test_id) + ")."); - } - - mysql_free_result(mysql_res); - return value; -} - -string process_script_monitor(DeviceInfo info, MYSQL *mysql) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - string value; - - string query = - string("SELECT cmd, data_type FROM tests_script WHERE id = ") + - inttostr(info.test_id); - mysql_res = db_query(mysql, &info, query); - - // if the script test exists - if (mysql_res && - (mysql_num_rows(mysql_res) == 1) && - (mysql_row = mysql_fetch_row(mysql_res)) - && (mysql_row[0] != NULL)) - { - string command = expand_parameters(info, string(mysql_row[0])); - if (command[0] != '/') - command = get_setting(setPathLibexec) + "/" + command; - - char **env; - params_to_env(info, env); - - debuglogger(DEBUG_GATHERER, LEVEL_INFO, &info, "Sending '" + command + "' to shell."); - - pid_t pid; - char *argv[4]; - argv[0] = "sh"; - argv[1] = "-c"; - argv[2] = (char *) command.c_str(); - argv[3] = NULL; - - // if error code is desired - if (strtoint(mysql_row[1]) == 1) - { - int status = 0; - - switch (pid = fork()) - { - case -1: - // an error occurred during fork()ing - debuglogger(DEBUG_GATHERER, LEVEL_ERROR, &info, "fork() failed."); - value = "U"; - break; - case 0: - // we're the child - execve("/bin/sh", argv, env); - exit(127); // if we get here, execve() has failed - break; - default: - // we're the parent - while ( (waitpid(pid, &status, 0) == -1) && (errno == EINTR) ); - if (WIFEXITED(status)) - { - // the process terminated normally, return the error code - value = inttostr(WEXITSTATUS(status)); - } - else - { - // the process did not terminate normally, return "unknown" - debuglogger(DEBUG_MONITOR, LEVEL_NOTICE, &info, "external process terminated abnormally."); - value = "U"; - } - break; - } - } - // stdout is desired - else - { - - int status = 0; - int pdes[2]; - volatile int parent_fd, child_fd; - int perr = 0; - - //netmrg_mutex_lock(lkPipe); - perr = pipe(pdes); - //netmrg_mutex_unlock(lkPipe); - - if (perr < 0) - { - debuglogger(DEBUG_GATHERER, LEVEL_ERROR, &info, "pipe() failed."); - value = "U"; - } - else - { - parent_fd = pdes[0]; - child_fd = pdes[1]; - char buf[256]; - size_t len; - - /*fd_set fds; - struct timeval timeout;*/ - - switch (pid = fork()) - { - case -1: - // an error occurred during fork()ing - close(pdes[0]); - close(pdes[1]); - debuglogger(DEBUG_GATHERER, LEVEL_ERROR, &info, "fork() failed."); - value = "U"; - break; - case 0: - // we're the child - close(parent_fd); - if (child_fd != STDOUT_FILENO) - { - dup2(child_fd, STDOUT_FILENO); - close(child_fd); - } - execve("/bin/sh", argv, env); - exit(127); // if we get here, execve() has failed - break; - default: - // we're the parent - - debuglogger(DEBUG_MONITOR, LEVEL_DEBUG, &info, "external process pid is " + inttostr(pid) + ", our fd is " + inttostr(parent_fd)); - close(child_fd); - - /* select() will be useful eventually for limiting the time spent on external progs - but not now - FD_ZERO(&fds); - FD_SET(parent_fd,&fds); - timeout.tv_sec = 5; - timeout.tv_usec = 0; - - // wait 5 seonds for pipe response - switch(select(parent_fd + 1, &fds, NULL, NULL, &timeout)) - { - case -1: debuglogger(DEBUG_GATHERER, LEVEL_ERROR, &info, "select() failed."); break; - case 0: debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "select() timed out."); break; - default: debuglogger(DEBUG_MONITOR, LEVEL_DEBUG, &info, "select() succeeded."); break; - } - */ - - /* move this block to the bottom of read when using select() */ - while ( (waitpid(pid, &status, 0) == -1) && (errno == EINTR) ); - if (!WIFEXITED(status)) - { - // the process did not terminate normally - debuglogger(DEBUG_MONITOR, LEVEL_NOTICE, &info, "external process terminated abnormally."); - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_DEBUG, &info, "external process terminated normally (" + inttostr(WEXITSTATUS(status)) + ")"); - } - - if ((len = read(parent_fd, (void *) buf, 255)) == -1) - { - // error during read - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "read() failed."); - value = "U"; - } - else - { - debuglogger(DEBUG_MONITOR, (len == 0 ? LEVEL_NOTICE : LEVEL_DEBUG), &info, "read() provided " + inttostr(len) + " bytes."); - buf[len] = '\0'; - value = string(buf); - if (len == 0) value = "U"; - } - - close(parent_fd); - - break; - } - } - } - free_env(info, env); - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown Script Test (" + inttostr(info.test_id) + ")."); - value = "U"; - } - - mysql_free_result(mysql_res); - - return value; - -} - -string process_snmp_monitor(DeviceInfo info, MYSQL *mysql) -{ - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - string value; - - string query = - string("SELECT oid, type, subitem FROM tests_snmp WHERE id = ") + - inttostr(info.test_id); - - mysql_res = db_query(mysql, &info, query); - - // if the snmp test exists - if (mysql_res && - (mysql_num_rows(mysql_res) == 1) && - (mysql_row = mysql_fetch_row(mysql_res)) && - (mysql_row[0] != NULL)) - { - string oid = expand_parameters(info, mysql_row[0]); - int type = strtoint(mysql_row[1]); - int subitem = strtoint(mysql_row[2]); - - if (info.snmp_avoid == 0) - { - list result; - list::iterator x; - - switch (type) - { - case 0: - // plain "get" - value = snmp_get(info, oid); - break; - - case 1: - // walk to Nth item - result = snmp_walk(info, oid); - result.reverse(); // sigh, it's upside-down - x = result.begin(); - for (int k = 0; k < subitem; k++) - { - if (x == result.end()) - { - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "There is no subitem in position " + inttostr(subitem) + "."); - value = "U"; - break; - } - else - { - value = x->value; - x++; - } - } - break; - - case 2: - // count of walked items - result = snmp_walk(info, oid); - value = inttostr(result.size()); - break; - - default: - value = "U"; - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown SNMP Test Type (" + inttostr(type) + ")."); - } - - } - else - { - value = "U"; - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Avoided."); - } - } - else - { - value = "U"; - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown SNMP Test (" + inttostr(info.test_id) + ")."); - } - - mysql_free_result(mysql_res); - - return value; -} - -uint process_monitor(DeviceInfo info, MYSQL *mysql, RRDInfo rrd) -{ - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Starting Monitor."); - - info.parameters.push_front(ValuePair("parameters", info.test_params)); - - switch (info.test_type) - { - case 1: info.curr_val = process_script_monitor(info, mysql); - break; - - case 2: info.curr_val = process_snmp_monitor(info, mysql); - break; - - case 3: info.curr_val = process_sql_monitor(info, mysql); - break; - - case 4: info.curr_val = process_internal_monitor(info, mysql); - break; - - default: debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Unknown test type (" + inttostr(info.test_type) + ")."); - info.curr_val = "U"; - - } // end switch - - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Value: " + strstripnl(info.curr_val)); - - // strip out anything not numeric - info.curr_val = remove_nonnumerics(info.curr_val); - - if (rrd.data_type != "") - { - update_monitor_rrd(info, rrd); - } - - // what type of value are we dealing with? - if (info.curr_val == "U") - { - // value is unknown - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Value is unknown."); - } - else if (info.curr_val == inttostr(strtoint(info.curr_val))) - { - // value is an integer - // (do nothing) - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Value is an integer."); - } - else if (info.curr_val == "") - { - // value is non-numeric - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Value is not numeric."); - info.curr_val = "U"; - } - else - { - //value is probably decimal - debuglogger(DEBUG_MONITOR, LEVEL_INFO, &info, "Value is a decimal."); - info.curr_val = inttostr(ROUND_VAL(strtodec(info.curr_val))); - } - - if ((info.curr_val == "U") || (info.last_val == "U")) - { - info.delta_val = "U"; - info.rate_val = "U"; - } - else - { - info.delta_val = inttostr(strtoint(info.curr_val) - strtoint(info.last_val)); - if (info.delta_time != 0) - { - info.rate_val = inttostr(strtoint(info.delta_val) / info.delta_time); - } - else - { - info.rate_val = "U"; - } - } - - // populate parameters - info.parameters.push_front(ValuePair("current_value", info.curr_val)); - info.parameters.push_front(ValuePair("delta_value", info.delta_val)); - info.parameters.push_front(ValuePair("rate_value", info.rate_val)); - info.parameters.push_front(ValuePair("last_value", info.last_val)); - - uint status = process_events(info, mysql); - - info.status = status; - update_monitor_db(info, mysql, rrd); - - return status; -} - -// update_monitor_db -// -// update the database with current values for a monitor - -void update_monitor_db(DeviceInfo info, MYSQL *mysql, RRDInfo rrd) -{ - if (info.curr_val == "U") - { - info.curr_val = "NULL"; - } - - if (info.delta_val == "U") - { - info.delta_val = "NULL"; - } - - db_update(mysql, &info, "UPDATE monitors SET tuned=1, last_val=" + info.curr_val + - ", delta_val=" + info.delta_val + - ", delta_time=UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(last_time), "+ - "last_time=NOW(), status=" + inttostr(info.status) + - " WHERE id=" + inttostr(info.monitor_id)); -} - -// expand_parameters -// -// expand parameters within a string - -string expand_parameters(DeviceInfo &info, string input) -{ - for (list::iterator current = info.parameters.begin(); current != info.parameters.end(); current++) - { - input = token_replace(input, "%" + current->name + "%", current->value); - } - return input; -} - -void params_to_env(DeviceInfo &info, char ** &env) -{ - int count = info.parameters.size() + 1; - env = new char* [count]; - int i = 0; - for (list::iterator current = info.parameters.begin(); current != info.parameters.end(); current++) - { - string env_string = "netmrg_" + current->name + "=" + current->value; - env[i] = new char[env_string.length() + 1]; - strncpy(env[i], env_string.c_str(), env_string.length() + 1); - i++; - } - env[count - 1] = NULL; - - for (int i = 0; i < count; i++) - if (env[i] != NULL) - debuglogger(DEBUG_MONITOR, LEVEL_DEBUG, &info, string("Env: ") + env[i]); -} - -void free_env(DeviceInfo &info, char ** &env) -{ - for (int i = 0; i < info.parameters.size() + 1; i++) - delete [] env[i]; - delete [] env; -} - diff -Nurb netmrg-0.19/src/netmrg.cpp netmrg-0.20/ChangeLog/src/netmrg.cpp --- netmrg-0.19/src/netmrg.cpp 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/netmrg.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,543 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* netmrg.cpp -* NetMRG Gatherer -* -* see doc/LICENSE for copyright information -********************************************/ - -/* - - NetMRG Monitoring Procedure - Copyright 2001-2006 Brady Alleman. All Rights Reserved. - - MySQL examples from http://mysql.turbolift.com/mysql/chapter4.php3 - pthreads examples from http://www.math.arizona.edu/swig/pthreads/threads.html - net-snmp examples from http://net-snmp.sf.net/ - Thanks to Patrick Haller (http://haller.ws) for helping to debug threading in the original gatherer. - -*/ - -#include "common.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace std; - -int active_threads = 0; -bool netmrg_terminated = false; - -// Include the NetMRG Headers -#include "types.h" -#include "utils.h" -#include "locks.h" -#include "settings.h" -#include "snmp.h" -#include "db.h" -#include "rrd.h" -#include "mappings.h" -#include "devices.h" - -ScheduleType schedule = schOnce; - -#ifdef OLD_MYSQL -#define MYSQL_THREAD_INIT -#define MYSQL_THREAD_END -#else -#define MYSQL_THREAD_INIT mysql_thread_init() -#define MYSQL_THREAD_END mysql_thread_end() -#endif - - -// child - the thread spawned to process each device -void *child(void * arg) -{ - int device_id = *(int *) arg; - - MYSQL_THREAD_INIT; - - process_device(device_id); - - netmrg_mutex_lock(lkActiveThreads); - active_threads--; - netmrg_cond_signal(cActiveThreads); - netmrg_mutex_unlock(lkActiveThreads); - - MYSQL_THREAD_END; - - pthread_exit(0); - -} // end child - -// remove lock file -void remove_lockfile() -{ - unlink(get_setting(setPathLockFile).c_str()); -} - -// SIGTERM signal handler -void handle_sigterm(int signum) -{ - netmrg_terminated = true; -} - -// Say we're going away due to SIGTERM -void saydie() -{ - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Caught signal, shutting down."); -} - -// set things up, and spawn the threads for data gathering -void run_netmrg() -{ - init_logging(); - debuglogger(DEBUG_GLOBAL, LEVEL_NOTICE, NULL, "NetMRG starting."); - - pid_t mypid = getpid(); - FILE *lockfile; - - // check for existing lockfile - if (file_exists(get_setting(setPathLockFile))) - { - lockfile = fopen(get_setting(setPathLockFile).c_str(), "r"); - pid_t otherpid; - fscanf(lockfile, "%d", &otherpid); - fclose(lockfile); - - // if we could have sent the signal, or if the problem wasn't finding the PID, die. - if ( (kill(otherpid, 0) != -1) || (errno != ESRCH) ) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, - "Critical: Another instance of NetMRG appears to be running. (PID " + inttostr(otherpid) + ")"); - exit(254); - } - else - { - debuglogger(DEBUG_GLOBAL, LEVEL_NOTICE, NULL, "Removing stale lock file."); - remove_lockfile(); - } - } - - // create lockfile - debuglogger(DEBUG_GLOBAL, LEVEL_INFO, NULL, "Creating Lockfile."); - if ((lockfile = fopen(get_setting(setPathLockFile).c_str(),"w+")) != NULL) - { - fprintf(lockfile, "%d", mypid); - fclose(lockfile); - atexit(remove_lockfile); - } - else - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, string("Critical: Lockfile creation failure. (") + strerror(errno) + ")"); - exit(2); - } - - // SNMP library initialization - snmp_init(); - atexit(snmp_cleanup); - - // RRDTOOL command pipe setup - rrd_init(); - atexit(rrd_cleanup); - - // Setup SIGTERM/SIGINT catching - struct sigaction term_sigaction; - term_sigaction.sa_handler = &handle_sigterm; - if (sigaction(SIGTERM, &term_sigaction, NULL)) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Failed to add signal handler."); - exit(10); - } - if (sigaction(SIGINT, &term_sigaction, NULL)) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Failed to add signal handler."); - exit(10); - } - - - do - { - time_t start_time = time(NULL); - - // open mysql connection for initial queries - MYSQL mysql; - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - if (!db_connect(&mysql)) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Critical: Master database connection failed."); - exit(3); - } - - // verify the database version matches the gatherer version - mysql_res = db_query(&mysql, NULL, "SELECT version FROM versioninfo WHERE module = 'Main'"); - mysql_row = mysql_fetch_row(mysql_res); - if (string(mysql_row[0]) != string(NETMRG_VERSION)) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, string("Critical: Database version (") + mysql_row[0] + ") and gatherer version (" + NETMRG_VERSION + ") do not match."); - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Log into the web interface to perform the database upgrade."); - exit(4); - } - mysql_free_result(mysql_res); - - // request list of devices to process - mysql_res = db_query(&mysql, NULL, "SELECT id FROM devices WHERE disabled=0 ORDER BY id"); - - long int num_rows = mysql_num_rows(mysql_res); - pthread_t* threads = new pthread_t[num_rows]; - int* ids = new int[num_rows]; - - // reading settings isn't necessarily efficient. storing them locally. - int THREAD_COUNT = get_setting_int(setThreadCount); - - int dev_counter = 0; - - // deploy more threads as needed - int last_active_threads = 0; - - netmrg_mutex_lock(lkActiveThreads); - - while (dev_counter < num_rows) - { - debuglogger(DEBUG_THREAD, LEVEL_INFO, NULL, "[ACTIVE] Last: " + - inttostr(last_active_threads) + ", Now: " + - inttostr(active_threads)); - last_active_threads = active_threads; - - while ((active_threads < THREAD_COUNT) && (dev_counter < num_rows)) - { - mysql_row = mysql_fetch_row(mysql_res); - int dev_id = strtoint(string(mysql_row[0])); - ids[dev_counter] = dev_id; - pthread_create(&threads[dev_counter], NULL, child, &ids[dev_counter]); - pthread_detach(threads[dev_counter]); - dev_counter++; - active_threads++; - } - - netmrg_cond_wait(cActiveThreads, lkActiveThreads); - if (netmrg_terminated) - { - saydie(); - break; - } - - } - - // wait until all threads exit - while (active_threads != 0) - { - netmrg_cond_wait(cActiveThreads, lkActiveThreads); - - debuglogger(DEBUG_THREAD, LEVEL_INFO, NULL, "[PASSIVE] Last: " + - inttostr(last_active_threads) + ", Now: " + - inttostr(active_threads)); - last_active_threads = active_threads; - } - - netmrg_mutex_unlock(lkActiveThreads); - - // free active devices results - mysql_free_result(mysql_res); - - delete [] threads; - delete [] ids; - - // clean up mysql - mysql_close(&mysql); - debuglogger(DEBUG_GLOBAL, LEVEL_INFO, NULL, "Closed MySQL connection."); - - // determine runtime and store it - long int run_time = time( NULL ) - start_time; - debuglogger(DEBUG_GLOBAL, LEVEL_INFO, NULL, "Runtime: " + inttostr(run_time)); - FILE *runtime; - if ((runtime = fopen(get_setting(setPathRuntimeFile).c_str(),"w+"))) - { - fprintf(runtime, "%ld", run_time); - fclose(runtime); - } - else - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, "Failed to open runtime file for writing."); - } - - if ((schedule == schWait) && (!netmrg_terminated)) - { - if ( time(NULL) > (start_time + get_setting_int(setPollInterval))) - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, "We're running behind!"); - } - else - { - timespec tosleep, unslept; - tosleep.tv_sec = start_time + get_setting_int(setPollInterval) - time(NULL); - while (nanosleep(&tosleep, &unslept)) - { - if ((errno == EINTR) && (netmrg_terminated)) - { - saydie(); - break; - } - tosleep.tv_sec = unslept.tv_sec; - } - - } - } - } - while ((schedule != schOnce) && (!netmrg_terminated)); -} - -void show_version() -{ - printf("\nNetMRG Data Gatherer\n"); - printf("Version %s\n\n", NETMRG_VERSION); -} - -void show_usage() -{ - show_version(); - - printf("General:\n"); - printf("-v Display Version\n"); - printf("-h Show usage (you are here)\n"); - printf("-C Use alternate configuration file \n"); - printf("-t Limits number of simultaneous threads to \n"); - printf("-X Become a daemon.\n"); - printf("-M Scheduling mode, is:\n"); - printf(" once = return after one gather cycle (default).\n"); - printf(" wait = gather once every interval, waiting between intervals.\n"); - - printf("\nMode of Operation:\n"); - printf("-i Recache the interfaces of device \n"); - printf("-d Recache the disks of device \n"); - printf("-K Parse config file , or default if omitted (for syntax checking)\n"); - printf("If no mode is specified, the default is to gather data for all enabled devices.\n"); - - printf("\nLogging:\n"); - printf("-S Syslog; output logs to syslog instead of stdout.\n"); - printf("-b Bland; disable color output.\n"); - printf("-a All; display all debug messages.\n"); - printf("-m Most; display more than the default.\n"); - printf("-q Quiet; display no debug messages.\n"); - printf("-c Use debug component mask .\n"); - printf("-l Use debug level mask .\n"); - printf("-s Safe; omit potentially sensitive information.\n"); - - printf("\nDatabase Settings:\n"); - printf("-H Use database server on \n"); - printf("-D Use database named \n"); - printf("-u Use database user name \n"); - printf("-p Use database password , will prompt for password if is omitted\n"); - - printf("\n"); -} - -void external_snmp_recache(int device_id, int type) -{ - MYSQL mysql; - MYSQL_RES *mysql_res; - MYSQL_ROW mysql_row; - DeviceInfo info; - - if (!db_connect(&mysql)) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, NULL, "Critical: Master database connection failed."); - exit(3); - } - - info.device_id = device_id; - - mysql_res = db_query(&mysql, &info, string("SELECT ip, snmp_read_community, snmp_version, snmp_port, ") + - "snmp_timeout, snmp_retries FROM devices WHERE id=" + inttostr(device_id)); - mysql_row = mysql_fetch_row(mysql_res); - - if (mysql_row == NULL) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, &info, "Device does not exist."); - exit(1); - } - - info.snmp_version = strtoint(mysql_row[2]); - - if (info.snmp_version == 0) - { - debuglogger(DEBUG_GLOBAL, LEVEL_CRITICAL, &info, "Can't recache a device without SNMP."); - exit(1); - } - - info.ip = mysql_row[0]; - info.snmp_read_community = mysql_row[1]; - info.snmp_port = strtoint(mysql_row[3]); - info.snmp_timeout = strtoint(mysql_row[4]); - info.snmp_retries = strtoint(mysql_row[5]); - - mysql_free_result(mysql_res); - - snmp_init(); - snmp_session_init(info); - switch (type) - { - case 1: do_snmp_interface_recache(&info, &mysql); break; - case 2: do_snmp_disk_recache(&info, &mysql); break; - } - snmp_session_cleanup(info); - snmp_cleanup(); - mysql_close(&mysql); -} - -// daemonize - make us lurk around the system -void daemonize() -{ - pid_t pid; - - pid = fork(); - if (pid < 0) - { - // failed to fork, keep going with this process - fprintf(stderr, "Failed to fork; unable to daemonize.\n"); - fprintf(stderr, "Continuing in the foreground.\n"); - return; - } - else if (pid != 0) - { - // fork successful, and we're the parent, time to die. - exit(0); - } - else - { - // we're the child, keep going - setsid(); - chdir("/"); - umask(0); - return; - } -} - -// main - the body of the program -int main(int argc, char **argv) -{ - int option_char; - load_settings_default(); - load_settings_file(DEF_CONFIG_FILE); - string temppass; - - if (vt100_compatible()) - { - set_log_method(LOG_METHOD_VT100); - } - - while ((option_char = getopt(argc, argv, "hvXSqasmbM:i:d:c:l:H:D:u:p::t:C:K::")) != EOF) - switch (option_char) - { - case 'h': show_usage(); - exit(0); - break; - case 'v': show_version(); - exit(0); - break; - case 'M': if (strcmp(optarg, "once") == 0) - schedule = schOnce; - else if (strcmp(optarg, "wait") == 0) - schedule = schWait; - else - fprintf(stderr, "I don't know what schedule '%s' is. Using default.\n", optarg); - break; - case 'i': external_snmp_recache(strtoint(optarg), 1); - exit(0); - break; - case 'X': daemonize(); - break; - case 'S': set_log_method(LOG_METHOD_SYSLOG); - break; - case 'b': set_log_method(LOG_METHOD_STDOUT); - break; - case 'd': external_snmp_recache(strtoint(optarg), 2); - exit(0); - break; - case 'c': set_debug_components(strtoint(optarg)); - break; - case 'l': set_debug_level(strtoint(optarg)); - break; - case 'q': set_debug_level(0); - break; - case 'a': set_debug_level(LEVEL_ALL); - set_debug_components(DEBUG_ALL); - break; - case 'm': set_debug_level(LEVEL_MOST); - set_debug_components(DEBUG_MOST); - break; - case 's': set_debug_safety(true); - break; - case 'H': set_setting(setDBHost, optarg); - break; - case 'D': set_setting(setDBDB, optarg); - break; - case 'u': set_setting(setDBUser, optarg); - break; - case 'p': if (optarg != NULL) - { - // if password specified, use it - temppass = string(optarg); - // obscure password from process listing - while (*optarg) *optarg++= 'x'; - } - else - { - /* Make sure stdin is a terminal */ - if (!isatty(STDIN_FILENO)) - { - fprintf(stderr, "Not bound to a terminal. Using empty string for password.\n"); - temppass = ""; - } - else - { - // Save terminal settings - struct termios saved_tattr; - tcgetattr (STDIN_FILENO, &saved_tattr); - - // don't echo input - struct termios tattr; - tcgetattr (STDIN_FILENO, &tattr); - tattr.c_lflag &= (ICANON|ECHONL|ISIG); - tattr.c_lflag &= -ECHO; - tcsetattr (STDIN_FILENO, TCSANOW, &tattr); - - // if password not specified, prompt for it - cout << "Password: "; - cin >> temppass; - - // Restore terminal settings - tcsetattr (STDIN_FILENO, TCSANOW, &saved_tattr); - } - } - set_setting(setDBPass, temppass); - break; - case 't': set_setting(setThreadCount, optarg); - break; - case 'C': load_settings_file(optarg); - break; - case 'K': set_debug_level(LEVEL_DEBUG); - set_debug_components(DEBUG_GLOBAL); - if (optarg != NULL) - { - load_settings_file(optarg); - } - print_settings(); - exit(0); - break; - - } - run_netmrg(); -} diff -Nurb netmrg-0.19/src/rrd.cpp netmrg-0.20/ChangeLog/src/rrd.cpp --- netmrg-0.19/src/rrd.cpp 2004-10-24 02:36:18.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/rrd.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,152 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* rrd.cpp -* NetMRG Gatherer RRDTOOL integration -* -* see doc/LICENSE for copyright information -********************************************/ - -#include - -#include "common.h" -#include "rrd.h" -#include "utils.h" -#include "locks.h" -#include "settings.h" - -// RRDTOOL Pipe -FILE *rrdtool_pipe; - -void rrd_init() -{ - debuglogger(DEBUG_GLOBAL + DEBUG_RRD, LEVEL_INFO, NULL, "Initializing RRDTOOL pipe."); - string rrdtool = get_setting(setPathRRDTOOL) + " - "; - if (!(get_debug_components() & DEBUG_RRD) || !(get_debug_level() & LEVEL_DEBUG)) - rrdtool = rrdtool + " >/dev/null"; - rrdtool_pipe = popen(rrdtool.c_str(), "w"); - if (!rrdtool_pipe) - { - debuglogger(DEBUG_GLOBAL + DEBUG_RRD, LEVEL_CRITICAL, NULL, "Failed to initialize RRDTOOL pipe."); - exit(3); - } - - // sets buffering to one line - setlinebuf(rrdtool_pipe); -} - -void rrd_cleanup() -{ - if (rrdtool_pipe) - { - pclose(rrdtool_pipe); - debuglogger(DEBUG_GLOBAL + DEBUG_RRD, LEVEL_INFO, NULL, "Closed RRDTOOL pipe."); - } - else - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, "Tried to close RRDTOOL pipe before opening it."); - } -} - -// rrd_cmd -// -// issues a command to RRDTOOL via the RRDTOOL pipe, and logs it - -void rrd_cmd(DeviceInfo info, string cmd) -{ - debuglogger(DEBUG_RRD, LEVEL_DEBUG, &info, "RRD: '" + cmd + "'"); - cmd = " " + cmd + "\n"; - - netmrg_mutex_lock(lkRRD); - fprintf(rrdtool_pipe, cmd.c_str()); - netmrg_mutex_unlock(lkRRD); -} - -// get_rrd_file -// -// returns the name of the rrd file in use for a given monitor - -string get_rrd_file(string mon_id) -{ - string filename = get_setting(setPathRRDs) + "/mon_" + mon_id + ".rrd"; - return filename; -} - -// create_rrd -// -// creates a new RRD file - -void create_rrd(DeviceInfo info, RRDInfo rrd) -{ - string command; - int poll_interval = get_setting_int(setPollInterval); - - command = "create " + get_rrd_file(inttostr(info.monitor_id)) + - " --step " + inttostr(poll_interval) + " DS:mon_" + inttostr(info.monitor_id) + ":" - + rrd.data_type + ":" + inttostr(poll_interval * 2) + ":" + rrd.min_val + ":" + - rrd.max_val + " " + - /* Step: Interval; Capacity: 50 hours */ - "RRA:AVERAGE:0.5:1:" + inttostr(180000 / poll_interval) + " " + - /* Step: 30 mins; Capacity: 350 hours */ - "RRA:AVERAGE:0.5:" + inttostr(1800 / poll_interval) + ":700 " + - /* Step: 2 hours; Capacity: 1550 hours */ - "RRA:AVERAGE:0.5:" + inttostr(7200 / poll_interval) + ":775 " + - /* Step: 1 day; Capacity: 19128 hours */ - "RRA:AVERAGE:0.5:" + inttostr(86400 / poll_interval) + ":797 " + - - "RRA:LAST:0.5:1:" + inttostr(180000 / poll_interval) + " " + - "RRA:LAST:0.5:" + inttostr(1800 / poll_interval) + ":700 " + - "RRA:LAST:0.5:" + inttostr(7200 / poll_interval) + ":775 " + - "RRA:LAST:0.5:" + inttostr(86400 / poll_interval) + ":797 " + - - "RRA:MAX:0.5:1:" + inttostr(180000 / poll_interval) + " " + - "RRA:MAX:0.5:" + inttostr(1800 / poll_interval) + ":700 " + - "RRA:MAX:0.5:" + inttostr(7200 / poll_interval) + ":775 " + - "RRA:MAX:0.5:" + inttostr(86400 / poll_interval) + ":797" ; - rrd_cmd(info, command); -} - -// tune_rrd -// -// modifies the maximum and minimum values acceptable for a given RRD - -void tune_rrd(DeviceInfo info, RRDInfo rrd) -{ - string command = "tune " + get_rrd_file(inttostr(info.monitor_id)) + " -a mon_" + - inttostr(info.monitor_id) + ":" + rrd.max_val + - " -i mon_" + inttostr(info.monitor_id) + ":" + rrd.min_val; - rrd_cmd(info, command); -} - -// update_rrd -// -// update an RRD with a current value - -void update_rrd(DeviceInfo info, RRDInfo rrd) -{ - string command = "update " + get_rrd_file(inttostr(info.monitor_id)) + " N:" + strstripnl(info.curr_val); - rrd_cmd(info, command); -} - -// update_monitor_rrd -// -// for a monitor: -// 1. Create a RRD file if one doesn't exist. -// 2. Tune the RRD file if necessary. -// 3. Update the RRD file with current data. - -void update_monitor_rrd(DeviceInfo info, RRDInfo rrd) -{ - if (!(file_exists(get_rrd_file(inttostr(info.monitor_id))))) - { - create_rrd(info, rrd); - } - - if (rrd.tuned == 0) - { - tune_rrd(info, rrd); - } - - update_rrd(info, rrd); -} - diff -Nurb netmrg-0.19/src/settings.cpp netmrg-0.20/ChangeLog/src/settings.cpp --- netmrg-0.19/src/settings.cpp 2005-08-24 11:57:38.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/settings.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,273 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* settings.cpp -* NetMRG Gatherer Settings Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include -#include - -#include "settings.h" -#include "locks.h" -#include "utils.h" - -static string current_settings[settings_count]; - -string get_setting(Setting x) -{ - netmrg_mutex_lock(lkSettings); - string temp = current_settings[x]; - netmrg_mutex_unlock(lkSettings); - return temp; -} - -long int get_setting_int(Setting x) -{ - return strtoint(get_setting(x)); -} - -void set_setting(Setting x, const string & newvalue) -{ - netmrg_mutex_lock(lkSettings); - current_settings[x] = newvalue; - netmrg_mutex_unlock(lkSettings); -} - -void set_setting_int(Setting x, long int newvalue) -{ - set_setting(x, inttostr(newvalue)); -} - -void load_settings_default() -{ - // threads - set_setting_int(setThreadCount, DEF_THREAD_COUNT); - - // database - set_setting(setDBHost, DEF_DB_HOST); - set_setting(setDBUser, DEF_DB_USER); - set_setting(setDBPass, DEF_DB_PASS); - set_setting(setDBDB, DEF_DB_DB); - set_setting(setDBSock, DEF_DB_SOCK); - set_setting_int(setDBPort, DEF_DB_PORT); - set_setting_int(setDBTimeout, DEF_DB_TIMEOUT); - - // paths - set_setting(setPathRRDTOOL, DEF_RRDTOOL); - set_setting(setPathLockFile, DEF_LOCKFILE); - set_setting(setPathRuntimeFile, DEF_RUNTIME_FILE); - set_setting(setPathLibexec, DEF_LIBEXEC); - set_setting(setPathRRDs, DEF_RRDS); - set_setting(setPathLocale, DEF_LOCALE); - - // other - set_setting_int(setPollInterval, DEF_POLL_INTERVAL); - set_setting_int(setMaxDeviceLogEntries, DEF_MAX_DEV_LOG); - set_setting(setSyslogFacility, DEF_SYSLOG_FACILITY); - - // update intl info - setup_intl(); -} - -void print_settings() -{ - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "-- Database --"); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Host: " + get_setting(setDBHost)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "User: " + get_setting(setDBUser)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Pass: " + get_setting(setDBPass)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "DB: " + get_setting(setDBDB)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Sock: " + get_setting(setDBSock)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Port: " + get_setting(setDBPort)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Timeout: " + get_setting(setDBTimeout)); - - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "-- Threads --"); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Count: " + get_setting(setThreadCount)); - - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "-- Paths --"); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "RRDTOOL: " + get_setting(setPathRRDTOOL)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Lock File: " + get_setting(setPathLockFile)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Runtime File: " + get_setting(setPathRuntimeFile)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Libexec: " + get_setting(setPathLibexec)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "RRDs: " + get_setting(setPathRRDs)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Locale: " + get_setting(setPathLocale)); - - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "-- Other --"); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Poll Interval: " + get_setting(setPollInterval)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Max Dev Logs: " + get_setting(setMaxDeviceLogEntries)); - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, "Syslog Facility: " + get_setting(setSyslogFacility)); -} - -string xmltostring(const xmlChar * input) -{ - if (input == NULL) return string(""); - char temp[1024]; - snprintf(temp, 1023, "%s", input); - return string(temp); -} - -void parse_config_section(xmlDocPtr doc, xmlNodePtr cur, string section) -{ - // parses a section of an already loaded config file - xmlChar * value; - string val_str; - - debuglogger(DEBUG_GLOBAL, LEVEL_DEBUG, NULL, (string)_("Parsing config section") + " '" + section + "'"); - - cur = cur->xmlChildrenNode; - while (cur != NULL) - { - value = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); - val_str = string(xmltostring(value)); - if (section == "database") - { - if (!xmlStrcmp(cur->name, (const xmlChar *) "host")) - set_setting(setDBHost, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "user")) - set_setting(setDBUser, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "password")) - set_setting(setDBPass, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "db")) - set_setting(setDBDB, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "socket")) - set_setting(setDBSock, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "port")) - set_setting(setDBPort, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "timeout")) - set_setting(setDBTimeout, val_str); - } - else - if (section == "paths") - { - if (!xmlStrcmp(cur->name, (const xmlChar *) "rrdtool")) - set_setting(setPathRRDTOOL, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "lockfile")) - set_setting(setPathLockFile, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "runtimefile")) - set_setting(setPathRuntimeFile, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "libexec")) - set_setting(setPathLibexec, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "rrds")) - set_setting(setPathRRDs, val_str); - - if (!xmlStrcmp(cur->name, (const xmlChar *) "locale")) - set_setting(setPathLocale, val_str); - - } - else - if (section == "threads") - { - if (!xmlStrcmp(cur->name, (const xmlChar *) "count")) - set_setting(setThreadCount, val_str); - } - else - if (section == "polling") - { - if (!xmlStrcmp(cur->name, (const xmlChar *) "interval")) - set_setting(setPollInterval, val_str); - } - else - if (section == "logging") - { - if (!xmlStrcmp(cur->name, (const xmlChar *) "max_device_entries")) - set_setting(setMaxDeviceLogEntries, val_str); - if (!xmlStrcmp(cur->name, (const xmlChar *) "syslog_facility")) - set_setting(setSyslogFacility, val_str); - } - else - debuglogger(DEBUG_GLOBAL, LEVEL_WARNING, NULL, (string)_("Second stage parser not aware of this section.")); - xmlFree(value); - cur = cur->next; - } // end while not null -} // end parse_config_section() - -void load_settings_file(const string & filename) -{ - // parses xml-based config file - xmlDocPtr doc; - xmlNodePtr cur; - - doc = xmlParseFile(filename.c_str()); - if (doc == NULL) - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, (string)_("Failed to parse configuration file") + " (" + filename + ")"); - return; - } - - cur = xmlDocGetRootElement(doc); - - if (cur == NULL) - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, (string)_("Empty configuration file") + " (" + filename + ")"); - xmlFreeDoc(doc); - return; - } - - if (xmlStrcmp(cur->name, (const xmlChar *) "netmrg")) - { - debuglogger(DEBUG_GLOBAL, LEVEL_ERROR, NULL, (string)_("Configuration file of the wrong type. Root node is not 'netmrg.'") + " (" + filename + ")"); - xmlFreeDoc(doc); - return; - } - - cur = cur->xmlChildrenNode; - - // read each section of the config file - while (cur != NULL) - { - if ( - !xmlStrcmp(cur->name, (const xmlChar *) "database") || - !xmlStrcmp(cur->name, (const xmlChar *) "paths") || - !xmlStrcmp(cur->name, (const xmlChar *) "threads") || - !xmlStrcmp(cur->name, (const xmlChar *) "polling") || - !xmlStrcmp(cur->name, (const xmlChar *) "logging") - ) - { - parse_config_section(doc, cur, xmltostring(cur->name)); - } - else - if ( - !xmlStrcmp(cur->name, (const xmlChar *) "website") || - !xmlStrcmp(cur->name, (const xmlChar *) "rrdtool") || - !xmlStrcmp(cur->name, (const xmlChar *) "text") - ) - { - // ignored sections - } - else - debuglogger(DEBUG_GLOBAL, LEVEL_NOTICE, NULL, (string)_("Unexpected section in configuration file: ") + xmltostring(cur->name)); - - cur = cur->next; - } - - xmlFreeDoc(doc); - - // settings may have changed, reset intl info to be safe - setup_intl(); -} - -// setup_intl - internationalization support -void setup_intl() -{ - // use language settings from the environment - setlocale(LC_ALL, ""); - - // set the location of translation tables for the domain - bindtextdomain("netmrg", get_setting(setPathLocale).c_str()); - - // select the domain - textdomain("netmrg"); -} - diff -Nurb netmrg-0.19/src/snmp.cpp netmrg-0.20/ChangeLog/src/snmp.cpp --- netmrg-0.19/src/snmp.cpp 2005-01-17 04:46:16.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/snmp.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,403 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* snmp.cpp -* NetMRG Gatherer SNMP Library -* -* see doc/LICENSE for copyright information -********************************************/ - -/* - - NetMRG SNMP Functions - Copyright 2001-2003 Brady Alleman, All Rights Reserved. - - Some of this code was originally part of net-snmp's application and - example code. - -*/ - -#include "utils.h" -#include "locks.h" -#include "snmp.h" - -#ifdef HAVE_NET_SNMP -#include -#include -#include -#include -#define SNMP_SET_OIDS netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT, NETSNMP_OID_OUTPUT_NUMERIC) -#define SNMP_SET_LIBS netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_NUMERIC_ENUM, 1) -#define SNMP_SET_QKPR netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, 0) -#else -#define DS_APP_DONT_FIX_PDUS 0 -#include -#include -#include -#include -#define SNMP_SET_OIDS ds_toggle_boolean(DS_LIBRARY_ID, DS_LIB_PRINT_NUMERIC_OIDS) -#define SNMP_SET_LIBS ds_toggle_boolean(DS_LIBRARY_ID, DS_LIB_PRINT_NUMERIC_ENUM) -#define SNMP_SET_QKPR snmp_set_quick_print(0) -#endif - -void snmp_init() -{ - debuglogger(DEBUG_GLOBAL + DEBUG_SNMP, LEVEL_INFO, NULL, "Initializing SNMP library."); - init_snmp("NetMRG"); - SOCK_STARTUP; - struct snmp_session session; - snmp_sess_init(&session); - SNMP_SET_OIDS; - SNMP_SET_LIBS; - SNMP_SET_QKPR; -} - -void snmp_cleanup() -{ - SOCK_CLEANUP; - debuglogger(DEBUG_GLOBAL + DEBUG_SNMP, LEVEL_INFO, NULL, "Cleaned up SNMP."); -} - -string snmp_value(string input) -{ - input = input.erase(0, input.find(":",0) + 1); - input = input.erase(0, input.find("=",0) + 1); - while (!input.empty() && input[0] == ' ') - { - input = input.erase(0, 1); - } - while (!input.empty() && input[input.length() -1] == ' ') - { - input = input.erase(input.length() - 1, input.length()); - } - //input = token_replace(input, " ", ""); - - // handle an "empty" SNMPv2 response. - input = token_replace(input, "No Such Object available on this agent at this OID", ""); - - return input; -} - -string snmp_oid(string input) -{ - input = input.erase(input.find(" ",0), input.length()); - - return input; -} - -string snmp_result(variable_list *vars) -{ - u_char *buf = NULL; - size_t buf_len = 256, out_len = 0; - - buf = (u_char *) calloc(buf_len, 1); - sprint_realloc_variable(&buf, &buf_len, &out_len, 1, vars->name, vars->name_length, vars); - string result = (char *)buf; - free(buf); - - return result; -} - -void snmp_session_init(DeviceInfo &info) -{ - struct snmp_session session; - u_char u_temp[250]; - char temp[250]; - void * sessp; - - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "Starting SNMP Session."); - - // initialize session structure - snmp_sess_init(&session); - - // set hostname or IP address (and port) - snprintf(temp, 250, "%s:%d", info.ip.c_str(), info.snmp_port); - session.peername = temp; - - // set the SNMP version number - switch (info.snmp_version) - { - case 1: session.version = SNMP_VERSION_1; - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "SNMPv1"); - break; - case 2: session.version = SNMP_VERSION_2c; - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "SNMPv2c"); - break; - case 3: session.version = SNMP_VERSION_3; - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, "SNMPv3 - not yet supported."); - break; - } - - // set timeout/retry parameters - session.timeout = info.snmp_timeout; - session.retries = info.snmp_retries; - - char log[255]; - snprintf(log, 255, "Port: %d; Timeout: %ld; Retries: %d.", info.snmp_port, info.snmp_timeout, info.snmp_retries); - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, log); - - // set the SNMPv1/2c community name used for authentication - session.community = u_string(info.snmp_read_community, u_temp); - session.community_len = info.snmp_read_community.length(); - - netmrg_mutex_lock(lkSNMP); - sessp = snmp_sess_open(&session); - netmrg_mutex_unlock(lkSNMP); - - if (!sessp) - { - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, "SNMP Session Error."); - } - else - { - info.snmp_sess_p = sessp; - } - -} - -void snmp_session_cleanup(DeviceInfo &info) -{ - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "Cleaning up SNMP Session."); - snmp_sess_close(info.snmp_sess_p); - info.snmp_sess_p = NULL; -} - -// snmp_get - perform an snmpget on a host using the provided information -string snmp_get(DeviceInfo info, string oidstring) -{ - struct snmp_pdu *pdu; - struct snmp_pdu *response; - - oid anOID[MAX_OID_LEN]; - size_t anOID_len = MAX_OID_LEN; - - struct variable_list *vars; - int status; - string result; - char tempname[128]; - - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "SNMP Query ({'" + - info.ip + "'}, {'" + info.snmp_read_community + "'}, '" + - oidstring + "')"); - - if (!info.snmp_sess_p) - { - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, "SNMP Session Failure."); - return string("U"); - } - else - { - // Create the PDU for the data for our request. - pdu = snmp_pdu_create(SNMP_MSG_GET); - - strcpy(tempname, oidstring.c_str()); - if (!snmp_parse_oid(tempname, anOID, &anOID_len)) - { - return(string("U")); - } - else - snmp_add_null_var(pdu, anOID, anOID_len); - - status = snmp_sess_synch_response(info.snmp_sess_p, pdu, &response); - - if (response == NULL) - status = STAT_ERROR; - - /* - * Process the response. - */ - - if (status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR) - { - - /* - * SUCCESS: Print the result variables - */ - - if (status == STAT_SUCCESS) - { - vars = response->variables; - result = snmp_result(vars); - result = snmp_value(result); - } - else - { - result = string("U"); - } - } - - if (response) snmp_free_pdu(response); - - if (result.length() == 0) { result = "U"; } - - return result; - } -} - -string snmp_diff(DeviceInfo info, string oid1, string oid2) -{ - string val1 = snmp_get(info, oid1); - string val2 = snmp_get(info, oid2); - - if ( (val1 == "U") || (val2 == "U") ) - { - return "U"; - } - - return inttostr( strtoint(val1) - strtoint(val2) ); -} - -list snmp_trim_rootoid(list input, string rootoid) -{ - for (list::iterator current = input.begin(); current != input.end(); current++) - { - current->oid = token_replace(current->oid, rootoid, ""); - } - - return input; -} - -list snmp_swap_index_value(list input) -{ - for (list::iterator current = input.begin(); current != input.end(); current++) - { - string oid = current->oid; - string value = current->value; - - current->oid = value; - current->value = oid; - } - - return input; -} - -list snmp_walk(DeviceInfo info, string oidstring) -{ - struct snmp_pdu *pdu, *response; - variable_list *vars; - oid name[MAX_OID_LEN]; - size_t name_length = MAX_OID_LEN; - oid root[MAX_OID_LEN]; - size_t rootlen = MAX_OID_LEN; - int running; - int status; - int check = 0; - int exitval = 0; - list results; - - if (!info.snmp_sess_p) - { - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, "SNMP Session Failure."); - } - - char tempoid[128]; - strcpy(tempoid, oidstring.c_str()); - if (!snmp_parse_oid(tempoid, root, &rootlen)) - { - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, string("SNMP OID Parse Failure (") + tempoid + ")"); - } - - memmove(name, root, rootlen * sizeof(oid)); - name_length = rootlen; - - running = 1; - - while (running) - { - pdu = snmp_pdu_create(SNMP_MSG_GETNEXT); - snmp_add_null_var(pdu, name, name_length); - - status = snmp_sess_synch_response(info.snmp_sess_p, pdu, &response); - - if (response == NULL) - status = STAT_ERROR; - - if (status == STAT_SUCCESS) - { - if (response->errstat == SNMP_ERR_NOERROR) - { - for (vars = response->variables; vars; vars = vars->next_variable) - { - if ((vars->name_length < rootlen) || (memcmp(root, vars->name, rootlen * sizeof(oid)) != 0)) - { - running = 0; - continue; - } - string result = snmp_result(vars); - debuglogger(DEBUG_SNMP, LEVEL_DEBUG, &info, "OID: '" + snmp_oid(result) + "' VALUE: '" + snmp_value(result) + "'"); - results.push_front(SNMPPair(snmp_oid(result), snmp_value(result))); - if ((vars->type != SNMP_ENDOFMIBVIEW) && (vars->type != SNMP_NOSUCHOBJECT) && (vars->type != SNMP_NOSUCHINSTANCE)) - { - if (check && snmp_oid_compare(name, name_length, vars->name, vars->name_length) >= 0) - { - debuglogger(DEBUG_SNMP, LEVEL_WARNING, &info, "SNMP Error: OID not increasing"); - running = 0; - exitval = 1; - } - memmove((char *) name, (char *) vars->name, vars->name_length * sizeof(oid)); - name_length = vars->name_length; - } - else - { - running = 0; - } - } - } - else - { - running = 0; - if (response->errstat == SNMP_ERR_NOSUCHNAME) - { - debuglogger(DEBUG_SNMP, LEVEL_NOTICE, &info, "End of MIB"); - } - else - { - debuglogger(DEBUG_SNMP, LEVEL_WARNING, &info, string("SNMP Packet Error: ") + snmp_errstring(response->errstat)); - exitval = 2; - } - } - } - else - { - if (status == STAT_TIMEOUT) - { - debuglogger(DEBUG_SNMP, LEVEL_WARNING, &info, string("Timeout: No Response from ") + info.ip); - running = 0; - exitval = 1; - } - else - { - debuglogger(DEBUG_SNMP, LEVEL_ERROR, &info, string("SNMP Walk Error (") + inttostr(status) + ")"); - running = 0; - exitval = 1; - } - } - - if (response) - snmp_free_pdu(response); - } - - return results; -} - -long long int get_snmp_uptime(DeviceInfo info) -{ - string uptime; - char unparsed[100]; - char * parsed; - - uptime = snmp_get(info, string("system.sysUpTime.0")); - - if (uptime != "") - { - strcpy(unparsed,uptime.c_str()); - parsed = strtok(unparsed, "()"); - return strtoint(string(parsed)); - } - else - { - return 0; - } - -} // end get_snmp_uptime() - diff -Nurb netmrg-0.19/src/utils.cpp netmrg-0.20/ChangeLog/src/utils.cpp --- netmrg-0.19/src/utils.cpp 2008-09-07 18:20:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/src/utils.cpp 1970-01-01 05:30:00.000000000 +0530 @@ -1,553 +0,0 @@ -/******************************************** -* NetMRG Integrator -* -* utils.cpp -* NetMRG Gatherer Utilities Library -* -* see doc/LICENSE for copyright information -********************************************/ - -#include -#include -#include -#include -#include -#include - -#include "utils.h" -#include "db.h" -#include "settings.h" - -// vt100_compatible -// -// returns true if our terminal seems to be VT100 compatible -bool vt100_compatible() -{ - if (!isatty(STDOUT_FILENO)) return false; - char *term = getenv("TERM"); - if (!term) return false; - if (!strncasecmp(term, "linux", 5)) return true; - if (!strncasecmp(term, "xterm", 5)) return true; - if (!strncasecmp(term, "vt", 2)) return true; - return false; -} - -// file_exists -// -// evaluates to true if filename specifies an existing file - -int file_exists(string filename) -{ - struct stat file_stat; - return !(stat(filename.c_str(), &file_stat)); -} - -// strstripnl - given a string, return a string without new line at the end -string strstripnl(string input) -{ - string temp_str; - - if (input[input.length() - 1] == '\n') - { - temp_str = input.substr(0, input.length() - 1); - } - else - { - temp_str = input; - } - - return temp_str; - -} // end strstripnl - -// token_replace - replace a token with a value throughout a string -string token_replace(string &source, string token, string value) -{ - string::size_type i; - - while ((i = source.find(token)) != string::npos) - { - source.replace(i, token.length(), value); - } - - return source; -} - -// u_string - cast a string into a u_char array -u_char *u_string(string source, u_char *out) -{ - return (unsigned char *)source.c_str(); -} - - -// formatting functions - -// inttostr - converts an integer to a string -string inttostr(long long int int_to_convert) -{ - char temp_str[100]; - snprintf(temp_str, 100, "%lld", int_to_convert); - return string(temp_str); -} // end inttostr - -// strtoint - converts a string to an integer -long long int strtoint(string string_to_convert) -{ - return strtoll(string_to_convert.c_str(), NULL, 10); -} // end strtoint - -// timetostr - converts a unix timestamp to a nice format -string timetostr(const time_t timestamp) -{ - struct tm atm; - char tempstr[255]; - localtime_r(×tamp, &atm); - strftime(tempstr, 255, "%F %T", &atm); - return string(tempstr); -} - -// inttopadstr - converts a string to an integer, adding 0s to pad to a given length -string inttopadstr(int integer, int padlen) -{ - char tempstr[255]; - string format = string("%0") + inttostr(padlen) + string("d"); - snprintf(tempstr, 255, format.c_str(), integer); - return string(tempstr); -} // end inttopadstr - -// debuglogger - NetMRG's version of syslog - -// Debugging Options -static int debug_components = DEBUG_DEFAULT; -static int debug_level = LEVEL_DEFAULT; -static int log_method = LOG_METHOD_STDOUT; -static int syslog_facility = LOG_DAEMON; -static bool debug_safety = false; - -// Debugging Options Manipulations -void set_debug_level(int level) -{ - debug_level = level; -} - -int get_debug_level() -{ - return debug_level; -} - -void set_debug_components(int components) -{ - debug_components = components; -} - -int get_debug_components() -{ - return debug_components; -} - -void set_debug_safety(bool safety) -{ - debug_safety = safety; -} - -bool get_debug_safety() -{ - return debug_safety; -} - -void set_log_method(int method) -{ - log_method = method; -} - -int get_log_method() -{ - return log_method; -} - -int text_to_facility(string facility) -{ - if (facility == "LOG_KERN") - return LOG_KERN; - else if (facility == "LOG_USER") - return LOG_USER; - else if (facility == "LOG_MAIL") - return LOG_MAIL; - else if (facility == "LOG_DAEMON") - return LOG_DAEMON; - else if (facility == "LOG_AUTH") - return LOG_AUTH; - else if (facility == "LOG_SYSLOG") - return LOG_SYSLOG; - else if (facility == "LOG_LPR") - return LOG_LPR; - else if (facility == "LOG_NEWS") - return LOG_NEWS; - else if (facility == "LOG_UUCP") - return LOG_UUCP; - else if (facility == "LOG_CRON") - return LOG_CRON; - // these are not universally available - // until we autoconf this, uncomment to restore - /* - else if (facility == "LOG_AUTHPRIV") - return LOG_AUTHPRIV; - else if (facility == "LOG_FTP") - return LOG_FTP;*/ - - else if (facility == "LOG_LOCAL0") - return LOG_LOCAL0; - else if (facility == "LOG_LOCAL1") - return LOG_LOCAL1; - else if (facility == "LOG_LOCAL2") - return LOG_LOCAL2; - else if (facility == "LOG_LOCAL3") - return LOG_LOCAL3; - else if (facility == "LOG_LOCAL4") - return LOG_LOCAL4; - else if (facility == "LOG_LOCAL5") - return LOG_LOCAL5; - else if (facility == "LOG_LOCAL6") - return LOG_LOCAL6; - else if (facility == "LOG_LOCAL7") - return LOG_LOCAL7; - else return LOG_USER; -} - -// init_logging -void init_logging() -{ - if ( (log_method & LOG_METHOD_STDOUT) || (log_method & LOG_METHOD_VT100) ) - setlinebuf(stdout); - if ( log_method & LOG_METHOD_SYSLOG ) - syslog_facility = text_to_facility(get_setting(setSyslogFacility)); -} - - -int level_to_priority(int level) -{ - switch (level) - { - case LEVEL_EMERG: return LOG_EMERG; - case LEVEL_ALERT: return LOG_ALERT; - case LEVEL_CRITICAL: return LOG_CRIT; - case LEVEL_ERROR: return LOG_ERR; - case LEVEL_WARNING: return LOG_WARNING; - case LEVEL_NOTICE: return LOG_NOTICE; - case LEVEL_INFO: return LOG_INFO; - case LEVEL_DEBUG: return LOG_DEBUG; - default: return LOG_INFO; - } -} - -int level_to_color(int level) -{ - switch (level) - { - case LEVEL_EMERG: return COLOR_MAGENTA; - case LEVEL_ALERT: return COLOR_RED; - case LEVEL_CRITICAL: return COLOR_RED; - case LEVEL_ERROR: return COLOR_BROWN; - case LEVEL_WARNING: return COLOR_BROWN; - case LEVEL_NOTICE: return COLOR_CYAN; - case LEVEL_INFO: return COLOR_WHITE; - case LEVEL_DEBUG: return COLOR_GREEN; - default: return COLOR_WHITE; - } -} - -int level_to_attrib(int level) -{ - switch (level) - { - case LEVEL_EMERG: return ATTR_BRIGHT; - case LEVEL_ALERT: return ATTR_BRIGHT; - case LEVEL_ERROR: return ATTR_BRIGHT; - case LEVEL_NOTICE: return ATTR_DIM; - case LEVEL_INFO: return ATTR_RESET; - default: return ATTR_RESET; - } -} - - -// censor_message - replace the contents of braces with a 'Field Omitted' message -string censor_message(const string & message) -{ - string tempmsg = string(message); - string::size_type pos; - - while ((pos = tempmsg.find("{")) != string::npos) - { - tempmsg.replace(pos, tempmsg.find("}") - pos + 1, ""); - } - - return tempmsg; -} // end censor_message - -// remove_braces - erase braces from a string -string remove_braces(const string & message) -{ - string tempmsg = string(message); - string::size_type pos; - - while ((pos = tempmsg.find("{")) != string::npos) - { - tempmsg.erase(pos, 1); - } - - while ((pos = tempmsg.find("}")) != string::npos) - { - tempmsg.erase(pos, 1); - } - - return tempmsg; -} // end remove_braces - -// debuglogger -// -// component - the sum of the components this message pertains to -// level - the sum of the levels this message pertains to -// info - the DeviceInfo struct, used to display the context of the message -// message - the message, sensitive information enclosed in braces will be censored when desired -// -void debuglogger(int component, int level, const DeviceInfo * info, const string & message) -{ - // only proceed if this message is qualified for display - if ((debug_level & level) && (debug_components & component)) - { - string tempmsg = ""; - - // debug the debugging information - if ((debug_level & LEVEL_DEBUG) && (debug_components & DEBUG_LOGGING)) - { - tempmsg = tempmsg + string("[L: ") + inttopadstr(level, 4) + ", C: " + inttopadstr(component, 4) + "] "; - } - - // display context information - if (info != NULL) - { - if (info->device_id != -1) - { - tempmsg = tempmsg + string("[Dev: ") + inttopadstr(info->device_id, 4) + string("] "); - } - - if (info->subdevice_id != -1) - { - tempmsg = tempmsg + string("[Sub: ") + inttopadstr(info->subdevice_id, 4) + string("] "); - } - - if (info->monitor_id != -1) - { - tempmsg = tempmsg + string("[Mon: ") + inttopadstr(info->monitor_id, 4) + string("] "); - } - - if (info->event_id != -1) - { - tempmsg = tempmsg + string("[Ev: ") + inttopadstr(info->event_id, 4) + string("] "); - } - - if (info->response_id != -1) - { - tempmsg = tempmsg + string("[Resp: ") + inttopadstr(info->response_id, 4) + string("] "); - } - } // end display context information - - string context = tempmsg; - string fullmessage; - string content; - - // censor or remove censoring data as appropriate - if (debug_safety) - { - content = censor_message(message); - } - else - { - content = remove_braces(message); - } - - fullmessage = context + content; - - if (log_method & LOG_METHOD_STDOUT) - printf("%s\n", fullmessage.c_str()); - - // print the formatted message in color - if (log_method & LOG_METHOD_VT100) - printf("%c[%d;%dm%s%c[%d;%dm%s\n%c[%dm", ESC, ATTR_BRIGHT, COLOR_BLACK, context.c_str(), ESC, level_to_attrib(level), level_to_color(level), content.c_str(), ESC, ATTR_RESET); - - // syslog the message - if (log_method & LOG_METHOD_SYSLOG) - syslog(level_to_priority(level) | syslog_facility, "%s", fullmessage.c_str()); - } - - // log message to database, if possible, and if important enough - if (info && info->mysql && (level < LEVEL_INFO)) - { - string device, subdevice, monitor; - - if (info->device_id == -1) - device = "NULL"; - else - device = inttostr(info->device_id); - - if (info->subdevice_id == -1) - subdevice = "NULL"; - else - subdevice = inttostr(info->subdevice_id); - - if (info->monitor_id == -1) - monitor = "NULL"; - else - monitor = inttostr(info->monitor_id); - - db_update((MYSQL *) info->mysql, NULL, string("INSERT INTO log SET date=NOW(), dev_id=") + device + ", subdev_id=" + - subdevice + ", mon_id=" + monitor + ", level=" + inttostr(level) + ", component=" + inttostr(component) + - ", message = '" + db_escape(remove_braces(message)) + "'"); - } - - -} // end debuglogger - -// count_file_lines -string count_file_lines(DeviceInfo info) -{ - FILE *fhandle; - char ach; - int linecount = 0; - - if (file_exists(info.test_params)) - { - fhandle = fopen((info.test_params).c_str(), "r"); - if (fhandle != NULL) - { - while ((ach = fgetc(fhandle)) != EOF) - { - if (ach == '\n') - { - linecount++; - } - } - fclose(fhandle); - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Internal Test: Line Count: Unable to read file (" + info.test_params + ")"); - return "U"; - } - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Internal Test: Line Count: File does not exist (" + info.test_params + ")"); - return "U"; - } - - return inttostr(linecount); -} - -// read value from file -string read_value_from_file(DeviceInfo info) -{ - FILE *fhandle; - char ach; - string buffer = ""; - int charcount = 0; - - if (file_exists(info.test_params)) - { - fhandle = fopen((info.test_params).c_str(), "r"); - if (fhandle != NULL) - { - while (isdigit(ach = fgetc(fhandle)) && (charcount <= 20)) - { - buffer += ach; - charcount++; - } - fclose(fhandle); - if (charcount > 20) - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Internal Test: Read Value from File: Value over 20 digits; ignoring."); - return "U"; - } - if (buffer == "") - return "U"; - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Internal Test: Read Value from File: Unable to read file (" + info.test_params + ")"); - return "U"; - } - } - else - { - debuglogger(DEBUG_MONITOR, LEVEL_WARNING, &info, "Internal Test: Read Value from File: File does not exist (" + info.test_params + ")"); - return "U"; - } - - return buffer; -} - -void U_to_NULL(string & input) -{ - if (input == "U") - { - input = "NULL"; - } - else - { - input = string("'") + db_escape(input) + string("'"); - } -} - -uint worstof(uint a, uint b) -{ - return (a > b) ? a : b; -} - -string format_time_elapsed(long long int num_secs) -{ - char temp[80]; - string temp1 = ""; - - // Makes a string from a 'seconds elapsed' integer - long long int the_secs = num_secs; - long long int new_secs = num_secs % 86400; - int days = (num_secs - new_secs) / 86400; - num_secs = new_secs; - new_secs = num_secs % 3600; - long long int hours = (num_secs - new_secs) / 3600; - num_secs = new_secs; - new_secs = num_secs % 60; - long long int mins = (num_secs - new_secs) / 60; - - if (the_secs > 0) - { - if (days > 0) - { - temp1 = inttostr(days) + " days, "; - } - snprintf(temp, 80, "%02lld:%02lld:%02lld", hours, mins, new_secs); - return temp1 + string(temp); - } - else - { - return "Zilch"; - } - -} // end format_time_elapsed - - -string remove_nonnumerics(string input) -{ - string temp; - for (string::size_type pos = 0; pos < input.length(); pos++) - { - if (isdigit(input[pos]) || (input[pos] == '.') || (input[pos] == '-') || (input[pos] == 'U')) - temp += input[pos]; - } - return temp; -} - -double strtodec(string input) -{ - return strtod(input.c_str(), NULL); -} diff -Nurb netmrg-0.19/subst.in netmrg-0.20/ChangeLog/subst.in --- netmrg-0.19/subst.in 2004-06-03 20:59:11.000000000 +0530 +++ netmrg-0.20/ChangeLog/subst.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,46 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -my ${prefix} = "@prefix@"; -my ${exec_prefix} = "@exec_prefix@"; - -while (my $f = shift @ARGV) { - - my $TEMP = ''; - - if (-x "/bin/mktemp") { - $TEMP = `/bin/mktemp $f.$$.XXXXXX`; - die "Cannot make temporary file $TEMP" if($?); - chomp $TEMP; - } else { - my $XXXXXX = rand; - $TEMP = "$f.$$.$XXXXXX"; - } - - open IN, "<$f" || die "Cannot open $f for reading"; - open OUT, ">$TEMP" || die "Cannot make temporary file $TEMP"; - - while () { - s|\@libexecdir\@|@libexecdir@|g; # put all --with-vars before directories - s|\@localstatedir\@|@localstatedir@|g; - s|\@sysconfdir\@|@sysconfdir@|g; - s|\@datadir\@|@datadir@|g; - s|\@sbindir\@|@sbindir@|g; - s|\@bindir\@|@bindir@|g; - s|define PACKAGE|define NETMRG_PACKAGE|; # work around autoconf stupidity - s|\$\{exec_prefix\}|@exec_prefix@|g; # must be next to last - s|\$\{prefix\}|@prefix@|g; # must be last - print OUT $_; - } - - close OUT; - close IN; - - if ((! -e $f) || (`diff $f $TEMP`)) { - rename $TEMP, $f; - } else { - unlink $TEMP; - } - -} diff -Nurb netmrg-0.19/UPGRADE netmrg-0.20/ChangeLog/UPGRADE --- netmrg-0.19/UPGRADE 2006-01-09 07:34:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/UPGRADE 1970-01-01 05:30:00.000000000 +0530 @@ -1,31 +0,0 @@ - - Chapter 6. Upgrade Procedure - - After doing a 'make install' as described in the chapter on Installing - NetMRG, the next step is to run the web-based updater. This is - accomplished by logging into NetMRG with administrator privileges, and - following the prompts. NetMRG's web interface will not operate normally - and the gatherer will not run until the web-based upgrade is performed. - Non-administrator users will only receive a message directing them to - contact their NetMRG administrator. - - If you need to perform an upgrade, the updater will prompt you to apply - all updates. Clicking this link will perform all necessary updates for - this release. - - If for some reason an update fails, or you would like to re-apply an - update for any reason, you can goto the updater and goto View all - available updates. This will present you a list of the updates that are - available and their status (applied, not applied, or error). If you have - problems updating from one version to the next, you can force individual - updates that fail so that they're considered 'applied'. Once all updates - are applied for a particular version, the database will be automatically - updated to the latest version that has all updates applied. - -References - - Visible links - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/index.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/installation.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/install.html - . file:///home/silfreed/svn/netmrg/trunk/share/doc/txt/reference.html diff -Nurb netmrg-0.19/var/lib/Makefile.am netmrg-0.20/ChangeLog/var/lib/Makefile.am --- netmrg-0.19/var/lib/Makefile.am 2004-10-21 12:21:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/lib/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,5 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -SUBDIRS = rrd diff -Nurb netmrg-0.19/var/lib/Makefile.in netmrg-0.20/ChangeLog/var/lib/Makefile.in --- netmrg-0.19/var/lib/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/lib/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,472 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Make.inc -subdir = var/lib -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - -SUBDIRS = rrd -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign var/lib/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign var/lib/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -@SET_MAKE@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/var/lib/rrd/Makefile.am netmrg-0.20/ChangeLog/var/lib/rrd/Makefile.am --- netmrg-0.19/var/lib/rrd/Makefile.am 2005-11-04 20:39:02.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/lib/rrd/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,33 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -SUFFIXES = .rrd -RRDS = zero.rrd - -# options to install files in the var/lib directory -netmrg_var_libdir=$(localstatedir)/lib/$(PACKAGE)/rrd -netmrg_var_lib_DATA = $(RRDS) - -$(RRDS) : - @echo " RRD $@" - @$(RRDTOOL) create zero.rrd DS:mon_25:GAUGE:600:U:U RRA:AVERAGE:0:1:1 RRA:LAST:0:1:1 RRA:MAX:0:1:1 - -clean : clean-am clean-rrd - -distclean-am: clean-am clean-rrd distclean-generic - -clean-rrd : - @echo " RM $(netmrg_var_lib_DATA)" - @rm -f $(netmrg_var_lib_DATA) - -install-netmrg_var_libDATA: $(netmrg_var_lib_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_var_libdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_var_libdir)" - @list='$(netmrg_var_lib_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " INST $$d$$p"; \ - $(netmrg_var_libDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_var_libdir)/$$f"; \ - done - diff -Nurb netmrg-0.19/var/lib/rrd/Makefile.in netmrg-0.20/ChangeLog/var/lib/rrd/Makefile.in --- netmrg-0.19/var/lib/rrd/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/lib/rrd/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,362 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Make.inc -subdir = var/lib/rrd -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(netmrg_var_libdir)" -netmrg_var_libDATA_INSTALL = $(INSTALL_DATA) -DATA = $(netmrg_var_lib_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - -SUFFIXES = .rrd -RRDS = zero.rrd - -# options to install files in the var/lib directory -netmrg_var_libdir = $(localstatedir)/lib/$(PACKAGE)/rrd -netmrg_var_lib_DATA = $(RRDS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .rrd -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign var/lib/rrd/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign var/lib/rrd/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: - -uninstall-netmrg_var_libDATA: - @$(NORMAL_UNINSTALL) - @list='$(netmrg_var_lib_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(netmrg_var_libdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_var_libdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(netmrg_var_libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-netmrg_var_libDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-netmrg_var_libDATA - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-netmrg_var_libDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-netmrg_var_libDATA - -@SET_MAKE@ - -$(RRDS) : - @echo " RRD $@" - @$(RRDTOOL) create zero.rrd DS:mon_25:GAUGE:600:U:U RRA:AVERAGE:0:1:1 RRA:LAST:0:1:1 RRA:MAX:0:1:1 - -clean : clean-am clean-rrd - -distclean-am: clean-am clean-rrd distclean-generic - -clean-rrd : - @echo " RM $(netmrg_var_lib_DATA)" - @rm -f $(netmrg_var_lib_DATA) - -install-netmrg_var_libDATA: $(netmrg_var_lib_DATA) - @$(NORMAL_INSTALL) - test -z "$(netmrg_var_libdir)" || $(mkdir_p) "$(DESTDIR)$(netmrg_var_libdir)" - @list='$(netmrg_var_lib_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " INST $$d$$p"; \ - $(netmrg_var_libDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(netmrg_var_libdir)/$$f"; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/var/Makefile.am netmrg-0.20/ChangeLog/var/Makefile.am --- netmrg-0.19/var/Makefile.am 2004-10-21 12:21:36.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,5 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -SUBDIRS = lib diff -Nurb netmrg-0.19/var/Makefile.in netmrg-0.20/ChangeLog/var/Makefile.in --- netmrg-0.19/var/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/var/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,472 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Make.inc -subdir = var -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - -SUBDIRS = lib -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign var/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign var/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am - -@SET_MAKE@ -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/www/include/config.php.in netmrg-0.20/ChangeLog/www/include/config.php.in --- netmrg-0.19/www/include/config.php.in 2004-12-13 05:46:00.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/include/config.php.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,104 +0,0 @@ - diff -Nurb netmrg-0.19/www/include/config_site-dist.php netmrg-0.20/ChangeLog/www/include/config_site-dist.php --- netmrg-0.19/www/include/config_site-dist.php 2004-12-10 06:29:09.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/include/config_site-dist.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,25 +0,0 @@ - diff -Nurb netmrg-0.19/www/lib/auth.php netmrg-0.20/ChangeLog/www/lib/auth.php --- netmrg-0.19/www/lib/auth.php 2006-01-11 03:30:47.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/auth.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,375 +0,0 @@ - 0) - { - $auth_valid = true; - } - else - { - $auth_valid = false; - } // end if we have a result or not - - return $auth_valid; -} // end check_user(); - - -/** -* check_user_pass($user, $pass); -* -* verifies a username and password agains what's in the database -* $user = username -* $pass = password -*/ -function check_user_pass($user, $pass) -{ - $auth_valid = false; - $auth_select = "SELECT 1 FROM user WHERE user='$user' AND pass=MD5('$pass')"; - $auth_result = db_query($auth_select); - if (db_num_rows($auth_result) > 0) - { - $auth_valid = true; - } - else - { - $auth_valid = false; - } // end if we have a result or not - - return $auth_valid; -} // end check_user_pass() - - -/** -* IsLoggedIn(); -* -* verifies a username and password in the session -* against what's in the database -* and that the user isn't spoofing their ip -* and that they haven't been logged in too long -*/ -function IsLoggedIn() -{ - if (( - ($GLOBALS["netmrg"]["externalAuth"] - && (check_user($_SESSION["netmrgsess"]["username"]) - || check_user($GLOBALS["netmrg"]["defaultMapUser"]))) - || - (!$GLOBALS["netmrg"]["externalAuth"] - && check_user_pass($_SESSION["netmrgsess"]["username"], $_SESSION["netmrgsess"]["password"])) - ) - && $_SESSION["netmrgsess"]["remote_addr"] == $_SERVER["REMOTE_ADDR"] - && time() - $_SESSION["netmrgsess"]["accessTime"] <= $GLOBALS["netmrg"]["authTimeout"]) - { - return true; - } // end if the username/password checks out and the ips match - - return false; -} // end IsLoggedIn(); - - -/** -* get_full_name($user) -* -* gets $user's full name -*/ -function get_full_name($user) -{ - $q = db_query("SELECT fullname FROM user WHERE user='$user'"); - $r = db_fetch_array($q); - return $r["fullname"]; -} // end get_full_name() - - -/** -* check_auth($level) -* -* checks the logged in user's auth level to be sure they have -* at least auth level $level. If not, send them away -*/ -function check_auth($level) -{ - // if they aren't logged in - if (!IsLoggedIn()) - { - $_SESSION["netmrgsess"]["redir"] = $_SERVER["REQUEST_URI"]; - if ($GLOBALS["netmrg"]["externalAuth"]) - { - header("Location: {$GLOBALS['netmrg']['webroot']}/login.php"); - exit(0); - } // end if externalauth - header("Location: {$GLOBALS['netmrg']['webroot']}/error.php?action=invalid"); - exit(0); - } // end if they aren't logged in - - // if they don't have enough permissions - else if ($_SESSION["netmrgsess"]["permit"] < $level) - { - header("Location: {$GLOBALS['netmrg']['webroot']}/error.php?action=denied"); - exit(0); - } // end if they don't have enough permissions - -} // end check_auth() - - -/** -* viewCheckAuth($object_id, $object_type) -* -* called from the 'view.php' page -* checks that the user is allowed to see this page -*/ -function viewCheckAuth($object_id, $object_type) -{ - global $PERMIT; - check_auth($GLOBALS['PERMIT']["SingleViewOnly"]); - - // the groups this object_id is in - $object_id_groups = GetGroups($object_type,$object_id); - - if (!in_array($_SESSION["netmrgsess"]["group_id"], $object_id_groups) - && $_SESSION["netmrgsess"]["permit"] == $PERMIT["SingleViewOnly"]) - { - return false; - } // end if allowed group id is not in this objects groups and we're SVO - - return true; -} // end viewCheckAuth() - - -/** -* viewCheckAuthRedirect($object_id, $object_type) -* -* called from the 'view.php' page -* checks that the user is allowed to see this page -* and redirects if they are not -*/ -function viewCheckAuthRedirect($object_id, $object_type) -{ - if (!viewCheckAuth($object_id, $object_type)) - { - $_SESSION["netmrgsess"]["redir"] = $_SERVER["REQUEST_URI"]; - header("Location: {$GLOBALS['netmrg']['webroot']}/error.php?action=denied"); - exit; - } // end if not authorized -} // end viewCheckAuthRedirect() - - -/** -* EncloseGraphCheckAuth() -* -* makes sure that the logged in user can view a graph -* -* type = template, custom, mon, tinymon -* id = id of item -* -*/ -function EncloseGraphCheckAuth($type, $id) -{ - global $PERMIT; - check_auth($GLOBALS['PERMIT']["SingleViewOnly"]); - - // the groups this object_id is in - $object_id_groups = array(); - - switch ($type) - { - case "mon" : - case "tinymon" : - $object_id_groups = GetGroups("monitor",$id); - break; - - case "template" : - $object_id_groups = GetGroups("subdevice",$id); - break; - - case "custom" : - $object_id_groups = GetGroups("customgraph",$id); - break; - } // end switch graph type - - if (!in_array($_SESSION["netmrgsess"]["group_id"], $object_id_groups) - && $_SESSION["netmrgsess"]["permit"] == $PERMIT["SingleViewOnly"]) - { - $_SESSION["netmrgsess"]["redir"] = $_SERVER["REQUEST_URI"]; - header("Location: {$GLOBALS['netmrg']['webroot']}/error.php?action=denied"); - exit; - } -} // end EncloseGraphCheckAuth(); - - -/** -* GraphCheckAuth() -* -* makes sure that the logged in user can view a graph -* -* type = template, custom, mon, tinymon -* id = id of item -* -*/ -function GraphCheckAuth($type, $id) -{ - global $PERMIT; - check_auth($GLOBALS['PERMIT']["SingleViewOnly"]); - - // the groups this object_id is in - $object_id_groups = array(); - - switch ($type) - { - case "mon" : - case "tinymon" : - $object_id_groups = GetGroups("monitor",$id); - break; - - case "template" : - case "template_item" : - $object_id_groups = GetGroups("subdevice",$id); - break; - - case "custom" : - case "custom_item" : - $object_id_groups = GetGroups("customgraph",$id); - break; - } // end switch graph type - - if (!in_array($_SESSION["netmrgsess"]["group_id"], $object_id_groups) - && $_SESSION["netmrgsess"]["permit"] == $PERMIT["SingleViewOnly"]) - { - readfile($GLOBALS["netmrg"]["fileroot"]."/webfiles/img/access_denied.png"); - exit; - } -} // end GraphCheckAuth(); - - -/** -* ResetAuth() -* -* reset authentication variables -*/ -function ResetAuth() -{ - if (isset($_SESSION["netmrgsess"])) - { - unset($_SESSION["netmrgsess"]); - $_SESSION["netmrgsess"] = array(); - $_SESSION["netmrgsess"]["username"] = ""; - $_SESSION["netmrgsess"]["password"] = ""; - $_SESSION["netmrgsess"]["remote_addr"] = ""; - $_SESSION["netmrgsess"]["permit"] = ""; - $_SESSION["netmrgsess"]["accessTime"] = ""; - } // end if isset netmrg session -} // end ResetAuth() - - -/** -* get_permit($user) -* -* gets the user's permission level -*/ -function get_permit($user) -{ - if (IsLoggedIn()) - { - global $PERMIT; - if ($GLOBALS["netmrg"]["verhist"][$GLOBALS["netmrg"]["dbversion"]] >= $GLOBALS["netmrg"]["verhist"]["0.17"]) - { - $sql = "SELECT IF(disabled=0, permit, '".$PERMIT["Disabled"]."') AS permit FROM user WHERE user='".$user."'"; - } // end if the disabled column works - else - { - $sql = "SELECT permit FROM user WHERE user='".$user."'"; - } // end if no disabled column - $handle = db_query($sql); - $row = db_fetch_array($handle); - return $row["permit"]; - } // end if there is somebody logged in, get their permissions - - return false; -} // end get_permit() - -/** -* GetUserID() -* -* gets the user id of the logged in user -*/ -function GetUserID() -{ - if (IsLoggedIn()) - { - $sql = "SELECT id FROM user WHERE user='" . $_SESSION["netmrgsess"]["username"] . "'"; - $handle = db_query($sql); - $row = db_fetch_array($handle); - return empty($row["id"]) ? false : $row["id"]; - } // end IsLoggedIn - - return false; -} // end GetUserID() - - -/** -* get_group_id() -* -* gets the group id of the logged in user -* $user = the username of get info on -*/ -function get_group_id($user = "") -{ - if (empty($user)) - { - $user = $_SESSION["netmrgsess"]["username"]; - } // end if no user set - if (IsLoggedIn()) - { - $sql = "SELECT group_id FROM user WHERE user='$user'"; - $handle = db_query($sql); - $row = db_fetch_array($handle); - return $row["group_id"]; - } // end IsLoggedIn - - return false; -} // end get_group_id() - - -/** -* view_redirect() -* -* redirects the logged in user to the 'view' page -* if they only have 'single view' priviledges or they -* weren't on their way to somewhere else -*/ -function view_redirect() -{ - if (empty($_SESSION["netmrgsess"]["redir"]) || ($_SESSION["netmrgsess"]["permit"] == 0)) - { - header("Location: {$GLOBALS['netmrg']['webroot']}/device_tree.php"); - exit(0); - } - else - { - $redir = $_SESSION["netmrgsess"]["redir"]; - unset($_SESSION["netmrgsess"]["redir"]); - header("Location: $redir"); - exit(0); - } // end if we don't have a redir page or we do -} // end view_redirect() - -?> diff -Nurb netmrg-0.19/www/lib/database.php netmrg-0.20/ChangeLog/www/lib/database.php --- netmrg-0.19/www/lib/database.php 2004-10-24 00:19:23.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/database.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,198 +0,0 @@ - 0) - { - $dbhost = $GLOBALS["netmrg"]["dbhost"] . ":" . $GLOBALS["netmrg"]["dbport"]; - } - else - { - $dbhost = $GLOBALS["netmrg"]["dbhost"]; - } - - $conn = mysql_connect($dbhost, $GLOBALS["netmrg"]["dbuser"], $GLOBALS["netmrg"]["dbpass"]) or - die("DB_ERROR:: Cannot connect to the database server."); - mysql_select_db($GLOBALS["netmrg"]["dbname"], $conn) or - die("DB_ERROR: Cannot connect to the database."); - return $conn; -} // end db_connect(); - - -// Obtain data from a table -function db_query($query_string, $unsafe = false) -{ - $query_result = mysql_query($query_string, $GLOBALS["netmrg"]["dbconn"]); - // if there was an error, handle it - if (mysql_errno($GLOBALS["netmrg"]["dbconn"]) && !$unsafe) - { - if ($GLOBALS["netmrg"]["dbdebug"]) - { - die("DB_ERROR: Couldn't execute query:
\n
$query_string

\n
".mysql_error()."

\n\n"); - } // end if we're debuging things - else - { - die("DB_ERROR: Sorry, a database error occured. We cannot continue. Please contact the administrator and let them know what you were doing when the problem occured

\n\n"); - } // end else present a nice error code - } // end if there was an error - - return $query_result; -} // end db_query - - -// Update/Insert data in table -function db_update($query_string) -{ - db_query($query_string); -} // end db_update - -// fetch data from a query -function db_fetch_array($q_handle) -{ - return mysql_fetch_array($q_handle); -} // end db_fetch_array() - -// number of rows returned in a query -function db_num_rows($q_handle) -{ - return mysql_num_rows($q_handle); -} // end db_num_rows() - -// escape data in query -function db_escape_string($string) -{ - return mysql_escape_string($string); -} // end db_escape() - -// last insert id -function db_insert_id() -{ - return mysql_insert_id($GLOBALS["netmrg"]["dbconn"]); -} // end db_insert_id() - - -/** -* db_fetch_cell($sql) -* -* run a 'select' sql query and return the first column of the first row found -* -* @arg $sql - the sql query to execute -* @returns - (bool) the output of the sql query as a single variable -*/ -function db_fetch_cell($sql) -{ - $row = array(); - $res = db_query($sql); - - if ($res) - { - $rows = mysql_numrows($res); - - if ($rows > 0) - { - return(mysql_result($res,0,0)); - } // end if rows - } // end if result - - return false; -} // end db_fetch_cell(); - - -/** -* db_fetch_row($sql) -* -* run a 'select' sql query and return the first row found -* -* @arg $sql - the sql query to execute -* @returns - the first row of the result as a hash -*/ -function db_fetch_row($sql) -{ - $row = array(); - $res = db_query($sql); - - if ($query) - { - $rows = mysql_numrows($res); - - if ($rows > 0) - { - return(mysql_fetch_assoc($res)); - } // end if rows - } // end if result - - return false; -} // end db_fetch_row(); - - -/** -* db_fetch_assoc($sql) -* -* run a 'select' sql query and return all rows found -* -* @arg $sql - the sql query to execute -* @returns - the entire result set as a multi-dimensional hash -*/ -function db_fetch_assoc($sql) -{ - $data = array(); - $res = db_query($sql); - - if ($res) - { - $rows = mysql_numrows($res); - - if ($rows > 0) - { - while($row = mysql_fetch_assoc($res)) - { - array_push($data, $row); - } - return($data); - } - } // end if result - - return false; -} // end db_fetch_assoc(); - - -/** -* db_data_seek($q_handle, $rownum); -* -* seeks to specified row number -*/ -function db_data_seek($q_handle, $rownum) -{ - if (!mysql_data_seek($q_handle, $rownum)) - { - if ($GLOBALS["netmrg"]["dbdebug"]) - { - die("DB_ERROR: Attempt to seek past end of data set to row $rownum
\n\n"); - } // end if we're debuging things - else - { - die("DB_ERROR: Sorry, a database error occured. We cannot continue. Please contact the administrator and let them know what you were doing when the problem occured

\n\n"); - } // end else present a nice error code - } // end if the seek failed -} // end db_data_seek(); - -?> diff -Nurb netmrg-0.19/www/lib/format.php netmrg-0.20/ChangeLog/www/lib/format.php --- netmrg-0.19/www/lib/format.php 2006-02-01 00:37:46.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/format.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,1400 +0,0 @@ - -* @author Douglas E. Warner -*/ - - -/********************************************* -* -* Site-Wide Display Functions -* -*********************************************/ - -/** -* begin_page() -* -* starts the page w/ basic HTML -* -* @param string $pagename page that this is -* @param string $prettyname shown in the title bar -* @param boolean $refresh whether to refresh this page or not -* @param string $bodytags options for the tag -*/ -function begin_page($pagename = "", $prettyname = "", $refresh = false, $bodytags = "", $javascript_files = array()) -{ - // gather errors from prerequisits being met or not - $prereqs_errors = PrereqsMet(); - $display_menu = false; - - // always include these javascripts - array_push($javascript_files, "inputdefault.js"); - - // always load this item - $bodytags .= ' onload="set_defaults(\'search\');"'; - - // determine if we should display the menu or not - $display_menu = (IsLoggedIn() && !UpdaterNeedsRun() && count($prereqs_errors) == 0); - - DisplayPageHeader($pagename, $prettyname, $refresh, $display_menu, $bodytags, $javascript_files); -?> - -
- -
- - - - - - tag -*/ -function DisplayPageHeader($pagename = "", $prettyname = "", $refresh = false, $display_menu = false, $bodytags = "", $javascript_files = array()) -{ - echo ''."\n"; -?> - - - - - - <?php print GetPageTitle($prettyname); ?> - - /include/netmrg.css" /> - - 0) - { - foreach ($javascript_files as $jsfile) - { - echo ' '."\n"; - } // end foreach jsfile - } // end if we have javascript to load -?> - - - - - - -> - - - - - - -'."\n"; - echo "
    \n"; - while (list($menuname, $menuitems) = each($LOCAL_MENU)) - { - echo '
  • '; - echo $menuname; - echo "
    • \n"; - } // end while we still have menu items - echo "
\n\n"; - echo "  \n"; - echo '
'."\n"; - echo " \n\n"; - - echo '
'."\n"; - echo " \n\n"; - echo "  \n"; - echo '
'."\n"; - echo "
\n\n"; -} // end DisplayTopMenu(); - - -/** -* PrepGroupNavHistory($type, $id) -* -* prepares a nav bar that is used along the tops of the pages under 'Groups' -* and keeps a history of where you've been -* -* $type = (group, device, int_snmp_cache_view, disk_snmp_cache_view, -* sub_device, monitor, event) -* $id = -*/ -function PrepGroupNavHistory($type, $id) -{ - global $BC_TYPES; - - // default trip id - if (empty($_REQUEST["tripid"])) - { - srand(make_seed()); - $_REQUEST["tripid"] = md5(time()*rand()); - } // end if no trip id - $tripid = $_REQUEST["tripid"]; - - // setup array to hold group nav - if (!isset($_SESSION["netmrgsess"]["grpnav"])) - { - $_SESSION["netmrgsess"]["grpnav"] = array(); - } // end if no group nav array - if (!isset($_SESSION["netmrgsess"]["grpnav"][$tripid])) - { - $_SESSION["netmrgsess"]["grpnav"][$tripid] = array(); - } // end if no group nav trip array - - // push type onto breadcrumbs - /** - * breadcrumbs = array( - * "type" => (group|device|sub_device|monitor|event), - * "id" => x - * ); - */ - $last_type = ""; - $last_id = ""; - if (count($_SESSION["netmrgsess"]["grpnav"][$tripid]) != 0) - { - $last_type = $_SESSION["netmrgsess"]["grpnav"][$tripid][count($_SESSION["netmrgsess"]["grpnav"][$tripid])-1]["type"]; - $last_id = $_SESSION["netmrgsess"]["grpnav"][$tripid][count($_SESSION["netmrgsess"]["grpnav"][$tripid])-1]["id"]; - } // end if we have some bread crumbs already - if (count($_SESSION["netmrgsess"]["grpnav"][$tripid]) == 0 - || $BC_TYPES[$last_type] <= $BC_TYPES[$type]) - { - if (($type == $last_type && $id != $last_id) - || ($id == $last_id && $type != $last_type) - || ($type != $last_type && $id != $last_id)) - { - $found = false; - foreach ($_SESSION["netmrgsess"]["grpnav"][$tripid] as $triparr) - { - if ($triparr["type"] == $type && $triparr["id"] == $id) - { - $found = true; - break; - } // end if found our trip info - } // end foreach trip breadcrumb - if (!$found) - { - array_push($_SESSION["netmrgsess"]["grpnav"][$tripid], array("type" => $type, "id" => $id)); - } // end if we haven't already pushed this item on - } // end if type and id are different from last - } // end if we can push the breadcrumb onto our history -} // end PrepGroupNavHistory(); - - -/** -* DrawGroupNavHistory($type) -* -* draws a nav bar along the tops of the pages under 'Groups' -* -* $type = (group, device, int_snmp_cache_view, disk_snmp_cache_view, -* sub_device, monitor, event) -* $id = -*/ -function DrawGroupNavHistory($type, $id) -{ - global $BC_TYPES; - $tripid = $_REQUEST["tripid"]; - - // loop through each breadcrumb and display it -?> - - -
- History - $BC_TYPES[$type]) - { - $_SESSION["netmrgsess"]["grpnav"][$tripid] = array_slice($_SESSION["netmrgsess"]["grpnav"][$tripid], 0, $count); - continue; - } // end if we're past our current type - // cut of extra groups - if ($type == "group" && $breadcrumb["type"] == "group" - && $breadcrumb["id"] != $id - && !in_array($breadcrumb["id"], GetGroupParents($id)) - ) - { - $_SESSION["netmrgsess"]["grpnav"][$tripid] = array_slice($_SESSION["netmrgsess"]["grpnav"][$tripid], 0, $count); - break; - } // end if group and not our parent or ourself - - // display the proper link - switch ($breadcrumb["type"]) - { - case "event" : - $t = ' : '; - $t .= ''; - $t .= get_event_name($breadcrumb["id"]); - $t .= "\n"; - print $t; - break; - - case "monitor" : - $t = ' : '; - $t .= ''; - $t .= get_short_monitor_name($breadcrumb["id"]); - $t .= "\n"; - print $t; - break; - - case "int_snmp_cache_view" : - $t = ' : '; - $t .= ''; - $t .= "interface cache"; - $t .= "\n"; - print $t; - break; - - case "disk_snmp_cache_view" : - $t = ' : '; - $t .= ''; - $t .= "disk cache"; - $t .= "\n"; - print $t; - break; - - case "sub_device" : - $t = ' : '; - $t .= ''; - $t .= get_sub_device_name($breadcrumb["id"]); - $t .= "\n"; - print $t; - break; - - case "device" : - $t = ' : '; - $t .= ''; - $t .= get_device_name($breadcrumb["id"]); - $t .= "\n"; - print $t; - break; - - case "group" : - $t = ' : '; - $t .= ''; - $t .= ($breadcrumb["id"] == 0) ? "All Groups" : get_group_name($breadcrumb["id"]); - $t .= "\n"; - print $t; - break; - } // end switch type - $count++; - } // end foreach breadcrumb -?> -
-Logged in as '; - $logintext .= ''; - $logintext .= space_to_nbsp($_SESSION["netmrgsess"]["prettyname"]); - $logintext .= "\n"; - } - else - { - $logintext .= 'Not Logged In'."\n"; - } // end if logged in or not - - return $logintext; -} // end GetLoginInfo(); - - -/** -* CheckInstallState() -* -* checks things like whether the updater needs run and the -* prerequisites are met before allowing you to view the rest -* of the webpage -* -* @param array array of errors returned by prerequisite checks -*/ -function CheckInstallState($prereqs_errors = array()) -{ - global $PERMIT; - - // if we need to run the updater, don't do anything else - if (IsLoggedIn() && (UpdaterNeedsRun() || count($prereqs_errors))) - { - if (UpdaterNeedsRun()) - { - if (strpos($_SERVER["PHP_SELF"], "updater.php") !== false) - { - echo "\n"; - if ($_SESSION["netmrgsess"]["permit"] != $PERMIT['Admin']) - { -?> - -This installation is currently unusable due to a recent upgrade. Please contact -your administrator to have the rest of the upgrade performed.
-logout
- - -Your installation is currently in an unusable state; please proceed to update -your installation here
-logout
-\n"; - foreach ($prereqs_errors as $error) - { - echo ''.$error.'
'."\n"; - } // end foreach prereq error - - end_page(); - exit(); - } // end if prereqs weren't met - } // end if logged in and updater needs run or prereqs weren't met -} // end CheckInstallState(); - - -/** -* MakeNavURI($name, $link, $title, $onclick, $alias=array()); -* -* makes a navigation uri link and will include #navcurrent id -* if $link or items in $alias are equal to $_SERVER["SCRIPT_URL"] -*/ -function MakeNavURI($name, $link, $title = "", $onclick = "", $alias=array()) -{ - $currentid = ""; - $a_title = ""; - $a_onclick = ""; - - array_push($alias, $link); - if (in_array(basename($_SERVER["SCRIPT_NAME"]), $alias)) - { - $currentid = ' class="navcurrent"'; - } // end if we're at the current page - - if (!empty($title)) - { - $a_title = ' title="'.htmlentities($title).'"'; - } // end if a title exists - - if (!empty($onclick)) - { - $a_onclick = ' onclick="'.addslashes($onclick).'"'; - } // end if a title exists - - return ''.$name.''; -} // end MakeNavURI(); - - -/** -* space_to_nbsp() -* -* converts all spaces in the string to non-breaking spaces -* -* @param string $input string w/ spaces to have replaced -*/ -function space_to_nbsp($input) -{ - return str_replace(" ", " ", $input); -} // end space_to_nbsp(); - - -/** -* GetClassList($class_array) -* -* returns a string with the class items passed in $class_array() -*/ -function GetClassList($class_array = array()) -{ - $class_list = ""; - - if (count($class_array) > 0) - { - $class_list = ' class="'.implode(' ', $class_array).'"'; - } // end if class items - - return $class_list; -} // end GetClassList(); - - - -/********************************************* -* -* List Display Functions -* -*********************************************/ - -/** -* make_display_table() -* -* displays the beginnings of a table with a specific title -* -* @param string $title the title of the table -* @param string $addlink the link to use to add something if it doesn't -* refer to this page -* @param array $header_element an array containing 'text' describing the link -* and 'href' that the text points at. this can be an -* arbitrary number of array items, and they can be empty -*/ -function make_display_table($title, $addlink = "") -{ - -?> - - - - - - - - - - - - - - - - - - -
- -
- - "> - - - - - - - ">Add -
- - []"> - - "> - - - -
- - - - - - - - - - - "$value $unit")); -} - -#+++++++++++++++++++++++++++++++++++++++++++++ -# -# Edit Form Creation Functions -# -#+++++++++++++++++++++++++++++++++++++++++++++ - -function make_table_tag() -{ - ?>
- -
- - -
- Checked Items: - -    - <';javascript:if(window.confirm('')){document.form.submit();}" href="#">> - -
- " method="post" name="editform"> - - - - - - - -
- -
- - - - > - - - - - - - - - - - - - - -
- -

- -value pairs to include at the beginning of the option list -* $end_array_list = array of key=>value pairs to include at the end of the option list -* $where = where clause for query -*/ -function make_edit_select_from_table($header, $name, $table_name, $selected, $select_options = "", $begin_array_list = array(), $end_array_list = array(), $where = "1") -{ - make_edit_select($header, $name, $select_options); - - - // loop through things to put @ the beginning of the select box - while (list($key, $value) = each($begin_array_list)) - { - make_edit_select_option($value, $key, ($key == $selected)); - } // end while we have array list - - // Draw Select Options from SQL table - DrawSelectOptionsFromSQL($table_name, $selected, $select_options, $where); - - // loop through things to put @ the end of the select box - while (list($key, $value) = each($end_array_list)) - { - make_edit_select_option($value, $key, ($key == $selected)); - } // end while we have array list - - make_edit_select_end(); -} // end make_edit_select_end - - -/** -* Creates a select options with items named by the table's name field, and id'd by tables id field -* -* $table_name = mysql table field -* $selected = row id to be selected (if any) -* $select_options = things like javascript that apply to this select box -* $where = where clause for query -*/ -function DrawSelectOptionsFromSQL($table_name, $selected, $select_options="", $where="1") -{ - $item_results = db_query("SELECT * FROM $table_name WHERE $where ORDER BY name,id"); - $item_total = db_num_rows($item_results); - - for ($item_count = 1; $item_count <= $item_total; ++$item_count) - { - $item_row = db_fetch_array($item_results); - $item_name = $item_row["name"]; - $item_id = $item_row["id"]; - $item_selected = ($item_id == $selected); - - make_edit_select_option($item_name, $item_id, $item_selected); - } // end for -} // end DrawSelectOptionsFromSQL(); - - -/** -* Makes edit control from an array -* -* $header = displayed header of the control -* $name = name of the control within the form -* $array_list = array of items to place in the control -*/ - -function make_edit_select_from_array($header, $name, $array_list, $selected, $select_options = "") -{ - make_edit_select($header, $name, $select_options); - - // loop through things to put @ the end of the select box - while (list($key, $value) = each($array_list)) - { - make_edit_select_option($value, $key, ($key == $selected)); - - } // end while we have array list - - make_edit_select_end(); - -} - -// Creates a form select control -function make_edit_select_option($name, $value, $selected) -{ - if ($selected) - { -?> - - - - - - - -
- -

- - - - - - - -
- -

- - - - - - - - ' . $header . '
'); ?> - - - - -

- - - - - - > - - -
- -

- - - - - - - - - - - - - - - - - - -      "; -} - -function cond_formatted_link($enabled, $text, $link = "", $caption = "", $img = "") -{ - if ($enabled) - { - return formatted_link($text, $link, $caption, $img); - } - else - { - return formatted_link_disabled($text, $img); - } -} - -function formatted_link($text, $link, $caption = "", $img = "") -{ - $text = space_to_nbsp($text); - $returnstr = ""; - - if (!empty($img)) - { - $titletext = $text; - $titletext .= empty($caption) ? "" : " - $caption"; - - $returnstr = ''; - $returnstr .= ''.$titletext.''; - $returnstr .= ''; - } # end if image - else - { - $returnstr = '<>'; - } # no image - - return $returnstr; -} // end formatted_link - -function formatted_link_disabled($text, $img = "") -{ - $returnstr = ""; - if (!empty($img)) - { - $returnstr = ''.$text.''; - } # end if image - else - { - $returnstr = "<$text>"; - } # end if no image - - return $returnstr; -} // end formatted_link_disabled - -function image_link($img_name, $title, $link) -{ - $returnval = ''; - $returnval .= '' . $title . ''."\n"; - return $returnval; -} - -function image_link_disabled($img_name, $title) -{ - return '' . $title . ''."\n"; -} - - -/* - JavaScript Code Blocks -*/ - -function js_confirm_dialog($function_name, $before = "", $after = "", $url_base = "") -{ - -?> - - - -[*] ' . - '[0] ' . - '[-]'; -} - -function js_color_dialog() -{ - ?> - - 0) - { - echo "
The following errors were encountered:
"; - // foreach error - foreach ($errors as $error) - { - echo '
'."\n"; - echo $error; - echo "
\n"; - } // end foreach error - } // end if we have errors -} // end DisplayErrors(); - - -/** -* DisplayResults($Results) -* -* display array of results -*/ -function DisplayResults($results) -{ - if (count($results) > 0) - { - echo "
The following results occured:
"; - // foreach error - foreach ($results as $result) - { - echo '
'."\n"; - echo $result; - echo "
\n"; - } // end foreach result - } // end if we have results -} // end DisplayResults(); - - -?> diff -Nurb netmrg-0.19/www/lib/graphing.php netmrg-0.20/ChangeLog/www/lib/graphing.php --- netmrg-0.19/www/lib/graphing.php 2005-11-10 09:44:23.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/graphing.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,470 +0,0 @@ - 0) - { - - $query = db_query("SELECT test_id, test_type, test_params FROM monitors WHERE id=$mon_id"); - $row = db_fetch_array($query); - $row['test_params'] = db_escape_string($row['test_params']); - - $query2 = db_query("SELECT id FROM monitors WHERE sub_dev_id='$subdev_id' AND test_id='{$row['test_id']}' AND test_type='{$row['test_type']}' AND test_params='{$row['test_params']}'"); - if ($row2 = db_fetch_array($query2)) - { - return $row2["id"]; - } - else - { - return false; - } - } - else - { - return $mon_id; - } -} // end dereference_templated_monitor(); - -function esc_colon() -{ - // if escaping a colon, return the escape sequence, otherwise an empty string - - if (!strstr($GLOBALS['netmrg']['rrdtool_version'], "1.0")) - return "\\"; else return ""; -} - -function rrd_slope() -{ - // if escaping a colon, return the escape sequence, otherwise an empty string - - if (!strstr($GLOBALS['netmrg']['rrdtool_version'], "1.0")) - return "-E"; else return ""; -} - -function get_graph_command($type, $id, $hist) -{ - - // Determine the time domain of the graph - - switch ($type) - { - case "mon": return monitor_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist]); - case "tinymon": return tiny_monitor_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist]); - case "custom": return custom_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist], false, false); - case "custom_item": return custom_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist], false, true); - case "template": return custom_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist], true, false); - case "template_item": return custom_graph_command($id, $GLOBALS['TIMEFRAMES'][$hist], true, true); - } - -} - -function monitor_graph_command($id, $timeframe) -{ - if (isset($_REQUEST['start'])) - { - $timeframe['start_time'] = $_REQUEST['start']; - } - - if (isset($_REQUEST['end'])) - { - $timeframe['end_time'] = $_REQUEST['end']; - } - - if (strpos($timeframe['start_time'], " ") !== false) - { - $timeframe['start_time'] = strtotime(substr($timeframe['start_time'],1)); - - } - - if (strpos($timeframe['end_time'], " ") !== false) - { - $timeframe['end_time'] = strtotime(substr($timeframe['end_time'],1)); - } - - if (isset($_REQUEST['min']) && isset($_REQUEST['max']) && ($_REQUEST['max'] > $_REQUEST['min'])) - { - $boundary = " -r -l {$_REQUEST['min']} -u {$_REQUEST['max']}"; - } - else - { - $boundary = ""; - } - - return($GLOBALS['netmrg']['rrdtool'] . " graph - " . rrd_slope() . " -s " . $timeframe['start_time'] . - " -e " . $timeframe['end_time'] . " " . $boundary . - " --title=" . escapeshellarg(get_monitor_name($id) . " (#" . $id . ")") . " --imgformat PNG -g -w 575 -h 100 " . - "DEF:data1=" . $GLOBALS['netmrg']['rrdroot'] . "/mon_" . $id . ".rrd:mon_" . $id . ":AVERAGE " . - "AREA:data1#151590"); - -} - -function tiny_monitor_graph_command($id, $timeframe) -{ - return($GLOBALS['netmrg']['rrdtool'] . " graph - " . rrd_slope() . " -s {$timeframe['start_time']} " . - "-e {$timeframe['end_time']} -a PNG -g -w 275 -h 25 " . - "DEF:data1=" . $GLOBALS['netmrg']['rrdroot'] . "/mon_$id.rrd:mon_$id:AVERAGE " . - "AREA:data1#151590"); -} - -function custom_graph_command($id, $timeframe, $templated, $single_ds) -{ - $options = ""; - - if ($single_ds) - { - $ds_q = db_query("SELECT graph_id FROM graph_ds WHERE id=$id"); - $ds_r = db_fetch_array($ds_q); - $ds_id = $id; - $id = $ds_r["graph_id"]; - } - - $graph_results = db_query("SELECT * FROM graphs WHERE id=$id"); - $graph_row = db_fetch_array($graph_results); - - if ($templated) - { - $fields = array($graph_row['title'], $graph_row['vert_label'], $graph_row['comment']); - $fields = expand_parameters($fields, $_REQUEST['subdev_id']); - $graph_row['title'] = escapeshellarg($fields[0]); - $graph_row['vert_label'] = escapeshellarg($fields[1]); - $graph_row['comment'] = escapeshellarg($fields[2]); - } - else - { - # escape the arguments in either case - $graph_row['title'] = escapeshellarg($graph_row['title']); - $graph_row['vert_label'] = escapeshellarg($graph_row['vert_label']); - $graph_row['comment'] = escapeshellarg($graph_row['comment']); - } - - # escapeshellarg() won't enclose an empty string in quotes, so - # fix that up if necessary - if ($graph_row['title'] == '') - $graph_row['title'] = "''"; - if ($graph_row['vert_label'] == '') - $graph_row['vert_label'] = "''"; - if ($graph_row['comment'] == '') - $graph_row['comment'] = "''"; - - if (isset($_REQUEST['start'])) - { - $timeframe['start_time'] = $_REQUEST['start']; - $timeframe['overridden'] = true; - } - - if (isset($_REQUEST['end'])) - { - $timeframe['end_time'] = $_REQUEST['end']; - $timeframe['overridden'] = true; - } - - if (strpos($timeframe['start_time'], " ") !== false) - { - $timeframe['start_time'] = strtotime(substr($timeframe['start_time'],1)); - } - - if (strpos($timeframe['end_time'], " ") !== false) - { - $timeframe['end_time'] = strtotime(substr($timeframe['end_time'],1)); - } - - if (isset($timeframe['overridden']) && ($timeframe['overridden'])) - { - $timeframe['sum_label'] = "Interval"; - $timeframe['sum_time'] = $timeframe['end_time'] - $timeframe['start_time']; - } - - if (isset($_REQUEST['min']) && isset($_REQUEST['max']) && ($_REQUEST['max'] > $_REQUEST['min'])) - { - $boundary = " -r -l {$_REQUEST['min']} -u {$_REQUEST['max']}"; - } - elseif (isset($graph_row['min']) || isset($graph_row['max'])) - { - $boundary = " -r"; - - if (isset($graph_row['min'])) - { - $boundary .= " -l " . $graph_row['min']; - } - - if (isset($graph_row['max'])) - { - $boundary .= " -u " . $graph_row['max']; - } - } - else - { - $boundary = ""; - } - - // options - $options = " "; - if (isin($graph_row["options"], "nolegend")) - { - $options .= "-g "; - } - if (isin($graph_row["options"], "logarithmic")) - { - $options .= "-o "; - } - - // initial definition - $command = $GLOBALS['netmrg']['rrdtool'] . " graph - " . rrd_slope() . " -s " . $timeframe['start_time'] . - " -e " . $timeframe['end_time'] . $boundary . " --title " . $graph_row["title"] . " -w " . - $graph_row["width"] . " -h " . $graph_row["height"] . $options . "-b " . $graph_row["base"] . " -v " . - $graph_row["vert_label"] . " --imgformat PNG $options"; - - - // *** Padded Length Calculation - $padded_length = 5; - $ds_results = db_query("SELECT max(length(graph_ds.label)) as maxlen FROM graph_ds WHERE graph_ds.graph_id=$id"); - $ds_row = mysql_fetch_array($ds_results); - if (!empty($ds_row['maxlen']) && $padded_length < $ds_row['maxlen']) - { - $padded_length = $ds_row['maxlen']; - } - // *** - - if ($single_ds) - { - $ds_where = "id=$ds_id"; - } - else - { - $ds_where = "graph_id=$id ORDER BY position, id"; - } - - $ds_results = db_query("SELECT * FROM graph_ds WHERE $ds_where"); - $ds_total = db_num_rows($ds_results); - - $CDEF_A = "zero,UN,0,0,IF"; - $CDEF_L = "zero,UN,0,0,IF"; - $CDEF_M = "zero,UN,0,0,IF"; - $total_sum = 0; - - $command .= " DEF:zero=" . $GLOBALS['netmrg']['rrdroot'] . "/zero.rrd:mon_25:AVERAGE "; - - for ($ds_count = 1; $ds_count <= $ds_total; $ds_count++) - { - - $ds_row = db_fetch_array($ds_results); - - // work around those using STACKs at the bottom of a graph - if (($ds_row['type'] == 5) && ($ds_count == 1)) - { - $ds_row['type'] = 4; - } - - $ds_row["type"] = $GLOBALS["RRDTOOL_ITEM_TYPES"][$ds_row["type"]]; - - if ($single_ds && ($ds_row["type"] == "STACK")) - { - $ds_row["type"] = "AREA"; - } - - // time periods - if (($ds_row['start_time'] != "") && ($ds_row['end_time'] != "")) - { - $relative_times = false; - - if (strpos($ds_row['start_time'], "+") !== false) - { - $ds_row['start_time'] = strtotime(substr($ds_row['start_time'],1)); - $relative_times = true; - } - - if (strpos($ds_row['end_time'], "+") !== false) - { - $ds_row['end_time'] = strtotime(substr($ds_row['end_time'],1)); - $relative_times = true; - } - - if (($timeframe['sum_time'] != 86400) && $relative_times) - { - $ds_row['start_time'] = 0; - $ds_row['end_time'] = 0; - } - - if (!$relative_times) - { - $time_pre = "TIME,{$ds_row['start_time']},{$ds_row['end_time']},LIMIT,UN,UNKN,"; - } - else - { - $time_pre = "TIME,{$ds_row['start_time']},{$ds_row['end_time']},LIMIT,UN," . - "TIME," . ($ds_row['start_time'] - 86400) . "," . ($ds_row['end_time'] - 86400) . "," . - "LIMIT,UN,MIN,UNKN,"; - } - $time_post = ",IF"; - $time_shaping = true; - } - else - { - $time_shaping = false; - $time_pre = ""; - $time_post = ""; - } - - // Data is from a monitor - if ($ds_row['mon_id'] >= 0) - { - if ($templated) - { - $ds_row["mon_id"] = dereference_templated_monitor($ds_row["mon_id"], $_REQUEST['subdev_id']); - } - - $rawness = (($ds_row["multiplier"] == "1") && !$time_shaping) ? "" : "raw_"; - $command .= " DEF:" . $rawness . "data" . $ds_count . "=" . $GLOBALS['netmrg']['rrdroot'] . "/mon_" . $ds_row["mon_id"] . ".rrd:mon_" . $ds_row["mon_id"] . ":AVERAGE " . - " DEF:" . $rawness . "data" . $ds_count . "l=" . $GLOBALS['netmrg']['rrdroot'] . "/mon_" . $ds_row["mon_id"] . ".rrd:mon_" . $ds_row["mon_id"] . ":LAST " . - " DEF:" . $rawness . "data" . $ds_count . "m=" . $GLOBALS['netmrg']['rrdroot'] . "/mon_" . $ds_row["mon_id"] . ".rrd:mon_" . $ds_row["mon_id"] . ":MAX "; - - if (($ds_row["multiplier"] != "1") || $time_shaping) - { - if ($templated) - { - $fields = expand_parameters(array($ds_row["multiplier"]), $_REQUEST['subdev_id']); - $ds_row["multiplier"] = $fields[0]; - } - $ds_row["multiplier"] = simple_math_parse($ds_row["multiplier"]); - $command .= "CDEF:data" . $ds_count . "=" . $time_pre . "raw_data" . $ds_count . "," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "l=" . $time_pre . "raw_data" . $ds_count . "l," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "m=" . $time_pre . "raw_data" . $ds_count . "m," . $ds_row["multiplier"] . ",*" . $time_post . " "; - } - } - // Data is from a fixed value - elseif ($ds_row['mon_id'] == -1) - { - if ($templated) - { - $fields = expand_parameters(array($ds_row["multiplier"]), $_REQUEST['subdev_id']); - $ds_row["multiplier"] = $fields[0]; - } - if ($ds_row["multiplier"] != "INF") - { - $ds_row["multiplier"] = simple_math_parse($ds_row["multiplier"]); - $command .= "CDEF:data" . $ds_count . "=" . $time_pre . "zero,UN,1,1,IF," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "l=" . $time_pre . "zero,UN,1,1,IF," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "m=" . $time_pre . "zero,UN,1,1,IF," . $ds_row["multiplier"] . ",*" . $time_post . " "; - } - else - { - $command .= "CDEF:data" . $ds_count . "=" . $time_pre . "zero,UN,INF,INF,IF" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "l=" . $time_pre . "zero,UN,INF,INF,IF" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "m=" . $time_pre . "zero,UN,INF,INF,IF" . $time_post. " "; - } - } - // Data is the sum of all prior items - elseif ($ds_row['mon_id'] == -2) - { - $command .= "CDEF:data" . $ds_count . "=" . $time_pre . $CDEF_A . "," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "l=" . $time_pre . $CDEF_L . "," . $ds_row["multiplier"] . ",*" . $time_post . " "; - $command .= "CDEF:data" . $ds_count . "m=" . $time_pre . $CDEF_M . "," . $ds_row["multiplier"] . ",*" . $time_post . " "; - - // Reset totals - $CDEF_A = "zero,UN,0,0,IF"; - $CDEF_L = "zero,UN,0,0,IF"; - $CDEF_M = "zero,UN,0,0,IF"; - } - - $command .= $ds_row["type"] . ":data" . $ds_count . $ds_row["color"] . rrd_legend_escape(do_align($ds_row["label"], $padded_length, $ds_row["alignment"])) . " "; - - // define the formatting string - if (isin($ds_row["stats"], "INTEGER")) - { - $format = "%5.0lf"; - } - else - { - $format = "%8.2lf %s"; - } - - // Display each field requested - if (isin($ds_row["stats"], "CURRENT")) - { - $command .= 'GPRINT:data' . $ds_count . 'l:LAST:"Current\\:' . $format . '" '; - } - - if (isin($ds_row["stats"], "AVERAGE")) - { - $command .= 'GPRINT:data' . $ds_count . ':AVERAGE:"Average\\:' . $format . '" '; - } - - if (isin($ds_row["stats"], "MAXIMUM")) - { - $command .= 'GPRINT:data' . $ds_count . 'm:MAX:"Maximum\\:' . $format . '" '; - } - - if (isin($ds_row["stats"], "SUMS")) - { - if ($ds_row['mon_id'] > 0) - { - $sum_val = rrd_sum($ds_row['mon_id'], -1 * $timeframe['sum_time'], "now", $timeframe['sum_time']); - if (isin($ds_row["stats"], "MULTSUM")) - { - $sum_val = $sum_val * $ds_row['multiplier']; - } - $total_sum += $sum_val; - } - elseif ($ds_row['mon_id'] == -2) - { - $sum_val = $total_sum; - $total_sum = 0; - } - - if (isin($ds_row["stats"], "INTEGER")) - { - $sum_text = sprintf("%.0f", $sum_val); - } - else - { - $sum_text = sanitize_number($sum_val); - } - - $command .= " COMMENT:'". $timeframe['sum_label'] . " Sum" . esc_colon() . ": $sum_text" . "' "; - } - - if ($ds_row['label'] != "") - $command .= 'COMMENT:"\\n" '; - - // add to the running total CDEF - if (($ds_row["multiplier"] != "INF") && ($ds_row["mon_id"] != -2)) - { - $CDEF_A .= ",data" . $ds_count . ",UN,0,data" . $ds_count . ",IF,+"; - $CDEF_L .= ",data" . $ds_count . "l,UN,0,data" . $ds_count . ",IF,+"; - $CDEF_M .= ",data" . $ds_count . "m,UN,0,data" . $ds_count . ",IF,+"; - } - } - - // make MRTG-like VRULE - $command .= " VRULE:" . $timeframe['break_time'] . "#F00000"; - - // print out the graph comment, if any - if ($graph_row["comment"] != "''") - { - $temp_comment = str_replace(":", esc_colon() . ":", $graph_row["comment"]); - $temp_comment = str_replace("%n", '\' COMMENT:\\\n COMMENT:\'', $temp_comment); - $command .= ' COMMENT:\\\n'; - $command .= ' COMMENT:' . $temp_comment; - $command .= ' COMMENT:\\\n'; - } - - return($command); -} - -?> diff -Nurb netmrg-0.19/www/lib/misc.php netmrg-0.20/ChangeLog/www/lib/misc.php --- netmrg-0.19/www/lib/misc.php 2005-07-07 05:54:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/misc.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,65 +0,0 @@ -'); - - return $img; -} // end get_img_tag_from_status() - - -function get_color_from_situation($situation) -{ - switch ($situation) - { - case 0: $color = "blue"; break; - case 1: $color = "green"; break; - case 2: $color = "yellow"; break; - case 3: $color = "red"; break; - default: $color = "blue"; break; - } // end switch situation - - return $color; - -} // end get_color_from_situation() - - -// seed with microseconds -function make_seed() -{ - list($usec, $sec) = explode(' ', microtime()); - return (float) $sec + ((float) $usec * 100000); -} - - -function htmlcolor_to_rgb($htmlcolor) -{ - $c = str_replace("#", "", $htmlcolor); - $r1 = substr($c,0,2); - $g1 = substr($c,2,2); - $b1 = substr($c,4,2); - $r = hexdec($r1); - $g = hexdec($g1); - $b = hexdec($b1); - return array("r" => $r, "g" => $g, "b" => $b); -} - - -function rgb_to_htmlcolor($r, $g, $b) -{ - return sprintf("#%02x%02x%02x", $r, $g, $b); -} - - -?> diff -Nurb netmrg-0.19/www/lib/phptimer.php netmrg-0.20/ChangeLog/www/lib/phptimer.php --- netmrg-0.19/www/lib/phptimer.php 2004-03-16 05:04:22.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/phptimer.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,94 +0,0 @@ -addmarker("Start"); - } - // end function start() - - // call this function at the end of the script - function stop() { - // see the addmarker() function later on - $this->addmarker("Stop"); - } - // end function stop() - - // this function is called to add a marker during the scripts execution - // it requires a descriptive name - function addmarker($name) { - // call the jointime() function and pass it the output of the microtime() function - // as an argument - $markertime = $this->jointime(microtime()); - // $ae (stands for Array Elements) will contain the number of elements - // currently in the $points array - $ae = count($this->points); - // store the timestamp and the descriptive name in the array - $this->points[$ae][0] = $markertime; - $this->points[$ae][1] = $name; - } - // end function addmarker() - - // this function manipulates the string that we get back from the microtime() function - function jointime($mtime) { - // split up the output string from microtime() that has been passed - // to the function - $timeparts = explode(" ",$mtime); - // concatenate the two bits together, dropping the leading 0 from the - // fractional part - $finaltime = $timeparts[1].substr($timeparts[0],1); - // return the concatenated string - return $finaltime; - } - // end function jointime() - - // this function simply give the difference in seconds betwen the start of the script and - // the end of the script - function showtime() { - return round( (($this->points[count($this->points)-1][0]) - ($this->points[0][0])), 6); - } - // end function showtime() - - // this function displays all of the information that was collected during the - // course of the script - function debug() { - echo "Script execution debug information:"; - echo "\n"; - // the format of our table will be 3 columns: - // Marker name, Timestamp, difference - echo "\n"; - // the first row will have no difference since it is the first timestamp - echo "\n"; - echo ""; - echo ""; - echo "\n"; - echo "\n"; - // our loop through the $points array must start at 1 rather than 0 because we have - // already written out the first row - for ($i = 1; $i < count($this->points);$i++) { - echo "\n"; - echo ""; - echo ""; - echo ""; - echo "\n"; - } - echo ''."\n"; - echo '\n"; - echo "\n"; - echo "
MarkerTimeDiff
".$this->points[0][1]."".$this->points[0][0]."-
".$this->points[$i][1]."".$this->points[$i][0].""; - // write out the difference between this row and the previous row - echo round( ($this->points[$i][0] - $this->points[$i-1][0]), 6); - echo "
Start to Stop'.round( ($this->points[count($this->points)-1][0] - $this->points[0][0]), 6)."
"; - } - // end function debug() -} -// end class PHP_timer - -?> diff -Nurb netmrg-0.19/www/lib/processing.php netmrg-0.20/ChangeLog/www/lib/processing.php --- netmrg-0.19/www/lib/processing.php 2006-01-10 07:33:41.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/processing.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,1414 +0,0 @@ - 10000) - { - return "Never"; - exit; - } - $num_secs = $new_secs; - $new_secs = $num_secs % 3600; - $hours = ($num_secs - $new_secs) / 3600; - $num_secs = $new_secs; - $new_secs = $num_secs % 60; - $mins = ($num_secs - $new_secs) / 60; - - $res = ""; - if ($the_secs > 0) - { - if ($days > 0) - { - $res = sprintf("%d days, ", $days); - } - $res .= sprintf("%02d:%02d:%02d", $hours, $mins, $new_secs); - } - else - { - $res .= "Unavailable"; - } - - return $res; - -} // end format_time_elapsed - - -function sanitize_number($number, $round_to = 2) -{ - - $format = "%4." . $round_to . "f"; - - if ($number < 1000) - { - return sprintf($format, $number); - } - elseif ($number < 1000000) - { - return sprintf("$format k", $number / 1000); - } - elseif ($number < 1000000000) - { - return sprintf("$format M", $number / 1000000); - } - elseif ($number < 1000000000000) - { - return sprintf("$format G", $number / 1000000000); - } - else - { - return sprintf("$format T", $number / 1000000000000); - } - -} // end sanitize_number - -function paraphrase($string, $length, $etc = "...") -{ - if (strlen($string) <= $length) - return $string; - - return substr($string, 0, $length) . $etc; -} - -function make_spaces($length) -{ - return str_repeat(" ", $length); -} // end make_spaces - -function make_nbsp($length) -{ - return str_repeat(" ", $length); -} // end make_nbsp - - -// prepends spaces to a string to cause it to be a certain length -function align_right($string, $length) -{ - $space_length = $length - strlen($string); - return(make_spaces($space_length) . $string); -} // end align_right - - -function align_left($string, $length) -{ - $space_length = $length - strlen($string); - return($string . make_spaces($space_length)); -} // end align_left - - -function align_right_split($string, $length) -{ - $space_length = $length - strlen($string); - $pos = strrchr($string, " "); - return(substr($string, 0, -strlen($pos)) . make_spaces($space_length) . $pos); -} //end align_right_split - - -// manipulates a string by applying the appropriate padding method -function do_align($string, $length, $method) -{ - if ($string == "") return ""; - - switch ($method) - { - case 1: - $result = align_left($string, $length); - break; - case 2: - $result = align_right($string, $length); - break; - case 3: - $result = align_right_split($string, $length); - break; - } // end switch($method) - - return($result); -} // end do_align - -function rrd_legend_escape($string) -{ - if ($string == "") return ""; - $string = str_replace(":", "\:", $string); - return (":" . escapeshellarg($string)); -} - -function get_microtime() -{ - list($usec, $sec) = explode(" ", microtime()); - return ((float)$usec + (float)$sec); -} - -function isin($haystack, $needle) -{ - return is_integer(strpos($haystack, $needle)); -} - -function compare_interface_names($a, $b) -{ - $astuff = preg_split("~([-/\. ])~", strtolower(trim($a)), 0, PREG_SPLIT_DELIM_CAPTURE); - $bstuff = preg_split("~([-/\. ])~", strtolower(trim($b)), 0, PREG_SPLIT_DELIM_CAPTURE); - for ($i = 0; $i < max(count($astuff), count($bstuff)); $i++) - { - if (isset($astuff[$i])) - { - if (isset($bstuff[$i])) - { - if ($astuff[$i] != $bstuff[$i]) - { - if (is_numeric($astuff[$i]) && (is_numeric($bstuff[$i]))) - { - return $astuff[$i] - $bstuff[$i]; - } - else - { - return strcmp($astuff[$i], $bstuff[$i]); - } - } - } - else - { - return 1; - } - } - else - { - return -1; - } - } - return 0; -} - -function compare_mac_addresses($a, $b) -{ - $astuff = explode(":", $a); - $bstuff = explode(":", $b); - for ($i = 0; $i < 6; $i++) if (strlen($astuff[$i]) == 1) { $astuff[$i] = "0" . $astuff[$i]; } - for ($i = 0; $i < 6; $i++) if (strlen($bstuff[$i]) == 1) { $bstuff[$i] = "0" . $bstuff[$i]; } - $a1 = implode("", $astuff); - $b1 = implode("", $bstuff); - return strcmp($a1, $b1); -} - -function compare_ip_addresses($a, $b) -{ - $astuff = explode(".", $a); - $bstuff = explode(".", $b); - for ($i = 0; $i < 4; $i++) while (strlen($astuff[$i]) != 3) { $astuff[$i] = "0" . $astuff[$i]; } - for ($i = 0; $i < 4; $i++) while (strlen($bstuff[$i]) != 3) { $bstuff[$i] = "0" . $bstuff[$i]; } - $a1 = implode("", $astuff); - $b1 = implode("", $bstuff); - return strcmp($a1, $b1); -} - -/** -* simple_math_parse($input) -* -* $input - string to be parsed -* -* use eval to do math if everything looks safe. -* -* -*/ - -function simple_math_parse($input) -{ - $val = 1; - if (!preg_match("/[^012345467890.\/*\-+]/", $input)) - { - eval("\$val = $input;"); - } - return $val; -} - - -// RRD Support Functions - -/** -* rrd_sum($mon_id, $start, $end, $resolution) -* -* $mon_id = monitor id of RRD to sum -* $start = start time, formatted for RRDTOOL -* $end = end time, formatted for RRDTOOL (defaults to "now") -* $resolution = resolution of data, formatted for RRDTOOL (defaults to 1 day) -*/ -function rrd_sum($mon_id, $start, $end = "now", $resolution = 86400) -{ - $rrd_handle = popen($GLOBALS['netmrg']['rrdtool'] . " fetch " . $GLOBALS['netmrg']['rrdroot'] . "/mon_" . - $mon_id . ".rrd AVERAGE -r $resolution -s $start -e $end", "r"); - - $row_count = 0; - $sum = 0; - - while ($row = fgets($rrd_handle)) - { - // the first two lines are of no use - if ($row_count > 1) - { - // ignore missing data points - if (!preg_match("/nan/i", $row)) - { - $row_val = preg_replace("/.*: /", "", $row); - list($mantissa, $exponent) = preg_split("/e/i", $row_val); - $row_value = $mantissa * pow(10, intval($exponent)); - $sum += $row_value; - } - } - $row_count++; - } - - $average = $sum / ($row_count - 1); - $total_sum = $average * $resolution; - pclose($rrd_handle); - return $total_sum; -} - -/** -* rrdtool_syntax_highlight($txt) -* -* $txt = a string normally passed to rrdtool -*/ -function rrdtool_syntax_highlight($txt) -{ - $txt = preg_replace("/(#[0-9,a-f,A-F]+)/", "\\1", $txt); - $txt = preg_replace("/(\s)DEF:/", "\\1DEF:", $txt); - $txt = str_replace("\\n", "\\n", $txt); - $txt = str_replace("CDEF", "CDEF", $txt); - $txt = preg_replace("/(\s)(AREA|STACK|LINE1|LINE2|LINE3|HRULE|VRULE):/", "\\1\\2:", $txt); - $txt = preg_replace("/:(MAX|AVERAGE|LAST)/", ":\\1", $txt); - $txt = preg_replace("/(\s)(GPRINT|PRINT|COMMENT):/", "\\1\\2:", $txt); - $txt = preg_replace("/(data\d+[lm]*)/", "\\1", $txt); - //$txt = preg_replace("/=(.*\.rrd):/", "=\\1:", $txt); - //$txt = preg_replace("/(\s)(\-+)(\s)/", "\\1\\2\\3", $txt); - //$txt = preg_replace("/:(\".*\") /", ":\\1", $txt); - return $txt; -} - -// Templating Functions - -function expand_parameters($input, $subdev_id) -{ - $query = db_query("SELECT * FROM sub_dev_variables WHERE type='dynamic' AND sub_dev_id=$subdev_id"); - - while (($row = db_fetch_array($query)) != NULL) - { - $input = str_replace("%" . $row['name'] . "%", $row['value'], $input); - } - - //$input = preg_replace("/\%..+\%/", "N/A", $input); - - return $input; -} // expand_parameters() - -function apply_template($subdev_id, $template_id) -{ - - // add the appropriate monitors to the subdevice - $q = db_query("SELECT monitors.id, data_type, test_id, test_type, test_params, min_val, max_val FROM graph_ds, monitors WHERE graph_ds.graph_id='$template_id' AND graph_ds.mon_id=monitors.id"); - for ($i = 0; $i < db_num_rows($q); $i++) - { - $row = db_fetch_array($q); - if (empty($row['min_val'])) $row['min_val'] = "NULL"; - if (empty($row['max_val'])) $row['max_val'] = "NULL"; - - // only add a new monitor if there is no existing one that matches the template - if (dereference_templated_monitor($row['id'], $subdev_id) === false) - { - db_update("INSERT INTO monitors SET sub_dev_id=$subdev_id, data_type={$row['data_type']}, test_id={$row['test_id']}, test_type={$row['test_type']}, test_params='{$row['test_params']}', min_val={$row['min_val']}, max_val={$row['max_val']}"); - } - } - - // add templated graph to the device's view - $q = db_query("SELECT dev_id FROM sub_devices WHERE id=$subdev_id"); - $sd_row = db_fetch_array($q); - - $q = db_query("SELECT max(pos)+1 AS newpos FROM view WHERE object_type='device' AND object_id={$sd_row['dev_id']}"); - $pos_row = db_fetch_array($q); - if (!isset($pos_row['newpos']) || empty($pos_row['newpos'])) - { - $pos_row['newpos'] = 1; - } - - db_update("INSERT INTO view SET object_id={$sd_row['dev_id']}, object_type='device', graph_id=$template_id, type='template', pos={$pos_row['newpos']}, subdev_id=$subdev_id"); - - // add templated graph to the sub-device's view - $q = db_query("SELECT max(pos)+1 AS newpos FROM view WHERE object_type='subdevice' AND object_id=$subdev_id"); - $pos_row = db_fetch_array($q); - if (!isset($pos_row['newpos']) || empty($pos_row['newpos'])) - { - $pos_row['newpos'] = 1; - } - - db_update("INSERT INTO view SET object_id=$subdev_id, object_type='subdevice', graph_id=$template_id, type='template', pos={$pos_row['newpos']}, subdev_id=$subdev_id"); - -} // apply_template() - - -// Recursive status determination section - -//Takes a grp_id and returns the current group aggregate status -function get_group_status($grp_id) -{ - $status = -1; - - $grp_results = db_query("SELECT id FROM groups WHERE parent_id=$grp_id"); - - while ($grp_row = db_fetch_array($grp_results)) - { - $grp_status = get_group_status($grp_row["id"]); - if (($grp_status > $status) && ($grp_status != 4)) - { - $status = $grp_status; - } - } // end while rows left - - $dev_results = db_query(" - SELECT max(devices.status) AS status - FROM dev_parents, devices - WHERE grp_id = $grp_id - AND dev_parents.dev_id=devices.id - AND devices.status < 4 - GROUP BY grp_id"); - $dev_row = db_fetch_array($dev_results); - $grp_status = $dev_row["status"]; - if ($grp_status > $status) - { - $status = $grp_status; - } - - return $status; - -} // end get_group_status() - - - -// Uniform Name Creation Section - -function get_short_monitor_name($mon_id) -{ - GLOBAL $TEST_TYPES; - - $mon_query = db_query(" - SELECT test_id, test_params, test_type - FROM monitors - WHERE monitors.id = $mon_id"); - $mon_row = db_fetch_array($mon_query); - - switch($mon_row["test_type"]) - { - case 1: - $test_query = "SELECT name FROM tests_script WHERE id = " . $mon_row["test_id"]; - break; - case 2: - $test_query = "SELECT name FROM tests_snmp WHERE id = " . $mon_row["test_id"]; - break; - case 3: - $test_query = "SELECT name FROM tests_sql WHERE id = " . $mon_row["test_id"]; - break; - case 4: - $test_query = "SELECT name FROM tests_internal WHERE id = " . $mon_row["test_id"]; - break; - - } // end switch test type - - $test_row = db_fetch_array(db_query($test_query)); - - $res = $test_row["name"]; - - if ($mon_row["test_params"] != "") - { - $res .= " - " . $mon_row["test_params"]; - } - - return $res; -} // end get_short_monitor_name() - - -function get_monitor_name($mon_id) -{ - $query_handle = db_query(" - SELECT devices.name AS dev_name, - sub_devices.name AS sub_name - FROM monitors - LEFT JOIN sub_devices ON monitors.sub_dev_id=sub_devices.id - LEFT JOIN devices ON sub_devices.dev_id=devices.id - WHERE monitors.id=$mon_id"); - - $row = db_fetch_array($query_handle); - - return $row["dev_name"] . " - " . $row["sub_name"] . " (" . get_short_monitor_name($mon_id) . ")"; -} // end get_monitor_name() - -function get_graph_name($graph_id) -{ - $graph_query = db_query("SELECT name FROM graphs WHERE id=$graph_id"); - $graph_row = db_fetch_array($graph_query); - return $graph_row["name"]; -} - -function get_group_name($grp_id) -{ - $grp_query = db_query("SELECT name FROM groups WHERE id=$grp_id"); - $grp_row = db_fetch_array($grp_query); - return $grp_row["name"]; -} - -function get_device_name($dev_id) -{ - $dev_query = db_query("SELECT name FROM devices WHERE id=$dev_id"); - $dev_row = db_fetch_array($dev_query); - return $dev_row["name"]; -} - -function get_sub_device_name($sub_dev_id) -{ - $dev_query = db_query("SELECT name FROM sub_devices WHERE id = $sub_dev_id"); - $row = db_fetch_array($dev_query); - return $row["name"]; -} - -function get_dev_sub_device_name($sub_dev_id) -{ - $dev_query = db_query(" - SELECT devices.name AS dev_name, sub_devices.name AS sub_name - FROM sub_devices - LEFT JOIN devices ON sub_devices.dev_id=devices.id - WHERE sub_devices.id = $sub_dev_id"); - $row = db_fetch_array($dev_query); - return $row["dev_name"] . " - " . $row["sub_name"]; -} - -function get_event_name($event_id) -{ - $e_query = db_query("SELECT name FROM events WHERE id=$event_id"); - $e_row = db_fetch_array($e_query); - return $e_row["name"]; -} - - -/** -* GetNumAssocItems($object_type, $object_id) -* -* $object_type = (group, device, monitor, event) -* $object_id = id -*/ -function GetNumAssocItems($object_type, $object_id) -{ - $db_result = db_query(" - SELECT count(*) AS count - FROM view, graphs - WHERE view.graph_id = graphs.id - AND object_type='$object_type' - AND object_id='$object_id'"); - $row = db_fetch_array($db_result); - return $row["count"]; -} // end GetNumAssocItems(); - - -/** -* GetGroupParents($group_id); -* -* returns all the groups parent group ids -*/ -function GetGroupParents($group_id) -{ - $group_arr = array(); - $group_item = $group_id; - - while ($group_item != 0) - { - $group_item = db_fetch_cell("SELECT parent_id FROM groups WHERE id = '$group_item'"); - array_push($group_arr, $group_item); - } // end while more parents - - return $group_arr; -} // end GetGroupParents(); - - -/** -* GetGroups($type,$id); -* -* returns an array of groups that this $type is in -* -*/ -function GetGroups($type,$id) -{ - $group_arr = array(); - switch ($type) - { - case "group": - $query = array("SELECT '$id' as group_id"); - break; - case "device": - $query = array(" - SELECT groups.id AS group_id - FROM groups, dev_parents, devices - WHERE devices.id = '$id' - AND devices.id = dev_parents.dev_id - AND dev_parents.grp_id = groups.id - GROUP BY group_id"); - break; - case "subdevice": - $query = array(" - SELECT groups.id AS group_id - FROM groups, dev_parents, devices, sub_devices - WHERE sub_devices.id = '$id' - AND sub_devices.dev_id = devices.id - AND devices.id = dev_parents.dev_id - AND dev_parents.grp_id = groups.id - GROUP BY group_id", - " - SELECT object_id AS group_id - FROM view - WHERE object_type='group' - AND subdev_id = '$id' - GROUP BY group_id" - ); - break; - case "monitor": - $query = array(" - SELECT groups.id AS group_id - FROM groups, dev_parents, devices, sub_devices, monitors - WHERE monitors.id = '$id' - AND sub_devices.id = monitors.sub_dev_id - AND sub_devices.dev_id = devices.id - AND devices.id = dev_parents.dev_id - AND dev_parents.grp_id = groups.id - GROUP BY group_id"); - break; - case "customgraph": - $query = array(" - SELECT object_id, object_type - FROM view - WHERE type = 'graph' - AND graph_id = '$id'"); - break; - default: - // an unknown type should have no groups - return $group_arr; - } // end switch($type) - - foreach ($query as $sql_cmd) - { - $db_result = db_query($sql_cmd); - while ($r = mysql_fetch_array($db_result)) - { - if ($type == "customgraph") - { - $group_arr = array_merge($group_arr, GetGroups($r["object_type"],$r["object_id"])); - } - else - { - array_push($group_arr, $r["group_id"]); - $group_arr = array_merge($group_arr, GetGroupParents($r["group_id"])); - } - } // end while we have results - } - - return $group_arr; -} // end GetGroups(); - - -/** -* GetSubdeviceParent($subdevice_id); -* -* returns the parent device of the $subdevice_id -* -* @param integer subdevice_id -*/ -function GetSubdeviceParent($subdevice_id) -{ - return db_fetch_cell("SELECT dev_id FROM sub_devices WHERE id = '$subdevice_id'"); -} // end GetSubdeviceParent(); - - -/** -* GetUsername($uid) -* -* returns the username for a uid -*/ -function GetUsername($uid) -{ - $sql = "SELECT user FROM user WHERE id='$uid'"; - $handle = db_query($sql); - $row = db_fetch_array($handle); - return $row["user"]; -} // end GetUsername(); - -// Recursive Duplication Section - -function duplicate_device($dev_id) -{ - // duplicate device - db_query("CREATE TEMPORARY TABLE tmpdev - SELECT id, name, ip, snmp_read_community, dev_type, snmp_recache_method, - disabled, snmp_avoided, snmp_uptime, snmp_ifnumber, snmp_version, snmp_timeout, - snmp_retries, snmp_port, no_snmp_uptime_check - FROM devices - WHERE id='$dev_id'"); - db_query(" - INSERT INTO devices - (name, ip, snmp_read_community, dev_type, snmp_recache_method, disabled, - snmp_avoided, snmp_uptime, snmp_ifnumber, snmp_version, snmp_timeout, - snmp_retries, snmp_port, no_snmp_uptime_check) - SELECT concat(name, ' (duplicate)'), ip, snmp_read_community, dev_type, snmp_recache_method, - disabled, snmp_avoided, snmp_uptime, snmp_ifnumber, snmp_version, snmp_timeout, - snmp_retries, snmp_port, no_snmp_uptime_check - FROM tmpdev - WHERE id='$dev_id'"); - $new_dev_id = db_insert_id(); - db_query("DROP TABLE tmpdev"); - - // duplicate parent associations - db_query("CREATE TEMPORARY TABLE tmp_dev_parents - SELECT grp_id, dev_id FROM dev_parents WHERE dev_id=$dev_id"); - db_query("INSERT INTO dev_parents (grp_id, dev_id) - SELECT grp_id, $new_dev_id FROM tmp_dev_parents WHERE dev_id=$dev_id"); - db_query("DROP TABLE tmp_dev_parents"); - - // duplicate view - db_query("CREATE TEMPORARY TABLE tmp_view - SELECT object_id, object_type, graph_id, type, pos, separator_text, subdev_id - FROM view WHERE object_id=$dev_id AND object_type='device'"); - db_query("INSERT INTO view (object_id, object_type, graph_id, type, pos, separator_text, subdev_id) - SELECT $new_dev_id, object_type, graph_id, type, pos, separator_text, subdev_id - FROM tmp_view WHERE object_id=$dev_id AND object_type='device'"); - db_query("DROP TABLE tmp_view"); - - // duplicate subdevices - $res = db_query("SELECT id FROM sub_devices WHERE dev_id=$dev_id"); - while ($row = db_fetch_array($res)) - { - duplicate_subdevice($row['id'], $new_dev_id); - } - -} // end duplicate_device(); - -function duplicate_subdevice($subdev_id, $new_parent = -1) -{ - if ($new_parent == -1) - { - $new_parent = "dev_id"; - $name = "concat(name, ' (duplicate)')"; - } - else - { - $name = "name"; - } - - // duplicate subdevice - db_query("CREATE TEMPORARY TABLE tmp_sub_devices SELECT id, dev_id, type, name FROM sub_devices WHERE id=$subdev_id"); - db_query("INSERT INTO sub_devices (dev_id, type, name) SELECT $new_parent, type, $name FROM tmp_sub_devices WHERE id=$subdev_id"); - $new_subdev_id = db_insert_id(); - db_query("DROP TABLE tmp_sub_devices"); - - // duplicate parameters - db_query("CREATE TEMPORARY TABLE tmp_sub_dev_variables - SELECT sub_dev_id, name, value, type FROM sub_dev_variables WHERE sub_dev_id=$subdev_id"); - db_query("INSERT INTO sub_dev_variables (sub_dev_id, name, value, type) - SELECT $new_subdev_id, name, value, type FROM tmp_sub_dev_variables WHERE sub_dev_id=$subdev_id"); - db_query("DROP TABLE tmp_sub_dev_variables"); - - if ($new_parent != "dev_id") - { - // translate subdevices on device view - $res = db_query("SELECT id FROM view WHERE object_id=$new_parent AND object_type='device' AND type='template' AND subdev_id=$subdev_id"); - while ($row = db_fetch_array($res)) - { - db_query("UPDATE view SET subdev_id=$new_subdev_id WHERE id={$row['id']}"); - } - } - - // duplicate monitors - $res = db_query("SELECT id FROM monitors WHERE sub_dev_id=$subdev_id"); - while ($row = db_fetch_array($res)) - { - duplicate_monitor($row['id'], $new_subdev_id); - } -} // end duplicate_subdevice(); - -function duplicate_monitor($mon_id, $new_parent = "sub_dev_id") -{ - // duplicate monitor - db_query("CREATE TEMPORARY TABLE tmp_monitors - SELECT id, sub_dev_id, data_type, min_val, max_val, test_type, test_id, test_params FROM monitors - WHERE id=$mon_id"); - db_query("INSERT INTO monitors (sub_dev_id, data_type, min_val, max_val, test_type, test_id, test_params) - SELECT $new_parent, data_type, min_val, max_val, test_type, test_id, test_params FROM tmp_monitors - WHERE id=$mon_id"); - $new_mon_id = db_insert_id(); - db_query("DROP TABLE tmp_monitors"); - - // duplicate events - $res = db_query("SELECT id FROM events WHERE mon_id=$mon_id"); - while ($row = db_fetch_array($res)) - { - duplicate_event($row['id'], $new_mon_id); - } -} // end duplicate_monitor(); - -function duplicate_event($ev_id, $new_parent = -1) -{ - if ($new_parent == -1) - { - $new_parent = "mon_id"; - $name = "concat(name, ' (duplicate)')"; - } - else - { - $name = "name"; - } - - // duplicate event - db_query("CREATE TEMPORARY TABLE tmp_events - SELECT id, mon_id, trigger_type, situation, name - FROM events WHERE id=$ev_id"); - db_query("INSERT INTO events (mon_id, trigger_type, situation, name) - SELECT $new_parent, trigger_type, situation, $name - FROM tmp_events WHERE id=$ev_id"); - $new_ev_id = db_insert_id(); - db_query("DROP TABLE tmp_events"); - - // duplicate conditions - db_query("CREATE TEMPORARY TABLE tmp_conditions - SELECT event_id, value, condition, logic_condition, value_type - FROM conditions WHERE event_id=$ev_id"); - db_query("INSERT INTO conditions (event_id, value, condition, logic_condition, value_type) - SELECT $new_ev_id, value, condition, logic_condition, value_type - FROM tmp_conditions WHERE event_id=$ev_id"); - db_query("DROP TABLE tmp_conditions"); - - // duplicate responses - $res = db_query("SELECT id FROM responses WHERE event_id = $ev_id"); - while ($row = db_fetch_array($res)) - { - duplicate_response($row['id'], $new_ev_id); - } -} // end duplicate_event(); - -function duplicate_response($rsp_id, $new_parent = "event_id") -{ - db_query("CREATE TEMPORARY TABLE tmp_responses - SELECT id, event_id, notification_id, parameters FROM responses WHERE id=$rsp_id"); - db_query("INSERT INTO responses (event_id, notification_id, parameters) - SELECT $new_parent, notification_id, parameters FROM tmp_responses WHERE id=$rsp_id"); - db_query("DROP TABLE tmp_responses"); -} // end duplicate_response(); - -function duplicate_graph($graph_id) -{ - db_query("CREATE TEMPORARY TABLE tmp_graphs - SELECT id, name, title, comment, width, height, vert_label, type, base, options, max, min FROM graphs WHERE id=$graph_id"); - db_query("INSERT INTO graphs (name, title, comment, width, height, vert_label, type, base, options, max, min) SELECT concat(name, ' (duplicate)'), title, comment, width, height, vert_label, type, base, options, max, min FROM tmp_graphs WHERE id=$graph_id"); - $new_grp_id = db_insert_id(); - db_query("DROP TABLE tmp_graphs"); - - $ds_handle = db_query("SELECT * FROM graph_ds WHERE graph_id='$graph_id'"); - while ($row = db_fetch_array($ds_handle)) - { - duplicate_graph_item($row['id'], $new_grp_id); - } -} // end duplicate_graph - -function duplicate_graph_item($item_id, $new_parent = -1) -{ - if ($new_parent == -1) - { - $new_parent = "graph_id"; - $label = "concat(label, ' (duplicate)')"; - $move_others = true; - } - else - { - $label = "label"; - $move_others = false; - } - - db_query("CREATE TEMPORARY TABLE tmp_graph_ds - SELECT id, mon_id, color, type, graph_id, label, alignment, stats, position, multiplier, start_time, end_time FROM graph_ds WHERE id=$item_id"); - db_query("INSERT INTO graph_ds (mon_id, color, type, graph_id, label, alignment, stats, position, multiplier, start_time, end_time) SELECT mon_id, color, type, $new_parent, $label, alignment, stats, position, multiplier, start_time, end_time FROM tmp_graph_ds WHERE id=$item_id"); - $new_id = db_insert_id(); - db_query("DROP TABLE tmp_graph_ds"); - if ($move_others) - { - $dq = db_query("SELECT graph_id, position FROM graph_ds WHERE id = $item_id"); - $dr = db_fetch_array($dq); - db_query("UPDATE graph_ds SET position = position+1 WHERE graph_id = {$dr['graph_id']} AND position > {$dr['position']}"); - db_query("UPDATE graph_ds SET position = position+1 WHERE id = $new_id"); - } -} - -function move_graph_item($graph_id, $graph_item_id, $direction) -{ - $query = db_query(" - SELECT id, position - FROM graph_ds - WHERE graph_id=$graph_id - ORDER BY position - "); - $row = array("id" => 0, "position" => 0); - for ($ds_count = 0; $ds_count < db_num_rows($query); $ds_count++) - { - $last_row = $row; - $row = db_fetch_array($query); - - if ($direction == "up") - { - if ($graph_item_id == $row['id']) - { - db_update("UPDATE graph_ds SET position = {$last_row['position']} WHERE id = {$row['id']}"); - db_update("UPDATE graph_ds SET position = {$row['position']} WHERE id = {$last_row['id']}"); - break; - } - } - else - { - if ($graph_item_id == $row['id']) - { - $next_row = db_fetch_array($query); - db_update("UPDATE graph_ds SET position = {$next_row['position']} WHERE id = {$row['id']}"); - db_update("UPDATE graph_ds SET position = {$row['position']} WHERE id = {$next_row['id']}"); - break; - } - } - } -} - -function delete_view_item($item_id) -{ - $q = db_query("SELECT pos, object_id, object_type FROM view WHERE id=" . $item_id); - $r = db_fetch_array($q); - - $pos = $r["pos"]; - - db_update("DELETE FROM view WHERE id=" . $item_id); - - db_update("UPDATE view SET pos = pos - 1 - WHERE object_id=" . $r["object_id"] . " - AND object_type='" . $r["object_type"] . "' - AND pos > " . $pos); -} - -function is_view_item_extreme($object_id, $object_type, $item_id, $which) -{ - $query = db_query(" - SELECT id, pos - FROM view - WHERE object_id=$object_id - AND object_type='$object_type' - ORDER BY pos $which"); - - $row = db_fetch_array($query); - - return ($row['id'] == $item_id); -} - -function is_view_item_top($object_id, $object_type, $item_id) -{ - return is_view_item_extreme($object_id, $object_type, $item_id, "ASC"); -} - -function is_view_item_bottom($object_id, $object_type, $item_id) -{ - return is_view_item_extreme($object_id, $object_type, $item_id, "DESC"); -} - -function move_view_item($object_id, $object_type, $item_id, $direction) -{ - //echo ("$object_id, $object_type, $item_id, $direction"); - $query = db_query(" - SELECT id, pos - FROM view - WHERE object_id=$object_id - AND object_type='$object_type' - ORDER BY pos"); - - $row = array("id" => 0, "pos" => 0); - - for ($i = 0; $i < db_num_rows($query); $i++) - { - $last_row = $row; - $row = db_fetch_array($query); - - if ($direction == "up") - { - if ($item_id == $row['id']) - { - $next_row = db_fetch_array($query); - db_update("UPDATE view SET pos = {$last_row['pos']} WHERE object_id = $object_id AND object_type = '$object_type' AND id = {$row['id']}"); - db_update("UPDATE view SET pos = {$row['pos']} WHERE object_id = $object_id AND object_type = '$object_type' AND id = {$last_row['id']}"); - break; - } - } - else - { - if ($item_id == $row['id']) - { - $next_row = db_fetch_array($query); - db_update("UPDATE view SET pos = {$next_row['pos']} WHERE object_id = $object_id AND object_type = '$object_type' AND id = {$row['id']}"); - db_update("UPDATE view SET pos = {$row['pos']} WHERE object_id = $object_id AND object_type = '$object_type' AND id = {$next_row['id']}"); - break; - } - } - } -} - -function move_view_item_top($object_id, $object_type, $item_id) -{ - while (!is_view_item_top($object_id, $object_type, $item_id)) - move_view_item($object_id, $object_type, $item_id, "up"); -} - -function move_view_item_bottom($object_id, $object_type, $item_id) -{ - while (!is_view_item_bottom($object_id, $object_type, $item_id)) - move_view_item($object_id, $object_type, $item_id, "down"); -} - -// Recursive Deletion Section (for orphan prevention if nothing else) - -function delete_group($group_id) -{ - // get group info - $grp_info_handle = db_query("SELECT * FROM groups WHERE id='$group_id'"); - $grp_info = db_fetch_array($grp_info_handle); - - // reparent children groups - db_query("UPDATE groups SET parent_id = '{$grp_info['parent_id']}' WHERE parent_id = '$group_id'"); - - // delete the group - db_query("DELETE FROM groups WHERE id='$group_id'"); - - // delete the associated graphs - db_query("DELETE FROM view WHERE object_type='group' AND object_id='$group_id'"); - - // get devices in this group - $devs_in_grp_handle = db_query("SELECT dev_id FROM dev_parents WHERE grp_id='$group_id'"); - $devs_in_grp = array(); - while ($r = db_fetch_array($devs_in_grp_handle)) - { - array_push($devs_in_grp, $r["dev_id"]); - } // end while devices in this group - - // delete devices from this group - db_query("DELETE FROM dev_parents WHERE grp_id = '$group_id'"); - - // for each device we had, if it no longer has parents, delete it - foreach ($devs_in_grp as $device_id) - { - $dev_res = db_query("SELECT 1 FROM dev_parents WHERE dev_id = '$device_id'"); - if (db_num_rows($dev_res) == 0) - { - delete_device($device_id); - } // end delete if this device has no parents left - } // end foreach device we had - -} // end delete_group(); - - -function delete_device($device_id, $group_id = false) -{ - if ($group_id !== false) - { - // 'unparent' the device - db_update("DELETE FROM dev_parents WHERE dev_id = '$device_id' AND grp_id = '$group_id'"); - - /** If this device is not part of any groups anymore, finish deleting it **/ - $dev_parent_res = db_query("SELECT count(*) AS count FROM dev_parents WHERE dev_id = '$device_id'"); - $dev_parent_row = db_fetch_array($dev_parent_res); - } - else - { - $dev_parent_row["count"] = 0; - } - - if ($dev_parent_row["count"] == 0) - { - // delete the device - db_update("DELETE FROM devices WHERE id = '$device_id'"); - - // remove the interface for the device - db_update("DELETE FROM snmp_interface_cache WHERE dev_id = '$device_id'"); - - // remove the disk cache for the device - db_update("DELETE FROM snmp_disk_cache WHERE dev_id = '$device_id'"); - - // remove associated graphs - db_update("DELETE FROM view WHERE object_type='device' AND object_id = '$device_id'"); - - $subdev_handle = db_query("SELECT id FROM sub_devices WHERE dev_id = '$device_id'"); - - while ($subdev_row = db_fetch_array($subdev_handle)) - { - delete_subdevice($subdev_row["id"]); - } - } // end if no parents left for device -} // end delete_device(); - - -function delete_subdevice($subdev_id) -{ - // delete the subdevice - db_update("DELETE FROM sub_devices WHERE id='$subdev_id'"); - - // delete the subdevice parameters - db_update("DELETE FROM sub_dev_variables WHERE sub_dev_id='$subdev_id'"); - - $monitors_handle = db_query("SELECT id FROM monitors WHERE sub_dev_id='$subdev_id'"); - - while ($monitor_row = db_fetch_array($monitors_handle)) - { - delete_monitor($monitor_row["id"]); - } - - $view_handle = db_query("SELECT id FROM view WHERE type='template' AND subdev_id=$subdev_id"); - - while ($view_row = db_fetch_array($view_handle)) - { - delete_view_item($view_row['id']); - } - -} // end delete_subdevice(); - - -function delete_monitor($monitor_id) -{ - // check things that depend on this - // * custom graphs - // * template graphs - db_update("UPDATE graph_ds SET mon_id = '-1', type = '4', multiplier = '0' WHERE mon_id = '$monitor_id'"); - db_update("DELETE FROM monitors WHERE id='$monitor_id'"); - - $events_handle = db_query("SELECT id FROM events WHERE mon_id='$monitor_id'"); - while ($event_row = db_fetch_array($events_handle)) - { - delete_event($event_row["id"]); - } // end for each row -} // end delete_monitor() - - -function delete_event($event_id) -{ - - db_update("DELETE FROM events WHERE id='$event_id'"); - db_update("DELETE FROM conditions WHERE event_id='$event_id'"); - - $responses_handle = db_query("SELECT id FROM responses WHERE event_id='$event_id'"); - - while ($response_row = db_fetch_array($responses_handle)) - { - delete_response($response_row["id"]); - } -} // end delete_event(); - - -function delete_response($response_id) -{ - db_update("DELETE FROM responses WHERE id=$response_id"); -} - - -function delete_graph($graph_id) -{ - // delete the graph - db_update("DELETE FROM graphs WHERE id = $graph_id"); - - // delete the graphs from associated graphs - db_update("DELETE FROM view WHERE graph_id = $graph_id AND (type = 'graph' OR type = 'template')"); - - $ds_handle = db_query("SELECT id FROM graph_ds WHERE graph_id=$graph_id"); - - while ($ds_row = db_fetch_array($ds_handle)) - { - delete_ds($ds_row["id"]); - } -} // end delete_graph(); - - -function delete_ds($ds_id) -{ - $q = db_query("SELECT graph_id, position FROM graph_ds WHERE id=$ds_id"); - $r = db_fetch_array($q); - - db_update("DELETE FROM graph_ds WHERE id=$ds_id"); - db_update("UPDATE graph_ds SET position = position - 1 WHERE graph_id = {$r['graph_id']} AND position > {$r['position']}"); -} // end delete_ds(); - - -// Unified update/insert code - - -// Generic - -function generic_insert($sql) -{ - db_update("INSERT INTO $sql"); -} - -function generic_update($sql, $id) -{ - db_update("UPDATE $sql WHERE id='$id'"); -} - - -// Group - -function sql_group($grp_name, $grp_comment, $parent_id) -{ - return "groups SET name='$grp_name', comment='$grp_comment', parent_id='$parent_id'"; -} - - -function create_group($grp_name, $grp_comment, $parent_id) -{ - generic_insert(sql_group($grp_name, $grp_comment, $parent_id)); -} - - -function update_group($id, $grp_name, $grp_comment, $parent_id) -{ - generic_update(sql_group($grp_name, $grp_comment, $parent_id), $id); -} - - -/** -* addslashes_deep($value) -* -* adds slashes to all values inside $value -*/ -function addslashes_deep($value) -{ - return is_array($value) ? array_map('addslashes_deep', $value) : addslashes($value); -} // end addslashes_deep(); - - -/** -* CreateLocalMenu(): -* -* creates a local version of the menu w/ only the user's authorized items -*/ -function CreateLocalMenu() -{ - global $MENU, $LOCAL_MENU, $LOCAL_MENU_CURTREE, $LOCAL_MENU_CURITEM; - - while (list($menuname, $menuitems) = each($MENU)) - { - // foreach menu item - $authorized_subitems = array(); - foreach ($menuitems as $menuitem) - { - if (basename($_SERVER["SCRIPT_NAME"]) == $menuitem["link"]) - { - $LOCAL_MENU_CURTREE = $menuname; - $LOCAL_MENU_CURITEM = $menuitem["link"]; - } // end if we're in this group, display its menu items - - if ($_SESSION["netmrgsess"]["permit"] >= $menuitem["authLevelRequired"] - && $menuitem["display"] !== false) - { - array_push($authorized_subitems, $menuitem); - } // end if we have enough permissions to view this subitem - } // end foreach menu item - - // if we had some item output (ie, we had auth to view at least ONE item in this submenu) - // and we're under this current menu heading - if (count($authorized_subitems)) - { - $LOCAL_MENU[$menuname] = $authorized_subitems; - } // end if item output wasn't empty - } // end while we still have menu items -} // end CreateLocalMenu(); - - -/** -* GetUserPref($module, $pref) -* -* returns the value for the $module and $pref wanted for user $uid -*/ -function GetUserPref($uid, $module, $pref) -{ - $sql = "SELECT user_prefs.value - FROM user_prefs - WHERE user_prefs.uid = '$uid' - AND user_prefs.module = '$module' AND user_prefs.pref = '$pref'"; - $handle = db_query($sql); - if (db_num_rows($handle) > 0) - { - $row = db_fetch_array($handle); - return $row["value"]; - } // end if a result - return ""; -} // end GetUserPref(); - - -/** -* SetUserPref($uid, $module, $pref, $value) -* -* sets the $value for the $module and $pref for user $uid -*/ -function SetUserPref($uid, $module, $pref, $value) -{ - $sql = "SELECT user_prefs.id - FROM user_prefs - WHERE user_prefs.uid = '$uid' - AND user_prefs.module = '$module' AND user_prefs.pref = '$pref'"; - $handle = db_query($sql); - if (db_num_rows($handle) > 0) - { - $row = db_fetch_array($handle); - $update_query = "UPDATE user_prefs SET value = '$value' WHERE id = '{$row['id']}'"; - } // end if a result - else - { - $update_query = "INSERT INTO user_prefs - SET uid = '$uid', module = '$module', pref = '$pref', value = '$value'"; - } // end no result - db_query($update_query); -} // end SetUserPref(); - - -/** -* GetDBVersion() -* -* returns the version the database thinks we are -*/ -function GetDBVersion() -{ - $sql = "SELECT version FROM versioninfo WHERE module='Main'"; - $handle = db_query($sql); - $row = db_fetch_array($handle); - return $row["version"]; -} // end GetDBVersion(); - - -/** -* UpdaterNeedsRun() -* -* returns true if the updater needs run -*/ -function UpdaterNeedsRun() -{ - return ($GLOBALS["netmrg"]["verhist"][$GLOBALS["netmrg"]["version"]] > $GLOBALS["netmrg"]["verhist"][$GLOBALS["netmrg"]["dbversion"]]); -} // end UpdaterNeedsRun(); - - -/** -* UpdateDBVersion($ver) -* -* updates the version the database is in -*/ -function UpdateDBVersion($ver) -{ - $sql = "UPDATE versioninfo SET version='$ver' WHERE module='Main'"; - $handle = db_query($sql); -} // end UpdateDBVersion(); - - -/** -* GetXMLConfig() -* -* reads xml config file and puts values in config array -*/ -function GetXMLConfig() -{ - $xmlconfig = GetXMLTree($GLOBALS["netmrg"]["xmlfile"]); - - // cosmetic variables - $GLOBALS["netmrg"]["company"] = $xmlconfig["NETMRG"][0]["WEBSITE"][0]["COMPANY"][0]["VALUE"]; - $GLOBALS["netmrg"]["companylink"] = $xmlconfig["NETMRG"][0]["WEBSITE"][0]["COMPANYLINK"][0]["VALUE"]; - $GLOBALS["netmrg"]["webhost"] = $xmlconfig["NETMRG"][0]["WEBSITE"][0]["WEBHOST"][0]["VALUE"]; - $GLOBALS["netmrg"]["webroot"] = $xmlconfig["NETMRG"][0]["WEBSITE"][0]["WEBROOT"][0]["VALUE"]; - if (!isset($xmlconfig["NETMRG"][0]["WEBSITE"][0]["EXTERNALAUTH"])) - { - $xmlconfig["NETMRG"][0]["WEBSITE"][0]["EXTERNALAUTH"][0]["VALUE"] = false; - } // end set default for external auth - if ($xmlconfig["NETMRG"][0]["WEBSITE"][0]["EXTERNALAUTH"][0]["VALUE"] == "true") - { - $GLOBALS["netmrg"]["externalAuth"] = true; - } // end if true - else - { - $GLOBALS["netmrg"]["externalAuth"] = false; - } // end else false - - - // DB Config - $GLOBALS["netmrg"]["dbhost"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["HOST"][0]["VALUE"]; - $GLOBALS["netmrg"]["dbname"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["DB"][0]["VALUE"]; - $GLOBALS["netmrg"]["dbuser"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["USER"][0]["VALUE"]; - $GLOBALS["netmrg"]["dbpass"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["PASSWORD"][0]["VALUE"]; - $GLOBALS["netmrg"]["dbsock"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["SOCKET"][0]["VALUE"]; - $GLOBALS["netmrg"]["dbport"] = $xmlconfig["NETMRG"][0]["DATABASE"][0]["PORT"][0]["VALUE"]; - - // Path Config - $GLOBALS["netmrg"]["rrdtool"] = $xmlconfig["NETMRG"][0]["PATHS"][0]["RRDTOOL"][0]["VALUE"]; - $GLOBALS["netmrg"]["rrdroot"] = $xmlconfig["NETMRG"][0]["PATHS"][0]["RRDS"][0]["VALUE"]; - $GLOBALS["netmrg"]["fileroot"] = $xmlconfig["NETMRG"][0]["PATHS"][0]["WEBFILEROOT"][0]["VALUE"]; - $GLOBALS["netmrg"]["locale"] = $xmlconfig["NETMRG"][0]["PATHS"][0]["LOCALE"][0]["VALUE"]; - - // RRDTool Config - $GLOBALS["netmrg"]["rrdtool_version"] = $xmlconfig["NETMRG"][0]["RRDTOOL"][0]["VERSION"][0]["VALUE"]; - if (empty($GLOBALS["netmrg"]["rrdtool_version"])) { $GLOBALS["netmrg"]["rrdtool_version"] = "1.0"; } - -} // end GetXMLConfig(); - - -/** -* PrereqsMet() -* -* checks if the prerequisits for running NetMRG are met -* -* @returns array of errors -*/ -function PrereqsMet() -{ - /** - PHP >= v4.1.0 - PHP Safe Mode == off - RRDtool is executable - netmrg-gatherer is executable - */ - - $errors = array(); - - // PHP >= 4.1.0 - $phpver = explode(".", phpversion()); - if ($phpver[0] < 4 && $phpver[1] < 1 && $phpver[2] < 0) - { - array_push($errors, "PHP Version 4.1.0 or higher required"); - } // end if version less than 4.1.0 - - // PHP Safe Mode == off - if (ini_get("safe_mode")) - { - array_push($errors, "PHP Safe Mode not supported"); - } // end if safe mode enabled - - // RRDtool is executable - if (!is_executable($GLOBALS["netmrg"]["rrdtool"])) - { - array_push($errors, "RRD Tool not found or is not executable"); - } // end if rrdtool not executable - - // netmrg-gatherer is executable - if (!is_executable($GLOBALS["netmrg"]["binary"])) - { - array_push($errors, "NetMRG Gatherer not found or not executable"); - } // end if gatherer not executable - - return $errors; -} // end PrereqsMet(); -?> \ No newline at end of file diff -Nurb netmrg-0.19/www/lib/static.php netmrg-0.20/ChangeLog/www/lib/static.php --- netmrg-0.19/www/lib/static.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/static.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,496 +0,0 @@ - 1, - "0.10pre2" => 2, - "0.10" => 3, - "0.12" => 4, - "0.13" => 5, - "0.14" => 6, - "0.15" => 7, - "0.16" => 8, - "0.17" => 9, - "0.18" => 10, - "0.18.1" => 11, - "0.18.2" => 12, - "0.19" => 13 -); // end verhist - - -$MENU = array( - "Reporting" => array( - array("name" => "Tree", "link" => "device_tree.php", "descr" => "", "authLevelRequired" => 0), -// array("name" => "Device", "link" => "device_centered.php", "descr" => "", "authLevelRequired" => 0), - array("name" => "Log", "link" => "event_log.php", "descr" => "Display a list of the most recent events.", "authLevelRequired" => 1), - array("name" => "Slide Show", "link" => "view.php?action=slideshow&type=0", "descr" => "Displays all devices, one page at a time.", "authLevelRequired" => 1), - array("name" => "Search", "link" => "search.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "View", "link" => "view.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Enclose Graph", "link" => "enclose_graph.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Display Graph", "link" => "get_graph.php", "descr" => "", "authLevelRequired" => 0, "display" => false) - ), - "Admin" => array( - array("name" => "Devices", "link" => "grpdev_list.php", "descr" => "", "authLevelRequired" => 1), -// array("name" => "Device Types", "link" => "dev_types.php", "descr" => "", "authLevelRequired" => 2), - array("name" => "Notifications", "link" => "notifications.php", "descr" => "", "authLevelRequired" => 1), - array("name" => "Custom Graphs", "link" => "graphs.php?type=custom", "descr" => "", "authLevelRequired" => 1), - array("name" => "Template Graphs", "link" => "graphs.php?type=template", "descr" => "", "authLevelRequired" => 1), - array("name" => "Script", "link" => "tests_script.php", "descr" => "External Programs", "authLevelRequired" => 2), - array("name" => "SNMP", "link" => "tests_snmp.php", "descr" => "SNMP Queries", "authLevelRequired" => 2), - array("name" => "SQL", "link" => "tests_sql.php", "descr" => "Database Queries", "authLevelRequired" => 2), - array("name" => "Users", "link" => "users.php", "descr" => "User Management", "authLevelRequired" => 3), - array("name" => "Legacy Device Admin", "link" => "devices.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Legacy Group Admin", "link" => "groups.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Color Picker", "link" => "color_dialog.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Conditions", "link" => "conditions.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Events", "link" => "events.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Graph", "link" => "graphs.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Graph Items", "link" => "graph_items.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Monitors", "link" => "monitors.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Recache", "link" => "recache.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Responses", "link" => "responses.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "SNMP Cache View", "link" => "snmp_cache_view.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Sub-Devices", "link" => "sub_devices.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Sub-Device Parameters", "link" => "sub_dev_param.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Web Updater", "link" => "updater.php", "descr" => "", "authLevelRequired" => 0, "display" => false) - ), - "Prefs" => array( - array("name" => "Prefs", "link" => "user_prefs.php", "descr" => "Personal Preferences", "authLevelRequired" => 0) - ), - "Logout" => array( - array("name" => "Logout", "link" => "logout.php", "descr" => "End your NetMRG Session.", "authLevelRequired" => 0), - array("name" => "Login", "link" => "login.php", "descr" => "", "authLevelRequired" => 0, "display" => false) - ), - "Help" => array( - array("name" => "About", "link" => "about.php", "descr" => "", "authLevelRequired" => 0), - array("name" => "Manual", "link" => "http://wiki.netmrg.net/wiki/Users_Manual", "descr" => "", "authLevelRequired" => 0), - array("name" => "Forum", "link" => "http://lists.netmrg.net/", "descr" => "Benefit from the NetMRG Community.", "authLevelRequired" => 0), - array("name" => "Bugs", "link" => "http://bugs.netmrg.net/", "descr" => "Report bugs and request features.", "authLevelRequired" => 0), - array("name" => "Contributions", "link" => "contributors.php", "descr" => "", "authLevelRequired" => 0, "display" => false), - array("name" => "Error", "link" => "error.php", "descr" => "", "authLevelRequired" => 0, "display" => false) - ) -); // end $MENU - -// add a dynamic 'resume slide show' link -$rss_action = (!empty($_REQUEST["action"]) && $_REQUEST["action"] == "slideshow") ? "slideshow" : ""; -if ( !empty($_SESSION["netmrgsess"]["slideshow"]) - && count($_SESSION["netmrgsess"]["slideshow"]["views"]) != $_SESSION["netmrgsess"]["slideshow"]["current"] - && $_SESSION["netmrgsess"]["slideshow"]["current"] != 0 - && $rss_action != "slideshow") -{ - $rss_jump = $_SESSION["netmrgsess"]["slideshow"]["current"] - 1; - array_push($MENU["Reporting"], array("name" => "  Resume Slide Show", "link" => "view.php?action=slideshow&jump=$rss_jump", "descr" => "Resumes slide show in progress.", "authLevelRequired" => 1)); -} // end if in the middle of a slide show - -// local menu created by CreateLocalMenu() -// for just this user with their entries they can see -$LOCAL_MENU = array(); -// the current main nav group we're under -$LOCAL_MENU_CURTREE; -$LOCAL_MENU_CURITEM; - -$PERMIT = array( - 'Disabled' => -1, - 'SingleViewOnly' => 0, - 'ReadAll' => 1, - 'ReadWrite' => 2, - 'Admin' => 3 -); // end $PERMIT - -$ALIGN_ARRAY = array( - 1 => "Left", - 2 => "Right", - 3 => "Right Split" -); // end ALIGN_ARRAY - -$RRDTOOL_ITEM_TYPES = array( - 1 => "LINE1", - 2 => "LINE2", - 3 => "LINE3", - 4 => "AREA", - 5 => "STACK" -); // end RRDTOOL_ITEM_TYPES - -$SPECIAL_MONITORS = array( - -1 => "-Fixed Value-", - -2 => "-Sum of all graph items-" -); // end SPECIAL_MONITORS - -$TEST_TYPES = array( - 1 => "Script", - 2 => "SNMP", - 3 => "SQL", - 4 => "Internal" -); // end TEST_TYPES - -$PERMIT_TYPES = array( - $PERMIT["SingleViewOnly"] => "Single View Only", - $PERMIT["ReadAll"] => "Read All", - $PERMIT["ReadWrite"] => "Read/Write", - $PERMIT["Admin"] => "Read/Write/User Admin" -); // end PERMIT_TYPES - -$SUB_DEVICE_TYPES = array( - 1 => "Group", - 2 => "Interface", - 3 => "Disk" -); // end SUB_DEVICE_TYPES - -// bread crumb type order -$BC_TYPES = array( - "group" => 0, - "device" => 1, - "int_snmp_cache_view" => 2, - "disk_snmp_cache_view" => 2, - "sub_device" => 3, - "monitor" => 4, - "event" => 5 -); // end BC_TYPES - -$TRIGGER_TYPES = array( - 1 => "On Change", - 2 => "Never (disabled)" -); // end TRIGGER_TYPES - -$SITUATIONS = array( - 0 => "Disabled", - 1 => "Normal", - 2 => "Warning", - 3 => "Critical" -); // end SITUATIONS - -$LOGIC_CONDITIONS = array( - 0 => "AND", - 1 => "OR" -); // end LOGIC_CONDITIONS - -$CONDITIONS = array( - 0 => "<", - 1 => "=", - 2 => ">", - 3 => "≤", - 4 => "≠", - 5 => "≥" -); // end CONDITIONS - -$VALUE_TYPES = array( - 0 => "Current Value", - 1 => "Delta Value", - 2 => "Rate of Change", - 3 => "Last Value" -); // end VALUE_TYPES - -$VIEW_ITEM_TYPES = array( - 'graph' => "Graph", - 'template' => "Templated Graph", - 'separator' => "Separator" -); // end VIEW_TIME_TYPES - -$INTERFACE_STATUS = array( - 1 => "Up", - 2 => "Down", - 3 => "Testing", - 4 => "Unknown", - 5 => "Dormant", - 6 => "Not Present", - 7 => "Lower Layer Down" -); // end INTERFACE_STATUS - -$INTERFACE_TYPE = array( - 1 => "Other", - 6 => "Ethernet", - 15 => "FDDI", - 18 => "DS1", - 20 => "BRI", - 21 => "PRI", - 22 => "PTP Serial", - 23 => "PPP", - 24 => "Loopback", - 28 => "SLIP", - 32 => "Frame Relay", - 33 => "RS232", - 37 => "ATM", - 39 => "SDH", - 45 => "V.35", - 46 => "HSSI", - 47 => "HIPPI", - 49 => "AAL5", - 53 => "Virtual", - 71 => "802.11", - 107 => "IMA", - 117 => "Gigabit Ethernet", - 134 => "ATM Subinterface" -); // end INTERFACE_TYPE - -$SNMP_VERSIONS = array( - 0 => "No SNMP Support", - 1 => "SNMPv1", - 2 => "SNMPv2c"/*, - 3 => "SNMPv3"*/ -); // end SNMP_VERSIONS - -$RECACHE_METHODS = array( - 0 => "Never refresh cache", - 1 => "Refresh on SNMP agent restart", - 2 => "Refresh on interface count change", - 3 => "Refresh on interface count mismatch", - 4 => "Always refresh cache" -); // end RECACHE_METHODS - -$SCRIPT_DATA_TYPES = array( - 1 => "Error Code", - 2 => "Standard Out" -); // end SCRIPT_DATA_TYPES - -// searches through various types looking for |ARG| -// |ARG| should already by escaped before being used in these queries -// SQL statements should return two items; the id and the matched name -$SEARCH_ITEMS = array( - 'group' => array( - 'name' => "Group", - 'sql' => array("SELECT id, name FROM groups - WHERE name LIKE '%|ARG|%'") - ), - 'device' => array( - 'name' => "Device", - 'sql' => array("SELECT id, name FROM devices - WHERE name LIKE '%|ARG|%' OR ip LIKE '%|ARG|%'") - ), - 'subdevice' => array( - 'name' => "Sub Device", - 'sql' => array("SELECT id, name FROM sub_devices - WHERE name LIKE '%|ARG|% - GROUP BY id'", - "SELECT sub_dev_id AS id, CONCAT(name, ' - ', value) AS name FROM sub_dev_variables - WHERE value LIKE '%|ARG|%' - GROUP BY sub_dev_id") - ) -); // end SEARCH_ITEMS - -$TIMEFRAME_DAILY = array( - 'name' => "Daily", - 'start_time' => "-108000", - 'end_time' => "-360", - 'break_time' => (time() - (date("s") + date("i") * 60 + date("H") * 3600)), - 'sum_label' => "24 Hour", - 'sum_time' => "86400" -); // end TIMEFRAME_DAILY - -$TIMEFRAME_WEEKLY = array( - 'name' => "Weekly", - 'start_time' => "-777600", - 'end_time' => "-360", - 'break_time' => (time() - (date("s") + date("i") * 60 + date("H") * 3600 + date("w") * 86400)), - 'sum_label' => "7 Day", - 'sum_time' => "604800" -); // end TIMEFRAME_WEEKLY - -$TIMEFRAME_MONTHLY = array( - 'name' => "Monthly", - 'start_time' => "-3628800", - 'end_time' => "-360", - 'break_time' => (time() - (date("s") + date("i") * 60 + date("H") * 3600 + date("d") * 86400)), - 'sum_label' => "4 Week", - 'sum_time' => "2419200" -); // end TIMEFRAME_MONTHLY - -$TIMEFRAME_YEARLY = array( - 'name' => "Yearly", - 'start_time' => "-36720000", - 'end_time' => "-360", - 'break_time' => (time() - (date("s") + date("i") * 60 + date("H") * 3600 + date("z") * 86400)), - 'sum_label' => "1 Year", - 'sum_time' => "31536000" -); // end TIMEFRAME_YEARLY - -$TIMEFRAMES = array( $TIMEFRAME_DAILY, $TIMEFRAME_WEEKLY, $TIMEFRAME_MONTHLY, $TIMEFRAME_YEARLY ); - - - -// Return the path to an image based on the internal name of the image. -function get_image_by_name($img_name) -{ - $image = ""; - - switch ($img_name) - { - // graphics - case "applytemplate" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['applytemplate']}"; - break; - case "edit" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['edit']}"; - break; - case "logo" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['logo']}"; - break; - case "delete" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['delete']}"; - break; - case "disk" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['disk']}"; - break; - case "duplicate" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['duplicate']}"; - break; - case "parameters" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['parameters']}"; - break; - case "arrow-up" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-up']}"; - break; - case "arrow-right" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-right']}"; - break; - case "arrow-down" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-down']}"; - break; - case "arrow-left" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-left']}"; - break; - case "arrow-up-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-up-disabled']}"; - break; - case "arrow-right-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-right-disabled']}"; - break; - case "arrow-down-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-down-disabled']}"; - break; - case "arrow-left-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow-left-disabled']}"; - break; - case "arrow_limit-up" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-up']}"; - break; - case "arrow_limit-right" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-right']}"; - break; - case "arrow_limit-down" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-down']}"; - break; - case "arrow_limit-left" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-left']}"; - break; - case "arrow_limit-up-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-up-disabled']}"; - break; - case "arrow_limit-right-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-right-disabled']}"; - break; - case "arrow_limit-down-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-down-disabled']}"; - break; - case "arrow_limit-left-disabled" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['arrow_limit-left-disabled']}"; - break; - case "slideshow" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['slideshow']}"; - break; - case "recachedisk" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['recachedisk']}"; - break; - case "viewdisk" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['viewdisk']}"; - break; - case "recacheinterface" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['recacheinterface']}"; - break; - case "viewinterface" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['viewinterface']}"; - break; - case "view" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['view']}"; - break; - case "viewgraph-on" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['viewgraph-on']}"; - break; - case "viewgraph-off" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['viewgraph-off']}"; - break; - - - // LEDs - case "blue_led_on" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-unknown-trig']}"; - break; - case "blue_led_off" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-unknown-untrig']}"; - break; - case "green_led_on" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-good-trig']}"; - break; - case "green_led_off" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-good-untrig']}"; - break; - case "yellow_led_on" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-warning-trig']}"; - break; - case "yellow_led_off" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-warning-untrig']}"; - break; - case "red_led_on" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-critical-trig']}"; - break; - case "red_led_off" : - $image = "{$GLOBALS['netmrg']['imagedir']}/{$GLOBALS['netmrg']['imagespec']['status-critical-untrig']}"; - break; - - // Tree Expand/Collapse - case "hide" : $image = "{$GLOBALS['netmrg']['staticimagedir']}/hide.gif"; break; - case "show" : $image = "{$GLOBALS['netmrg']['staticimagedir']}/show.gif"; break; - } - - return $image; -} // end get_image_by_name(); - - -$alt_color = 0; -function get_color_by_name($color_name) -{ - GLOBAL $alt_color; - - $color = "#FFFFFF"; - - switch ($color_name) - { - case "site_background" : $color = "#EDEBEB"; break; - case "site_text" : $color = "#000000"; break; - case "site_link" : $color = "#076D07"; break; - case "site_vlink" : $color = "#076D07"; break; - case "site_alink" : $color = "#FF0000"; break; - case "edit_header" : $color = "#000088"; break; - case "edit_fields" : - { - if ($alt_color == 0) - { - $alt_color = 1; - $color = "#CECECE"; - } - else - { - $alt_color = 0; - $color = "#E4E4E4"; - } - break; - } - case "edit_header_text" : $color = "#C0C0C0"; break; - case "edit_main_header" : $color = "#005000"; break; - case "edit_main_header_text" : $color = "#C0C0C0"; break; - case "menu_background" : $color = "#D9D9D9"; break; - } - - return $color; -} // end get_color_by_name - - -?> diff -Nurb netmrg-0.19/www/lib/xml_to_array.php netmrg-0.20/ChangeLog/www/lib/xml_to_array.php --- netmrg-0.19/www/lib/xml_to_array.php 2003-07-26 05:15:54.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/lib/xml_to_array.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,117 +0,0 @@ - diff -Nurb netmrg-0.19/www/Makefile.am netmrg-0.20/ChangeLog/www/Makefile.am --- netmrg-0.19/www/Makefile.am 2005-08-24 11:18:16.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/Makefile.am 1970-01-01 05:30:00.000000000 +0530 @@ -1,22 +0,0 @@ -@SET_MAKE@ - -include $(top_srcdir)/Make.inc - -# options to install files in the www directory -netmrg_wwwdir=@WWWDIR@ -nobase_netmrg_www_DATA = include lib webfiles - -# override the default netmrg_www install -install-nobase_netmrg_wwwDATA: $(nobase_netmrg_www_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(netmrg_wwwdir) - @echo " INST $(nobase_netmrg_www_DATA)" - @list='$(nobase_netmrg_www_DATA)'; for p in `find $$list -name 'CVS' -prune -o -name '*\.in' -prune -o -name 'Makefile*' -prune -o -type f -print`; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \ - $(nobase_netmrg_wwwDATA_INSTALL) $$d$$p $(DESTDIR)$(netmrg_wwwdir)/$$f; \ - else :; fi; \ - done - diff -Nurb netmrg-0.19/www/Makefile.in netmrg-0.20/ChangeLog/www/Makefile.in --- netmrg-0.19/www/Makefile.in 2006-02-04 06:41:32.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/Makefile.in 1970-01-01 05:30:00.000000000 +0530 @@ -1,356 +0,0 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# These settings are pulled into Makefile.in by automake - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Make.inc -subdir = www -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/include/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(netmrg_wwwdir)" -nobase_netmrg_wwwDATA_INSTALL = $(install_sh_DATA) -DATA = $(nobase_netmrg_www_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -GMSGFMT = @GMSGFMT@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LDFLAGS = @LDFLAGS@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGMERGE = @MSGMERGE@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -POSUB = @POSUB@ -RRDTOOL = @RRDTOOL@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WWWDIR = @WWWDIR@ -XGETTEXT = @XGETTEXT@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -AM_MAKEFLAGS = \ - ` test "$(VERBOSE)" = "1" && echo $(ECHO_N) "" \ - || echo $(ECHO_N) "-s" ` - - -# options to install files in the www directory -netmrg_wwwdir = @WWWDIR@ -nobase_netmrg_www_DATA = include lib webfiles -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Make.inc $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign www/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign www/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: - -uninstall-nobase_netmrg_wwwDATA: - @$(NORMAL_UNINSTALL) - @$(am__vpath_adj_setup) \ - list='$(nobase_netmrg_www_DATA)'; for p in $$list; do \ - $(am__vpath_adj) \ - echo " rm -f '$(DESTDIR)$(netmrg_wwwdir)/$$f'"; \ - rm -f "$(DESTDIR)$(netmrg_wwwdir)/$$f"; \ - done -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(DATA) -installdirs: - for dir in "$(DESTDIR)$(netmrg_wwwdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-nobase_netmrg_wwwDATA - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-nobase_netmrg_wwwDATA - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-nobase_netmrg_wwwDATA install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-nobase_netmrg_wwwDATA - -@SET_MAKE@ - -# override the default netmrg_www install -install-nobase_netmrg_wwwDATA: $(nobase_netmrg_www_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(netmrg_wwwdir) - @echo " INST $(nobase_netmrg_www_DATA)" - @list='$(nobase_netmrg_www_DATA)'; for p in `find $$list -name 'CVS' -prune -o -name '*\.in' -prune -o -name 'Makefile*' -prune -o -type f -print`; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \ - $(nobase_netmrg_wwwDATA_INSTALL) $$d$$p $(DESTDIR)$(netmrg_wwwdir)/$$f; \ - else :; fi; \ - done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nurb netmrg-0.19/www/webfiles/about.php netmrg-0.20/ChangeLog/www/webfiles/about.php --- netmrg-0.19/www/webfiles/about.php 2006-02-01 00:28:40.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/about.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,50 +0,0 @@ - - -
-NetMRG
-

The Network Monitoring, Reporting, and Graphing Tool

- -Version

- -Copyright ©2001-2006 - Brady Alleman, - Douglas E. Warner and - Kevin Bonner.
- -
- -Special thanks to our other contributors. -
- -
-
-This project is licensed under the terms of the GPL, Version 2.
-Other licensing arrangements may be available upon request. Please contact licensing@netmrg.net. - -

- -
-NetMRG is a project of - TreehouseTechnologies. -
- - diff -Nurb netmrg-0.19/www/webfiles/color_dialog.php netmrg-0.20/ChangeLog/www/webfiles/color_dialog.php --- netmrg-0.19/www/webfiles/color_dialog.php 2003-04-23 07:42:34.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/color_dialog.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,266 +0,0 @@ - - - - - -Choose Color - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - - - diff -Nurb netmrg-0.19/www/webfiles/conditions.php netmrg-0.20/ChangeLog/www/webfiles/conditions.php --- netmrg-0.19/www/webfiles/conditions.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/conditions.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,179 +0,0 @@ - -
" method="post" name="form"> - - - - checkbox_toolbar()), - array("text" => "Condition") - ); // end make_display_table(); - - for ($i = 0; $i < $rows; $i++) - { - $row = db_fetch_array($query); - $condition_name = $GLOBALS['VALUE_TYPES'][$row['value_type']] . " " . $GLOBALS['CONDITIONS'][$row['condition']] . " " . $row['value']; - if ($i != 0) - { - $condition_name = $GLOBALS['LOGIC_CONDITIONS'][$row['logic_condition']] . " " . $condition_name; - $nologic = ""; - } - else - { - $nologic = "&nologic=1"; - } - make_display_item("editfield".($i%2), - array("checkboxname" => "condition", "checkboxid" => $row['id']), - array("text" => $condition_name), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id={$row['id']}&tripid={$_REQUEST['tripid']}$nologic", "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . $condition_name . "','" . $row['id'] . "')", "", "delete")) - ); // end make_display_item(); - } - make_checkbox_command("", 4, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked conditions?") - ); // end make_checkbox_command - make_status_line("condition", $rows); - ?> - -
- diff -Nurb netmrg-0.19/www/webfiles/contributors.php netmrg-0.20/ChangeLog/www/webfiles/contributors.php --- netmrg-0.19/www/webfiles/contributors.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/contributors.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,47 +0,0 @@ - - -
-NetMRG
-

The Network Monitoring, Reporting, and Graphing Tool

- -

Other Contributors

- -
Code
-Ryabkov (Rojer) Deomid has contributed many patches, fixing bugs that - are difficult to reproduce.
-
- -
Suggestions and Comments
-Ian Berry, the main developer - of Cacti, has a lot of insight into - graphing software which has helped this project.
-Patrick Haller assisted with concurrency - debugging in the original gatherer.
-
- -
Testing and Debugging
-The staff of CTI Networks, Inc. was - finding bugs in NetMRG long before the rest of the world knew about it.
- -
- - diff -Nurb netmrg-0.19/www/webfiles/devices.php netmrg-0.20/ChangeLog/www/webfiles/devices.php --- netmrg-0.19/www/webfiles/devices.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/devices.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,248 +0,0 @@ - $val) - { - delete_device($key, $_REQUEST["grp_id"]); - } // end foreach group, delete - } - display(); - break; - - case "doaddtogrp": - doaddtogrp(); - break; - - case "addtogrp": - displayaddtogrp(); - break; - - case "add": - displayadd(); - break; - - case "addnew": - case "edit": - displayedit(); - break; - - case "duplicate": - doduplicate(); - break; -} - - -/***** FUNCTIONS *****/ -function doedit() -{ - if (!empty($_REQUEST["action"]) && $_REQUEST["action"] == "doedit") - { - - if (!isset($_REQUEST["disabled"])) { $_REQUEST["disabled"] = 0; } - if (!isset($_REQUEST["snmp_version"])) { $_REQUEST["snmp_version"] = 0; } - if (!isset($_REQUEST["no_snmp_uptime_check"])) { $_REQUEST["no_snmp_uptime_check"] = 0; } - - if ($_REQUEST["dev_id"] == 0) - { - $db_cmd = "INSERT INTO"; - $db_end = ""; - $just_now_disabled = false; - } - else - { - $db_cmd = "UPDATE"; - $db_end = "WHERE id={$_REQUEST['dev_id']}"; - if ($_REQUEST['disabled'] == 1) - { - $q = db_query("SELECT disabled FROM devices WHERE id={$_REQUEST['dev_id']}"); - $r = db_fetch_array($q); - $just_now_disabled = ($r['disable'] == 0); - } - else $just_now_disabled = false; - } // end if dev_id = 0 or not - - db_update("$db_cmd devices SET - name='{$_REQUEST['dev_name']}', - ip='{$_REQUEST['dev_ip']}', - snmp_read_community='{$_REQUEST['snmp_read_community']}', - dev_type='{$_REQUEST['dev_type']}', - snmp_recache_method='{$_REQUEST['snmp_recache_method']}', - disabled='{$_REQUEST['disabled']}', - snmp_version='{$_REQUEST['snmp_version']}', - snmp_port='{$_REQUEST['snmp_port']}', - snmp_timeout='{$_REQUEST['snmp_timeout']}', - snmp_retries='{$_REQUEST['snmp_retries']}', - no_snmp_uptime_check='{$_REQUEST['no_snmp_uptime_check']}' - $db_end"); - - if ($_REQUEST["dev_id"] == 0) - { - db_update("INSERT INTO dev_parents SET grp_id={$_REQUEST['grp_id']}, dev_id=" . db_insert_id()); - } // end if dev+id = 0 - - if ($just_now_disabled) - { - db_update("UPDATE devices SET status=0 WHERE id = {$_REQUEST['dev_id']}"); - db_update("UPDATE sub_devices SET status=0 WHERE dev_id = {$_REQUEST['dev_id']}"); - $q = db_query("SELECT id FROM sub_devices WHERE dev_id = {$_REQUEST['dev_id']}"); - while ($r = db_fetch_array($q)) - { - db_update("UPDATE monitors SET status=0 WHERE sub_dev_id = {$r['id']}"); - $q1 = db_query("SELECT id FROM monitors WHERE sub_dev_id = {$r['id']}"); - while ($r1 = db_fetch_array($q1)) - { - db_update("UPDATE events SET last_status=0 WHERE mon_id = {$r1['id']}"); - } - } - } - } // done editing - - header("Location: grpdev_list.php?parent_id={$_REQUEST['grp_id']}&tripid={$_REQUEST['tripid']}"); - exit(); -} // end if we editing - -function doaddtogrp() -{ - db_update("INSERT INTO dev_parents SET grp_id={$_REQUEST['grp_id']}, dev_id={$_REQUEST['dev_id']}"); - header("Location: grpdev_list.php?parent_id={$_REQUEST['grp_id']}"); - exit(); -} // end if we're adding to a group - -function dodelete() -{ - delete_device($_REQUEST["dev_id"], $_REQUEST["grp_id"]); - header("Location: grpdev_list.php?parent_id={$_REQUEST['grp_id']}&tripid={$_REQUEST['tripid']}"); - exit(); -} // done deleting - -function doduplicate() -{ - duplicate_device($_REQUEST['dev_id']); - header("Location: grpdev_list.php?parent_id={$_REQUEST['grp_id']}&tripid={$_REQUEST['tripid']}"); - exit(); -} // done duplicating - -function displayadd() -{ - begin_page("devices.php", "Add Device"); - echo "\n"; - echo 'Create a new device

'."\n"; - echo 'Add an existing device to this group'."\n"; - echo "\n"; - end_page(); -} // end if add - -function displayaddtogrp() -{ - begin_page("devices.php", "Add Device Group"); - make_edit_table("Add Existing Device to a Group"); - make_edit_select_from_table("Device:","dev_id","devices",-1); - make_edit_hidden("action","doaddtogrp"); - make_edit_hidden("grp_id",$_REQUEST["grp_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); -} // end if add to group - -function displayedit() -{ - // Display editing screen - begin_page("devices.php", "Edit Device"); - - if ($_REQUEST["action"] == "addnew") - { - $dev_id = 0; - } - else - { - $dev_id = $_REQUEST["dev_id"]; - } // end if device id - - $dev_select = "SELECT * FROM devices WHERE id=$dev_id"; - $dev_results = db_query($dev_select); - $dev_row = db_fetch_array($dev_results); - $dev_name = $dev_row["name"]; - $dev_ip = $dev_row["ip"]; - if ($_REQUEST["action"] == "addnew") - { - $dev_row["dev_type"] = ""; - $dev_row["disabled"] = 0; - $dev_row["snmp_version"] = 0; - $dev_row["snmp_read_community"] = ""; - $dev_row["snmp_recache_method"] = 3; - $dev_row["snmp_port"] = 161; - $dev_row["snmp_timeout"] = 1000000; - $dev_row["snmp_retries"] = 3; - $dev_row["no_snmp_uptime_check"] = 0; - } - - make_edit_table("Edit Device"); - make_edit_group("General"); - make_edit_text("Name:", "dev_name", "25", "100", $dev_name); - make_edit_text("IP or Host Name:", "dev_ip", "25", "100", $dev_ip); - make_edit_select_from_table("Device Type:", "dev_type", "dev_types", $dev_row["dev_type"]); - make_edit_checkbox("Disabled (do not monitor this device)", "disabled", $dev_row["disabled"]); - make_edit_group("SNMP"); - make_edit_select_from_array("SNMP Support:", "snmp_version", $GLOBALS["SNMP_VERSIONS"], $dev_row["snmp_version"]); - make_edit_text("SNMP Read Community:", "snmp_read_community", 50, 200, $dev_row["snmp_read_community"]); - make_edit_select_from_array("Recaching Method:", "snmp_recache_method", $GLOBALS["RECACHE_METHODS"], $dev_row["snmp_recache_method"]); - make_edit_group("Advanaced SNMP Options"); - make_edit_checkbox("Disable SNMP Uptime Check", "no_snmp_uptime_check", $dev_row["no_snmp_uptime_check"] == 1); - make_edit_text("SNMP UDP Port", "snmp_port", 5, 5, $dev_row["snmp_port"]); - make_edit_text("SNMP Timeout (microseconds):", "snmp_timeout", 10, 20, $dev_row["snmp_timeout"]); - make_edit_text("SNMP Retries:", "snmp_retries", 3, 10, $dev_row["snmp_retries"]); - make_edit_hidden("dev_id", $dev_id); - make_edit_hidden("action", "doedit"); - make_edit_hidden("grp_id", $_REQUEST["grp_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); - -} // end if edit - - -function display() -{ - header("Location: grpdev_list.php?parent_id={$_REQUEST['grp_id']}&tripid={$_REQUEST['tripid']}"); - exit(); -} // end display(); - -?> - diff -Nurb netmrg-0.19/www/webfiles/device_tree.php netmrg-0.20/ChangeLog/www/webfiles/device_tree.php --- netmrg-0.19/www/webfiles/device_tree.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/device_tree.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,518 +0,0 @@ - - - - - - - - - - - - - - - - -
- Device Tree -
GroupDeviceSub-DeviceMonitorsEventsStatus
- - - - 0) ? ''. - 'edit'. - ''."\n" : ""; - - // draw +- and create link for group to expand/collapse - if (in_array($grp_id, $_COOKIE["netmrgDevTree"]["group"])) - { - $img = get_image_by_name("hide"); - $grp_action = "collapse"; - } - else - { - $img = get_image_by_name("show"); - $grp_action = "expand"; - } // end if this group is expanded - - // if > 0 associated items, display 'on' viewgraph - if (GetNumAssocItems("group", $grp_id) > 0) - { - make_display_item("editfield".($rowcount%2), - array("text" => -'
'."\n". -make_nbsp($depth * 4) . -''. -'expand/collapse' . " " . $grp_row["name"] ."\n". -''."\n". -''."\n". -''. -'View'."\n". -''."\n". -''. -'View'."\n". -''."\n". -$editgroup. -'
'."\n" - ), - array(), - array(), - array(), - array(), - array("text" => get_img_tag_from_status(get_group_status($grp_id))) - ); // end make_display_item(); - } // end if > 0 assoc items - // else, display 'off' viewgraph - else - { - make_display_item("editfield".($rowcount%2), - array("text" => -'
'."\n". -make_nbsp($depth * 4) . -''. -'expand/collapse' . " " . $grp_row["name"] . -''."\n". -''."\n". -''. -'View'. -''."\n". -''. -'View'."\n". -''."\n". -$editgroup. -'
'."\n" - ), - array(), - array(), - array(), - array(), - array("text" => get_img_tag_from_status(get_group_status($grp_id))) - ); // end make_display_item(); - } // end if 0 assoc items - $rowcount++; - - - // if group is expanded, show the devices - if (in_array($grp_id, $_COOKIE["netmrgDevTree"]["group"])) - { - $dev_results = db_query(" - SELECT dev_parents.dev_id AS id, devices.name AS name, devices.status AS status - FROM dev_parents - LEFT JOIN devices ON dev_parents.dev_id=devices.id - WHERE grp_id = '$grp_id' - ORDER BY name"); - // while we still have devices - while ($dev_row = db_fetch_array($dev_results)) - { - $device_id = $dev_row["id"]; - $device_action = ""; - $editdevice = ($_SESSION["netmrgsess"]["permit"] > 0) ? ''. - 'edit'. - ''."\n" : ""; - - // draw +- and create link for device to expand/collapse - if (in_array($device_id, $_COOKIE["netmrgDevTree"]["device"])) - { - $img = get_image_by_name("hide"); - $device_action = "collapse"; - } - else - { - $img = get_image_by_name("show"); - $device_action = "expand"; - } // end if D tree - - // if > 0 associated items, display 'on' viewgraph - if (GetNumAssocItems("device", $device_id) > 0) - { - make_display_item("editfield".($rowcount%2), - array(), - array("text" => -'
'."\n". -''. -'expand/collapse' . " " . $dev_row["name"] . -''."\n". -''."\n". -''. -'View'. -''."\n". -$editdevice. -'
'."\n" - ), - array(), - array(), - array(), - array("text" => get_img_tag_from_status($dev_row['status'])) - ); // end make_display_item(); - } // end if > 0 assoc items - // else, display 'off' viewgraph - else - { - make_display_item("editfield".($rowcount%2), - array(), - array("text" => -'
'."\n". -''. -'expand/collapse' . " " . $dev_row["name"] . -''."\n". -''."\n". -''. -'View'. -''."\n". -$editdevice. -'
'."\n" - ), - array(), - array(), - array(), - array("text" => get_img_tag_from_status($dev_row['status'])) - ); // end make_display_item(); - } // end if 0 assoc items - $rowcount++; - - // if this device is expanded, show the subdevices - if (in_array($device_id, $_COOKIE["netmrgDevTree"]["device"])) - { - $subdev_results = db_query(" - SELECT id, name, status FROM sub_devices WHERE dev_id={$dev_row['id']} ORDER BY type, name"); - - while ($subdev_row = db_fetch_array($subdev_results)) - { - $subdev_id = $subdev_row["id"]; - $subdev_action = ""; - $editsubdevice = ($_SESSION["netmrgsess"]["permit"] > 0) ? ''. - 'edit'. - ''."\n" : ""; - - // draw +- and create link for monitor expand/collapse - if (in_array($subdev_id, $_COOKIE["netmrgDevTree"]["subdevice"])) - { - $img = get_image_by_name("hide"); - $subdev_action = "collapse"; - } - else - { - $img = get_image_by_name("show"); - $subdev_action = "expand"; - } // end if M tree - // if > 0 associated items, display 'on' viewgraph - if (GetNumAssocItems("subdevice", $subdev_id) > 0) - { - make_display_item("editfield".($rowcount%2), - array(), - array(), - array("text" => -'
'."\n". -''. -'expand/collapse' . " " . $subdev_row['name']. -''."\n". -''."\n". -''. -'View'. -''."\n". -$editsubdevice. -'
'."\n" - ), - array(), - array(), - array("text" => get_img_tag_from_status($subdev_row['status'])) - ); // end make_display_item(); - } // end if > 0 assoc items - // else, display 'off' viewgraph - else - { - make_display_item("editfield".($rowcount%2), - array(), - array(), - array("text" => -'
'."\n". -''. -'expand/collapse' . " " . $subdev_row['name']. -''."\n". -''."\n". -''. -'View'. -''."\n". -$editsubdevice. -'
'."\n" - ), - array(), - array(), - array("text" => get_img_tag_from_status($subdev_row['status'])) - ); // end make_display_item(); - } // end if 0 assoc items - $rowcount++; - - // if this subdevice is expanded, show the monitors - if (in_array($subdev_id, $_COOKIE["netmrgDevTree"]["subdevice"])) - { - - $mon_results = db_query("SELECT id, status FROM monitors WHERE sub_dev_id={$subdev_row['id']}"); - - // while we have monitors - while ($mon_row = db_fetch_array($mon_results)) - { - $mon_id = $mon_row["id"]; - $monitor_action = ""; - $editmonitor = ($_SESSION["netmrgsess"]["permit"] > 0) ? ''. - 'edit'. - ''."\n" : ""; - - // draw +- and create link for monitor expand/collapse - if (in_array($mon_id, $_COOKIE["netmrgDevTree"]["monitor"])) - { - $img = get_image_by_name("hide"); - $monitor_action = "collapse"; - } - else - { - $img = get_image_by_name("show"); - $monitor_action = "expand"; - } // end if M tree - make_display_item("editfield".($rowcount%2), - array(), - array(), - array(), - array("text" => -'
'."\n". -''. -'expand/collapse' . " " . get_short_monitor_name($mon_row["id"]). -''."\n". -''."\n". -''. -'View'. -''."\n". -$editmonitor. -'
'."\n" - ), - array(), - array("text" => get_img_tag_from_status($mon_row['status'])) - ); // end make_display_item(); - $rowcount++; - - // if this monitor is expanded, show the events - if (in_array($mon_id, $_COOKIE["netmrgDevTree"]["monitor"])) - { - $event_results = db_query("SELECT * FROM events WHERE mon_id=$mon_id"); - $event_total = db_num_rows($event_results); - - // For each event - for ($event_count = 1; $event_count <= $event_total; ++$event_count) - { - $event_row = db_fetch_array($event_results); - $event_id = $event_row["id"]; - $color = get_color_from_situation($event_row["situation"]); - - if ($event_row["last_status"] == 1) - { - $img = (""); - } - else - { - $img = (""); - } // end if last status - make_display_item("editfield".($rowcount%2), - array(), - array(), - array(), - array(), - array("text" => $event_row["name"]), - array("text" => $img) - ); // end make_display_item(); - $rowcount++; - } // end event for - - } // end if monitor expanded - - }// end while each monitor - - } // end if sub-device expanded - - } // end while each sub-device - - } // end if device expanded - - } // end while each device - - // this is down here so each group's items show up with that group, - // and not putting all the sub groups together before the devices - draw_group($grp_id, $depth + 1, $rowcount); - - } // end if group expanded - - } // end while each group - -} // end draw_group() -?> diff -Nurb netmrg-0.19/www/webfiles/dev_types.php netmrg-0.20/ChangeLog/www/webfiles/dev_types.php --- netmrg-0.19/www/webfiles/dev_types.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/dev_types.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,111 +0,0 @@ - "Name", "href" => "{$_SERVER['PHP_SELF']}?orderby=name"), - array("text" => "Comment", "href" => "{$_SERVER['PHP_SELF']}?orderby=comment") - ); // end make_display_table(); - - if (!isset($_REQUEST["orderby"])) - { - $orderby = "name"; - } - else - { - $orderby = $_REQUEST["orderby"]; - } // end if orderby - - $grp_results = db_query("SELECT * FROM dev_types ORDER BY $orderby"); - $grp_total = db_num_rows($grp_results); - - # For each group - for ($grp_count = 1; $grp_count <= $grp_total; ++$grp_count) - { - $row = db_fetch_array($grp_results); - $id = $row["id"]; - - make_display_item("editfield".(($grp_count-1)%2), - array("text" => $row["name"]), - array("text" => $row["comment"]), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id=$id") . " " . - formatted_link("Delete", "javascript:del('" . addslashes($row["name"]) . "', '" . $row["id"] . "')")) - ); // end make_display_item(); - } // end foreach group - -?> - - diff -Nurb netmrg-0.19/www/webfiles/enclose_graph.php netmrg-0.20/ChangeLog/www/webfiles/enclose_graph.php --- netmrg-0.19/www/webfiles/enclose_graph.php 2003-12-30 08:54:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/enclose_graph.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,140 +0,0 @@ -'); - echo('
'); - echo('Show History
'); - if ($_REQUEST['type'] == 'template' || $_REQUEST['type'] == 'custom') - { - echo('Dissect
'); - } - echo('Advanced
'); -} - -function show_history() -{ - $opts = template() . "type={$_REQUEST['type']}&id={$_REQUEST['id']}"; - - echo('
'); - echo('
'); - echo('
'); - echo('
'); - echo('
'); - echo('

'); - echo('Normal View
'); -} - -function show_dissection() -{ - $opts = template() . "type={$_REQUEST['type']}&id={$_REQUEST['id']}"; - $dbq = db_query("SELECT id FROM graph_ds WHERE graph_id = '{$_REQUEST['id']}' AND mon_id != -2 ORDER BY position, id"); - echo('
'); - while ($dbr = mysql_fetch_array($dbq)) - { - echo('
'); - } - echo('

'); - echo('Normal View
'); -} - -function show_advanced() -{ - if (!isset($_REQUEST['start'])) - { - $_REQUEST['start'] = "+yesterday"; - } - if (!isset($_REQUEST['end'])) - { - $_REQUEST['end'] = "+5 minutes ago"; - } - if (!isset($_REQUEST['min'])) - { - $_REQUEST['min'] = "0"; - } - if (!isset($_REQUEST['max'])) - { - $_REQUEST['max'] = "0"; - } - - $opts = template() . "type={$_REQUEST['type']}&id={$_REQUEST['id']}&start={$_REQUEST['start']}&"; - $opts .= "end={$_REQUEST['end']}&min={$_REQUEST['min']}&max={$_REQUEST['max']}"; - - echo('
'); - echo('

'); - - echo('
'); - make_edit_hidden("action", "advanced"); - make_edit_hidden("type", $_REQUEST['type']); - make_edit_hidden("id", $_REQUEST['id']); - if ($_REQUEST['type'] == "template") - { - make_edit_hidden("subdev_id", $_REQUEST['subdev_id']); - } - - echo('Start:  '); - echo('End:  '); - echo('Max:  '); - echo('Min:   '); - echo('
'); - echo('
'); - echo('Normal View
'); -} - -end_page(); - -?> diff -Nurb netmrg-0.19/www/webfiles/error.php netmrg-0.20/ChangeLog/www/webfiles/error.php --- netmrg-0.19/www/webfiles/error.php 2003-07-07 08:34:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/error.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,50 +0,0 @@ - -
- -
- diff -Nurb netmrg-0.19/www/webfiles/event_log.php netmrg-0.20/ChangeLog/www/webfiles/event_log.php --- netmrg-0.19/www/webfiles/event_log.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/event_log.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,77 +0,0 @@ - date("Y/m/d H:i:s",$row["date"])), - array("text" => format_time_elapsed($row["time_since_last_change"])), - array("text" => get_img_tag_from_status($row["situation"]) . " " . $row['dev_name'] . ": " . $row['ev_name']) - ); // end make_display_item(); - $rowcount++; -} // end for each row in event log -print(""); -echo('
'); - -if ($_REQUEST['index'] >= 25) -{ - echo('[<- Prev]'); -} // end if can go back -else -{ - echo('[<- Prev]'); -} // end if can't go back - -echo '  '; - -if (($rowcount + $_REQUEST['index']) < $numrows) -{ - echo('[Next ->]'); -} // end if still more rows left -else -{ - echo('[Next ->]'); -} // end else no more rows left - -end_page(); - -?> diff -Nurb netmrg-0.19/www/webfiles/events.php netmrg-0.20/ChangeLog/www/webfiles/events.php --- netmrg-0.19/www/webfiles/events.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/events.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,166 +0,0 @@ - -
" method="post" name="form"> - - - - checkbox_toolbar()), - array("text" => "Name"), - array("text" => "Trigger Options"), - array("text" => "Situation"), - array("text" => "Status") - ); // end make_display_table(); - - $query = db_query("SELECT * FROM events WHERE mon_id = {$_REQUEST['mon_id']} ORDER BY name"); - - $rowcount = 0; - while (($row = db_fetch_array($query)) != NULL) - { - if ($row['last_status'] == 1) - { - $triggered = "Triggered"; - $name = "" . $row['name'] . ""; - } - else - { - $triggered = "Not Triggered"; - $name = $row['name']; - } - - make_display_item("editfield".($rowcount%2), - array("checkboxname" => "event", "checkboxid" => $row['id']), - array("text" => $name, "href" => "responses.php?event_id={$row['id']}&tripid={$_REQUEST['tripid']}"), - array("text" => $GLOBALS['TRIGGER_TYPES'][$row['trigger_type']]), - array("text" => $GLOBALS['SITUATIONS'][$row['situation']]), - array("text" => $triggered), - array("text" => formatted_link("Modify Conditions", "conditions.php?event_id={$row['id']}&tripid={$_REQUEST['tripid']}") . " " . - formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes($row['name']) . "','" . $row['id'] . "')", "", "delete")) - ); // end make_display_item(); - $rowcount++; - } // end while rows left - make_checkbox_command("", 6, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked events?") - ); // end make_checkbox_command - make_status_line("event", $rowcount); - ?> - -
- Binary files netmrg-0.19/www/webfiles/favicon.ico and netmrg-0.20/ChangeLog/www/webfiles/favicon.ico differ diff -Nurb netmrg-0.19/www/webfiles/get_graph.php netmrg-0.20/ChangeLog/www/webfiles/get_graph.php --- netmrg-0.19/www/webfiles/get_graph.php 2004-11-17 06:32:44.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/get_graph.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,96 +0,0 @@ -start(); - $timer->addmarker("before headers"); -} // end if debug - -/***** Expiration Headers *****/ -// Date in the past -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -// Always modified -header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); -// HTTP/1.1 -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -// HTTP/1.0 -header("Pragma: no-cache"); - -if (isset($_REQUEST["debug"])) -{ - $timer->addmarker("before auth"); -} -else -{ - // Image Type - header("Content-type: image/png"); -} - -// we need to auth different ways depending on type of graph -switch($_REQUEST["type"]) -{ - case "template" : - GraphCheckAuth($_REQUEST["type"], $_REQUEST["subdev_id"]); - break; - - case "template_item" : - GraphCheckAuth($_REQUEST["type"], $_REQUEST["subdev_id"]); - break; - - case "custom_item" : - $q = db_query("SELECT graph_id FROM graph_ds WHERE id='{$_REQUEST['id']}'"); - $r = db_fetch_array($q); - GraphCheckAuth($_REQUEST["type"], $r['graph_id']); - break; - - default : - GraphCheckAuth($_REQUEST["type"], $_REQUEST["id"]); - break; -} // end switch type for auth - -if (empty($_REQUEST["hist"])) -{ - $_REQUEST["hist"] = 0; -} - -if (isset($_REQUEST["debug"])) -{ - $timer->addmarker("after auth"); - $timer->addmarker("before get command"); -} - -// figure out what our command for generating the graph will be -$command = get_graph_command($_REQUEST["type"], $_REQUEST["id"], $_REQUEST["hist"], $_REQUEST["type"] == "template"); - -if (isset($_REQUEST["debug"])) -{ - $timer->addmarker("after get command"); - $timer->addmarker("before exec command"); - echo(rrdtool_syntax_highlight($command)); - exec($command); - $timer->addmarker("after exec command"); - echo("

"); - $timer->stop(); - $timer->debug(); - $timer->showtime(); -} -else -{ - passthru($command); -} - -?> diff -Nurb netmrg-0.19/www/webfiles/graph_items.php netmrg-0.20/ChangeLog/www/webfiles/graph_items.php --- netmrg-0.19/www/webfiles/graph_items.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/graph_items.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,412 +0,0 @@ - - ">

-
" method="post" name="form"> - checkbox_toolbar()), - array("text" => "Label"), - array("text" => "Type"), - array() - ); // end make_display_table(); - - for ($ds_count = 0; $ds_count < $ds_total; $ds_count++) - { - // For each graph item - - $ds_row = db_fetch_array($ds_results); - $id = $ds_row["id"]; - - if ($ds_count == 0) - { - $move_up = image_link_disabled("arrow-up", "Move Up"); - } - else - { - $move_up = image_link("arrow-up", "Move Up", "{$_SERVER['PHP_SELF']}?action=move_up&graph_id={$_REQUEST['graph_id']}&id=$id"); - } - - if ($ds_count == ($ds_total - 1)) - { - $move_down = image_link_disabled("arrow-down", "Move Down"); - } - else - { - $move_down = image_link("arrow-down", "Move Down", "{$_SERVER['PHP_SELF']}?action=move_down&graph_id={$_REQUEST['graph_id']}&id=$id"); - } - - if (($ds_row['type'] == 5) && ($ds_count == 0)) - { - $item_type = "STACK (using as AREA)"; - } - else - { - $item_type = $RRDTOOL_ITEM_TYPES[$ds_row["type"]]; - } - - make_display_item("editfield".($ds_count%2), - array("checkboxname" => "graph_items", "checkboxid" => $id), - array("text" => $ds_row["label"]), - array("text" => color_block($ds_row["color"]) . "  " . $item_type), - array("text" => - formatted_link("View", "enclose_graph.php?type=custom_item&id=" . $ds_row["id"], "", "view") . - formatted_link("Duplicate", "{$_SERVER['PHP_SELF']}?action=duplicate&id=$id&graph_id={$_REQUEST['graph_id']}", "", "duplicate") . - " " . $move_up . " " . $move_down - ), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id=$id&graph_id={$_REQUEST['graph_id']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes($ds_row["label"]) . "', '" . $ds_row["id"] . "')", "", "delete")) - ); // end make_display_item(); - - - } // end for - make_checkbox_command("", 5, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked graphs?"), - array("text" => "Duplicate", "action" => "multiduplicate"), - array("text" => "Move Up", "action" => "move_up"), - array("text" => "Move Down", "action" => "move_down"), - array("text" => "Gradient", "action" => "gradient") - ); // end make_checkbox_command - make_status_line("graph item", $ds_count); -?> -
- -Monitor:
"; - if ($ds_row["mon_id"] > 0) - { - $label .= get_monitor_name($ds_row["mon_id"]); - } - else - { - $label .= $GLOBALS['SPECIAL_MONITORS'][intval($ds_row["mon_id"])]; - } - $label .= " [change]"; - make_edit_label($label); - make_edit_hidden("mon_id", $ds_row["mon_id"]); - } - - make_edit_text("Fixed Value or Value Multiplier:", "multiplier", "25", "100", $ds_row["multiplier"]); - make_edit_group("Legend"); - make_edit_select_from_array("Alignment:", "alignment", $GLOBALS['ALIGN_ARRAY'], $ds_row["alignment"]); - make_edit_checkbox("Show Current Value", "show_current", isin($ds_row["stats"], "CURRENT")); - make_edit_checkbox("Show Average Value", "show_average", isin($ds_row["stats"], "AVERAGE")); - make_edit_checkbox("Show Maximum Value", "show_maximum", isin($ds_row["stats"], "MAXIMUM")); - make_edit_checkbox("Show Only Integers", "show_integer", isin($ds_row["stats"], "INTEGER")); - make_edit_checkbox("Show Sums", "show_sums", isin($ds_row["stats"], "SUMS")); - make_edit_checkbox("Apply Multiplier to Sums", "multiply_sum", isin($ds_row['stats'], "MULTSUM")); - if (!empty($_REQUEST["showadvanced"])) - { - make_edit_group("Advanced"); - make_edit_text("Start Time", "start_time", "20", "20", $ds_row["start_time"]); - make_edit_text("End Time", "end_time", "20", "20", $ds_row["end_time"]); - } // end if we want advanced options shown - else - { - $graphlink = 'graph_items.php?showadvanced=true'; - if (!empty($_SERVER["QUERY_STRING"])) - { - $graphlink .= '&'.$_SERVER["QUERY_STRING"]; - } // end if query string not empty - make_edit_group('[Show Advanced]'); - make_edit_hidden("start_time", $ds_row["start_time"]); - make_edit_hidden("end_time", $ds_row["end_time"]); - } // end if no advanced options - - make_edit_hidden("action", "doedit"); - make_edit_hidden("graph_id", $ds_row["graph_id"]); - make_edit_hidden("id", $ds_row["id"]); - make_edit_hidden("position", $ds_row["position"]); - make_edit_submit_button(); - make_edit_end(); - -} // End editing screen - -?> diff -Nurb netmrg-0.19/www/webfiles/graphs.php netmrg-0.20/ChangeLog/www/webfiles/graphs.php --- netmrg-0.19/www/webfiles/graphs.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/graphs.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,391 +0,0 @@ -"; - make_plain_display_table("", - checkbox_toolbar("edit"), "" - ); // end make_display_table(); - - $query = "SELECT * FROM graphs WHERE type='template' ORDER BY name"; - - $graph_results = db_query($query); - - while ( $graph_row = db_fetch_array($graph_results) ) - { - make_edit_checkbox($graph_row["name"], - "graph[{$graph_row["id"]}]", - $_REQUEST["graph"][$graph_row["id"]]); - } // end graphs - - echo ""; - echo ""; - - $sub_dev = (!empty($_REQUEST["sub_dev_id"])) ? $_REQUEST["sub_dev_id"] : -1; - if (($sub_dev == -1) || ($_REQUEST['edit_subdev'] == 1)) - { - make_edit_select_subdevice($sub_dev, array(), 'multiple size="10"'); - if (strstr($_SERVER['HTTP_REFERER'], "graphs.php") && !($_REQUEST['edit_subdev'] == 1)) - { - $return = $_SERVER['HTTP_REFERER']; - } - else - { - foreach ($_SESSION["netmrgsess"]["grpnav"][$_REQUEST['tripid']] as $breadcrumb) - { - if ($breadcrumb['type'] == "device") - { - $return = "sub_devices.php?dev_id={$breadcrumb['id']}&tripid={$_REQUEST['tripid']}"; - break; - } - else - $return = "groups.php"; - } - } - make_edit_hidden("return", $return); - } - else - { - $label = "Sub Device:
"; - $label .= get_dev_sub_device_name($sub_dev); - $label .= " [change]"; - make_edit_label($label); - make_edit_hidden("subdev_id[1]", $sub_dev); - make_edit_hidden("return", $_SERVER["HTTP_REFERER"]); - } - - make_edit_hidden("action", "doapplytemplates"); - make_edit_submit_button(); - make_edit_end(); -} // end applytemplates() - -function doapplytemplates() -{ - while (list($skey,$svalue) = each($_REQUEST["subdev_id"])) - { - while (list($gkey,$gvalue) = each($_REQUEST["graph"])) - { - apply_template($svalue, $gkey); - } - reset($_REQUEST["graph"]); - } - - header("Location: {$_REQUEST['return']}"); - exit(0); -} // end doapplytemplate() - -function display() -{ - if (empty($_REQUEST['type'])) - { - $_REQUEST['type'] = "custom"; - } - begin_page("graphs.php", ucfirst($_REQUEST['type']) . " Graphs"); - js_checkbox_utils(); - js_confirm_dialog("del", "Are you sure you want to delete graph ", "?", "{$_SERVER['PHP_SELF']}?action=dodelete&type={$_REQUEST['type']}&graph_id="); - ?> -
" method="post" name="form"> - - - checkbox_toolbar()), - array("text" => "Name"), - array() - ); // end make_display_table(); - - $query = "SELECT * FROM graphs WHERE type='{$_REQUEST['type']}'"; - - if (isset($_REQUEST["order_by"])) - { - $query .= " ORDER BY {$_REQUEST['order_by']}"; - } - else - { - $query .= " ORDER BY name"; - } // end if order_by - - $graph_results = db_query($query); - $graph_total = db_num_rows($graph_results); - - for ($graph_count = 1; $graph_count <= $graph_total; ++$graph_count) - { - $graph_row = db_fetch_array($graph_results); - $graph_id = $graph_row["id"]; - if ($graph_row['type'] == "template") - { - $apply_template_link = " " . - formatted_link("Apply Template To...", "{$_SERVER['PHP_SELF']}?action=applytemplates&graph[$graph_id]=on", "", "applytemplate"); - } - else - { - $apply_template_link = ""; - } - - make_display_item("editfield".(($graph_count-1)%2), - array("checkboxname" => "graph", "checkboxid" => $graph_id), - array("text" => $graph_row["name"], "href" => "graph_items.php?graph_id=$graph_id"), - array("text" => formatted_link("View", "enclose_graph.php?type=custom&id=" . $graph_row["id"], "", "view") . " " . - formatted_link("Duplicate", "{$_SERVER["PHP_SELF"]}?action=duplicate&type=" . $graph_row['type'] . "&id=" . $graph_row["id"], "", "duplicate") . $apply_template_link), - array("text" => formatted_link("Edit", "{$_SERVER["PHP_SELF"]}?action=edit&graph_id=$graph_id", "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes($graph_row['name']) . "', '$graph_id')", "", "delete")) - ); // end make_display_item(); - } // end graphs - - // FIXME: There should be a better way to do this - $duplicate_array = - array("text" => "Duplicate", "action" => "multiduplicate"); - $apply_template_array = - array("text" => "Apply Templates", "action" => "applytemplates"); - $delete_array = - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked graphs?"); - - if ($graph_row['type'] == "template") - { - make_checkbox_command("", 4, - $duplicate_array, - $apply_template_array, - $delete_array - ); // end make_checkbox_command - } - else - { - make_checkbox_command("", 4, - $duplicate_array, - $delete_array - ); // end make_checkbox_command - } - - make_status_line("{$_REQUEST["type"]} graph", $graph_total); -?> - -
-[Show Advanced]'); - make_edit_hidden("base", $graph_row["base"]); - make_edit_hidden("max", $graph_row["max"]); - make_edit_hidden("min", $graph_row["min"]); - make_edit_hidden("options_nolegend", isin($graph_row["options"], "nolegend")); - make_edit_hidden("options_logarithmic", isin($graph_row["options"], "logarithmic")); - } // end else hide advanced - - if ($_REQUEST["action"] == "edit") - { - make_edit_hidden("graph_id", $_REQUEST["graph_id"]); - make_edit_hidden("type", $graph_row['type']); - } - else - { - make_edit_hidden("type", $_REQUEST['type']); - } - - make_edit_hidden("action","doedit"); - - if (!empty($_REQUEST["return_type"])) - { - make_edit_hidden("return_type",$_REQUEST["return_type"]); - make_edit_hidden("return_id",$_REQUEST["return_id"]); - } // end if return_type - - make_edit_submit_button(); - make_edit_end(); - -} // end edit() - -?> diff -Nurb netmrg-0.19/www/webfiles/groups.php netmrg-0.20/ChangeLog/www/webfiles/groups.php --- netmrg-0.19/www/webfiles/groups.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/groups.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,113 +0,0 @@ - $val) - { - delete_group($key); - } // end foreach group, delete - } - display(); -} // end what to do - - - -/***** FUNCTIONS *****/ -function edit() -{ - // Display editing screen - begin_page("groups.php", "Groups"); - - $grp_id = $_REQUEST["grp_id"]; - $grp_results = db_query("SELECT * FROM groups WHERE id=$grp_id"); - $grp_row = db_fetch_array($grp_results); - $grp_name = $grp_row["name"]; - $grp_comment = $grp_row["comment"]; - - make_edit_table("Edit Group"); - make_edit_text("Name:","grp_name","25","100",$grp_name); - make_edit_text("Comment:","grp_comment","50","200",$grp_comment); - make_edit_select_from_table("Parent:", "edit_parent_id", "groups", $grp_row["parent_id"], "", array(0 => "-Root-"), array(), "id != '$grp_id'"); - make_edit_hidden("grp_id", $grp_id); - make_edit_hidden("action","update"); - make_edit_hidden("parent_id",$_REQUEST["parent_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); -} // end edit(); - - -function add() -{ - // Display editing screen - begin_page("groups.php", "Groups"); - - make_edit_table("Edit Group"); - make_edit_text("Name:","grp_name","25","100",""); - make_edit_text("Comment:","grp_comment","50","200",""); - make_edit_select_from_table("Parent:", "edit_parent_id", "groups", $_REQUEST["parent_id"], "", array(0 => "-Root-"), array(), "id != '-1'"); - make_edit_hidden("grp_id", -1); - make_edit_hidden("action","insert"); - make_edit_hidden("parent_id",$_REQUEST["parent_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); -} // end add(); - - -function display() -{ - header("Location: grpdev_list.php?parent_id={$_REQUEST['parent_id']}&tripid={$_REQUEST['tripid']}"); - exit(); -} // end display(); - - -?> diff -Nurb netmrg-0.19/www/webfiles/grpdev_list.php netmrg-0.20/ChangeLog/www/webfiles/grpdev_list.php --- netmrg-0.19/www/webfiles/grpdev_list.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/grpdev_list.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,185 +0,0 @@ -'."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - make_display_table("Device Groups", "groups.php?action=add&parent_id={$_REQUEST['parent_id']}&tripid={$_REQUEST['tripid']}", - array("text" => checkbox_toolbar("grp")), - array("text" => "Name"), - array("text" => "Comment") - ); // end make_display_table(); - - // while results - $count = 0; - while ($grp_row = db_fetch_array($grp_results)) - { - $grp_id = $grp_row["id"]; - $grp_href = (db_fetch_cell("SELECT count(*) FROM groups WHERE parent_id = '{$_REQUEST['parent_id']}'") > 0) ? "grpdev_list.php?parent_id=$grp_id&tripid={$_REQUEST['tripid']}" : "#"; - - make_display_item("editfield".($count%2), - array("checkboxname" => "grp_id", "checkboxid" => $grp_row['id']), - array("text" => $grp_row["name"], "href" => $grp_href), - array("text" => $grp_row["comment"]), - array("text" => formatted_link("View", - "view.php?action=view&object_type=group&object_id={$grp_row['id']}", "", "view") . " " . - formatted_link("Edit", "groups.php?action=edit&grp_id=$grp_id&parent_id={$_REQUEST['parent_id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del_grp('" . addslashes($grp_row["name"]) . "', '" . $grp_row["id"] . "')", "", "delete")) - ); // end make_display_item(); - $count++; - } // end while groups - make_checkbox_command("grp", 4, - array("text" => "Delete", "action" => "deletemulti", "prompt" => "Are you sure you want to delete the checked groups?") - ); // end make_checkbox_command - make_status_line("group", $count); -?> - - -
-'."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - make_display_table($title, $addlink, - array("text" => checkbox_toolbar("dev")), - array("text" => "Name"), - array("text" => "Availability"), - array("text" => "SNMP Options") - ); - - $count = 0; - while($dev_row = db_fetch_array($dev_results)) - { - $dev_id = $dev_row["id"]; - $links = - cond_formatted_link($dev_row["interface_count"] > 0, "View Interface Cache", - "snmp_cache_view.php?dev_id=$dev_id&action=view&type=interface&tripid={$_REQUEST['tripid']}", "", "viewinterface") . " " . - cond_formatted_link($dev_row["snmp_version"] > 0, "Recache Interfaces", - "recache.php?dev_id=$dev_id&type=interface&tripid={$_REQUEST['tripid']}", "", "recacheinterface") . " " . - cond_formatted_link($dev_row["disk_count"] > 0, "View Disk Cache", - "snmp_cache_view.php?dev_id=$dev_id&action=view&type=disk&tripid={$_REQUEST['tripid']}", "", "viewdisk") . " " . - cond_formatted_link($dev_row["snmp_version"] > 0, "Recache Disks", - "recache.php?dev_id=$dev_id&type=disk&tripid={$_REQUEST['tripid']}", "", "recachedisk"); - - if ($dev_row['disabled'] == 1) - { - $availability = "Disabled"; - } - elseif ($dev_row['snmp_version'] == 0) - { - $availability = "No SNMP support"; - } - elseif ($dev_row['snmp_avoided'] == 1) - { - $availability = "SNMP failed"; - } - elseif ( ($dev_row['snmp_avoided'] == 0) && ($dev_row['snmp_uptime'] == 0) ) - { - $availability = "Pending Initial Gathering"; - } - else - { - $availability = "SNMP Uptime: " . format_time_elapsed($dev_row['snmp_uptime']/100); - } - - make_display_item("editfield".($count%2), - array("checkboxname" => "dev_id", "checkboxid" => $dev_row['id']), - array("text" => $dev_row["name"], "href" => "sub_devices.php?dev_id=$dev_id&tripid={$_REQUEST['tripid']}"), - array("text" => $availability), - array("text" => $links), - array("text" => formatted_link("View", "view.php?action=view&object_type=device&object_id=$dev_id", "", "view") . " " . - formatted_link("Duplicate", "devices.php?action=duplicate&dev_id=$dev_id&grp_id={$_REQUEST['parent_id']}&tripid={$_REQUEST['tripid']}", "", "duplicate") . " " . - formatted_link("Edit", "devices.php?action=edit&dev_id=$dev_id&grp_id={$_REQUEST['parent_id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del_dev('" . addslashes($dev_row["name"]) . "', '" . $dev_row["id"] . "')", "", "delete")) - ); // end make_display_item(); - $count++; - } // end while devices - make_checkbox_command("dev", 5, - array("text" => "Delete", "action" => "deletemulti", "prompt" => "Are you sure you want to delete the checked devices?") - ); // end make_checkbox_command - make_status_line("device", $count); -?> - - -
- Binary files netmrg-0.19/www/webfiles/images/default/applytemplate.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/applytemplate.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-down-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-down-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-down.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-down.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-left-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-left-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-left.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-left.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-down-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-down-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-down.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-down.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-left-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-left-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-left.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-left.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-right-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-right-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-right.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-right.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-up-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-up-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow_limit-up.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow_limit-up.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-right-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-right-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-right.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-right.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-up-disabled.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-up-disabled.png differ Binary files netmrg-0.19/www/webfiles/images/default/arrow-up.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/arrow-up.png differ Binary files netmrg-0.19/www/webfiles/images/default/delete.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/delete.png differ Binary files netmrg-0.19/www/webfiles/images/default/disk.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/disk.png differ Binary files netmrg-0.19/www/webfiles/images/default/duplicate.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/duplicate.png differ Binary files netmrg-0.19/www/webfiles/images/default/edit.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/edit.png differ diff -Nurb netmrg-0.19/www/webfiles/images/default/imagespec.php netmrg-0.20/ChangeLog/www/webfiles/images/default/imagespec.php --- netmrg-0.19/www/webfiles/images/default/imagespec.php 2005-11-04 07:14:05.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/images/default/imagespec.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,51 +0,0 @@ - "applytemplate.png", - "edit" => "edit.png", - "logo" => "netmrg-logo-small.png", - "delete" => "delete.png", - "disk" => "disk.png", - "duplicate" => "duplicate.png", - "arrow-up" => "arrow-up.png", - "arrow-right" => "arrow-right.png", - "arrow-down" => "arrow-down.png", - "arrow-left" => "arrow-left.png", - "arrow-up-disabled" => "arrow-up-disabled.png", - "arrow-right-disabled" => "arrow-right-disabled.png", - "arrow-down-disabled" => "arrow-down-disabled.png", - "arrow-left-disabled" => "arrow-left-disabled.png", - "arrow_limit-up" => "arrow_limit-up.png", - "arrow_limit-right" => "arrow_limit-right.png", - "arrow_limit-down" => "arrow_limit-down.png", - "arrow_limit-left" => "arrow_limit-left.png", - "arrow_limit-up-disabled" => "arrow_limit-up-disabled.png", - "arrow_limit-right-disabled" => "arrow_limit-right-disabled.png", - "arrow_limit-down-disabled" => "arrow_limit-down-disabled.png", - "arrow_limit-left-disabled" => "arrow_limit-left-disabled.png", - "parameters" => "parameters.png", - "view" => "view.png", - "recachedisk" => "recachedisk.png", - "viewdisk" => "viewdisk.png", - "recacheinterface" => "recacheinterface.png", - "viewinterface" => "viewinterface.png", - "viewgraph-on" => "viewgraph-on.png", - "viewgraph-off" => "viewgraph-off.png", - "slideshow" => "slideshow.png", - "status-good-trig" => "status-good-trig.png", - "status-good-untrig" => "status-good-untrig.png", - "status-warning-trig" => "status-warning-trig.png", - "status-warning-untrig" => "status-warning-untrig.png", - "status-critical-trig" => "status-critical-trig.png", - "status-critical-untrig" => "status-critical-untrig.png", - "status-unknown-trig" => "status-unknown-trig.png", - "status-unknown-untrig" => "status-unknown-untrig.png" -); -?> Binary files netmrg-0.19/www/webfiles/images/default/netmrg-logo-large.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/netmrg-logo-large.png differ Binary files netmrg-0.19/www/webfiles/images/default/netmrg-logo-medium.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/netmrg-logo-medium.png differ Binary files netmrg-0.19/www/webfiles/images/default/netmrg-logo-small.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/netmrg-logo-small.png differ Binary files netmrg-0.19/www/webfiles/images/default/parameters.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/parameters.png differ Binary files netmrg-0.19/www/webfiles/images/default/recachedisk.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/recachedisk.png differ Binary files netmrg-0.19/www/webfiles/images/default/recacheinterface.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/recacheinterface.png differ Binary files netmrg-0.19/www/webfiles/images/default/slideshow.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/slideshow.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-critical-trig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-critical-trig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-critical-untrig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-critical-untrig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-good-trig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-good-trig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-good-untrig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-good-untrig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-unknown-trig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-unknown-trig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-unknown-untrig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-unknown-untrig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-warning-trig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-warning-trig.png differ Binary files netmrg-0.19/www/webfiles/images/default/status-warning-untrig.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/status-warning-untrig.png differ Binary files netmrg-0.19/www/webfiles/images/default/viewdisk.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/viewdisk.png differ Binary files netmrg-0.19/www/webfiles/images/default/viewgraph-off.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/viewgraph-off.png differ Binary files netmrg-0.19/www/webfiles/images/default/viewgraph-on.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/viewgraph-on.png differ Binary files netmrg-0.19/www/webfiles/images/default/viewinterface.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/viewinterface.png differ Binary files netmrg-0.19/www/webfiles/images/default/view.png and netmrg-0.20/ChangeLog/www/webfiles/images/default/view.png differ Binary files netmrg-0.19/www/webfiles/img/access_denied.png and netmrg-0.20/ChangeLog/www/webfiles/img/access_denied.png differ Binary files netmrg-0.19/www/webfiles/img/access_denied.xcf and netmrg-0.20/ChangeLog/www/webfiles/img/access_denied.xcf differ Binary files netmrg-0.19/www/webfiles/img/blue_led_off.gif and netmrg-0.20/ChangeLog/www/webfiles/img/blue_led_off.gif differ Binary files netmrg-0.19/www/webfiles/img/blue_led_on.gif and netmrg-0.20/ChangeLog/www/webfiles/img/blue_led_on.gif differ Binary files netmrg-0.19/www/webfiles/img/colortable.gif and netmrg-0.20/ChangeLog/www/webfiles/img/colortable.gif differ Binary files netmrg-0.19/www/webfiles/img/green_led_off.gif and netmrg-0.20/ChangeLog/www/webfiles/img/green_led_off.gif differ Binary files netmrg-0.19/www/webfiles/img/green_led_on.gif and netmrg-0.20/ChangeLog/www/webfiles/img/green_led_on.gif differ Binary files netmrg-0.19/www/webfiles/img/hide.gif and netmrg-0.20/ChangeLog/www/webfiles/img/hide.gif differ Binary files netmrg-0.19/www/webfiles/img/netmrg-logo-small.png and netmrg-0.20/ChangeLog/www/webfiles/img/netmrg-logo-small.png differ Binary files netmrg-0.19/www/webfiles/img/newtop.png and netmrg-0.20/ChangeLog/www/webfiles/img/newtop.png differ Binary files netmrg-0.19/www/webfiles/img/red_led_off.gif and netmrg-0.20/ChangeLog/www/webfiles/img/red_led_off.gif differ Binary files netmrg-0.19/www/webfiles/img/red_led_on.gif and netmrg-0.20/ChangeLog/www/webfiles/img/red_led_on.gif differ Binary files netmrg-0.19/www/webfiles/img/show.gif and netmrg-0.20/ChangeLog/www/webfiles/img/show.gif differ Binary files netmrg-0.19/www/webfiles/img/status-green-nottriggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-green-nottriggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-green-triggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-green-triggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-red-nottriggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-red-nottriggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-red-triggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-red-triggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-unknown-nottriggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-unknown-nottriggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-unknown-triggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-unknown-triggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-yellow-nottriggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-yellow-nottriggered.png differ Binary files netmrg-0.19/www/webfiles/img/status-yellow-triggered.png and netmrg-0.20/ChangeLog/www/webfiles/img/status-yellow-triggered.png differ Binary files netmrg-0.19/www/webfiles/img/trans.gif and netmrg-0.20/ChangeLog/www/webfiles/img/trans.gif differ Binary files netmrg-0.19/www/webfiles/img/unk_led_on.gif and netmrg-0.20/ChangeLog/www/webfiles/img/unk_led_on.gif differ Binary files netmrg-0.19/www/webfiles/img/yellow_led_off.gif and netmrg-0.20/ChangeLog/www/webfiles/img/yellow_led_off.gif differ Binary files netmrg-0.19/www/webfiles/img/yellow_led_on.gif and netmrg-0.20/ChangeLog/www/webfiles/img/yellow_led_on.gif differ diff -Nurb netmrg-0.19/www/webfiles/include/inputdefault.js netmrg-0.20/ChangeLog/www/webfiles/include/inputdefault.js --- netmrg-0.19/www/webfiles/include/inputdefault.js 2005-09-09 22:53:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/include/inputdefault.js 1970-01-01 05:30:00.000000000 +0530 @@ -1,40 +0,0 @@ -function set_defaults(parentid) -{ - /* - SHOULD RUN ON LOAD - This function looks for a special attribute on input tags - default. - If it finds this attribute inside an input field inside a given parentid, - it loads the default attribute values for the current values, - and then tries to style the box to make it look "grayed out". - Finally, it sets an event to trigger the removal of the defaults onclick - */ - var x = document.getElementById(parentid); - if (!x) return; - var y = x.getElementsByTagName('input'); - for (var i = 0; i < y.length; i++) - { - if (y[i].getAttribute('default') && y[i].getAttribute('type') == 'text' && y[i].value == '') - { - y[i].value = y[i].getAttribute('default'); - y[i].style.color = '#808080'; - y[i].style.backgroundColor = '#eeeeee'; - y[i].onmouseover = remove_defaults; - y[i].onmouseout = function () { if (!this.value) { this.value = this.getAttribute('default'); this.style.color = '#808080'; this.style.backgroundColor='#eeeeee'; } } - } // end if correct input type - } // end foreach input item -} // end set_defaults(); - -function remove_defaults() -{ - /* - This function is family with the set_defaults() function, but does the opposite. - It takes any input fields that had defaults applied to them, - then returns them to normal by blanking out the value and resetting the bgcolor. - */ - if (this.getAttribute('type') == 'text' && this.value == this.getAttribute('default')) - { - this.value = ''; - this.style.color = ''; - this.style.backgroundColor = ''; - } -} diff -Nurb netmrg-0.19/www/webfiles/include/login_focus.js netmrg-0.20/ChangeLog/www/webfiles/include/login_focus.js --- netmrg-0.19/www/webfiles/include/login_focus.js 2005-02-27 23:32:20.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/include/login_focus.js 1970-01-01 05:30:00.000000000 +0530 @@ -1,4 +0,0 @@ -function focusme() -{ - document.lif.user_name.focus(); -} \ No newline at end of file diff -Nurb netmrg-0.19/www/webfiles/include/netmrg.css netmrg-0.20/ChangeLog/www/webfiles/include/netmrg.css --- netmrg-0.19/www/webfiles/include/netmrg.css 2005-12-09 06:15:44.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/include/netmrg.css 1970-01-01 05:30:00.000000000 +0530 @@ -1,487 +0,0 @@ -A, A:visited { - color : #0000B0; - text-decoration: none; -} - -A:hover, A:active { - color : #FF8C00; - text-decoration: underline; -} - -BODY { - background-color : #FFFFFF; - color : #000000; - font-family: sans-serif; - font-size: 1em; - margin : 0; - padding : 0; -} - -IMG { - border : 0; -} - -#header { - background-color : #6699CC; -/* - background-image : url(../images/headerlogo.jpg); - background-position : top-left; - background-repeat : no-repeat; -*/ - color : #000000; - font-family : sans-serif; - font-size : 1em; -} - -#header h1 { - font-family : sans-serif; - font-weight : bold; - font-size : 2em; - letter-spacing : 0.2em; - margin : 0; - padding : 0; -} - -#header h1 a, #header h1 a:visited { - color : #000000; -} - -#headerinfo { - float : right; -} - -#company { - color : #000000; - font-size : 1.2em; - letter-spacing : 0.2em; -} - -#company a, #company a:visited { - color : #000000; -} - -#company a:hover, #company a:active -{ - color : #000080; -} - -#logindata { - font-size : 0.8em; -} - -.loggedouttext { - color : #E00000; -} - -.loggedintext { - color : #000000; -} - -.loggedinuser { - color : #008000; - font-weight : bold; -} - -#search { - font-size : 0.8em; -} - -#search input { - border : 1px solid #E5E5E5; -} - -#topmenu { - color : #000000; - font-family : sans-serif; - font-size : 0.9em; - font-weight : bold; - letter-spacing : 0.2em; - padding-left : 0.5em; - border-bottom : 1px solid #305090; -} - -#topmenu ul { - margin : 0; - padding : 0; -} - -#topmenu ul li { - background-color : #5080B0; - list-style : none; - margin-left : 1px; - margin-right : 1px; - border-top-left-radius : 1em; - border-top-right-radius : 1em; - -moz-border-radius-topleft : 1em; - -moz-border-radius-topright : 1em; - float : left; -} - -#topmenu ul li a { - color : #000080; - display : block; - padding-left : 1em; - padding-right : 1em; -} - -#topmenu ul li a:hover, #topmenu ul li a.navcurrent:hover { - background-color : #AFC9E9; - color : #8080B0; - text-decoration : none; - border-top-left-radius : 1em; - border-top-right-radius : 1em; - -moz-border-radius-topleft : 1em; - -moz-border-radius-topright : 1em; -} - -#topmenu ul li a.navcurrent { - background-color : #A8C0E0; - border-top-left-radius : 1em; - border-top-right-radius : 1em; - -moz-border-radius-topleft : 1em; - -moz-border-radius-topright : 1em; -} - -#secondmenu { - background-color : #A8C0E0; - color : #000000; - font-family : sans-serif; - font-size : 0.8em; - font-weight : bold; - letter-spacing : 0.2em; - padding-left : 1em; - margin-bottom : 0.5em; -} - -#secondmenu ul { - margin : 0; - padding : 0; -} - -#secondmenu ul li { - background-color : #5080B0; - list-style : none; - margin-left : 1px; - margin-right : 1px; - border-bottom-left-radius : 1em; - border-bottom-right-radius : 1em; - -moz-border-radius-bottomleft : 1em; - -moz-border-radius-bottomright : 1em; - float : left; -} - -#secondmenu ul li a { - color : #000080; - display : block; - padding-left : 1em; - padding-right : 1em; -} - -#secondmenu ul li a:hover, #secondmenu ul li a.navcurrent:hover { - background-color : #AFC9E9; - color : #8080B0; - border-bottom-left-radius : 1em; - border-bottom-right-radius : 1em; - -moz-border-radius-bottomleft : 1em; - -moz-border-radius-bottomright : 1em; - text-decoration : none; -} - -#secondmenu ul li a.navcurrent { - background-color : #90B0E0; - border-bottom-left-radius : 1em; - border-bottom-right-radius : 1em; - -moz-border-radius-bottomleft : 1em; - -moz-border-radius-bottomright : 1em; -} - -#sidemenu { - width: 125px; - border-right: 1px solid #002000; - border-left: 1px solid #002000; - border-bottom: 1px solid #002000; - float : right; -} - -#sidemenu h2 { - background-color : #AEC9E4; - color : #000000; - font-size : 0.9em; - font-weight : bold; - letter-spacing : 0.1em; - margin : 0; - padding : 1px; - border-top : 1px solid #002000; - border-bottom : 1px solid #002000; -} - -#sidemenu ul { - margin : 0; - padding : 0; -} - -#sidemenu ul li { - background-color : #F5F8FB; - color : #000000; - font-size : 0.7em; - padding-left : 1em; - list-style : none; -} - -#sidemenu ul li a, #sidemenu ul li a:visited { - color : #000000; -} - -#sidemenu ul li a:hover, #sidemenu ul li a:active -{ - color : #FF8C00; -} - -#content { - clear : left; -} - -#footer { - text-align : center; -} - -.about { - text-align : center; -} - -.editmainheader -{ - background-color : #A8C0E0; - color : black; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 0px; -} - -.editheader -{ - background-color : #000088; - color : #E0E0E0; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 1px; - border : 2px solid white; -} - -.editsection -{ - background-color : #DADADA; - color : #404040; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 1px; - border : 2px solid white; -} - -.editheaderlink, A.editheaderlink, A:visited.editheaderlink -{ - background-color : #000088; - color : #E0E0E0; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; -} - -.editfield0 -{ - background-color : #CECECE; - color : black; - font-family : sans-serif; - font-size : 12px; - padding : 1px; - border : 2px solid white; -} - -A.editfield0, A:visited.editfield0 -{ - background-color : #CECECE; - color : #0000B0; - font-family : sans-serif; - font-size : 12px; - padding : 0px; - border : 0px; -} - -.editfield1 -{ - background-color : #E4E4E4; - color : black; - font-family : sans-serif; - font-size : 12px; - padding : 1px; - border : 2px solid white; -} - -A.editfield1, A:visited.editfield1 -{ - background-color : #E4E4E4; - color : #0000B0; - font-family : sans-serif; - font-size : 12px; - padding : 0px; - border : 0px; -} - -.statusline -{ - font-family : sans-serif; - font-size : 12px; - color : #000000; - font-style : italic; -} - -.customaddlink, A.customaddlink, A:visited.customaddlink -{ - color : #FFFF00; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; -} - -.viewseparator -{ - background-color : #4040B0; - color : #F0F0F0; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 1px; - border : 2px solid white; -} - -.disabled -{ - color : #C0C0C0; -} - -.error -{ - color : red; -} - -.error-text -{ - color : red; -} - -.result-text -{ - color : #00D000; -} - -.empty -{ - font-family : sans-serif; - font-size : 0px; -} - -.update-text -{ - color : #000000; - font-size : 12px; -} - -.update-list-version -{ - background-color : #000088; - color : #E0E0E0; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 1px; - border-bottom : 1px solid #E5E5E5; -} - -.update-list-version a -{ - color : #E0E0E0; -} - -.update-list-header -{ - background-color : #DADADA; - color : #404040; - font-family : sans-serif; - font-size : 12px; - font-weight : bold; - padding : 1px; - border-bottom : 1px solid #E5E5E5; -} - -.update-list-item -{ - font-family : sans-serif; - font-size : 12px; - border-bottom : 1px solid #E5E5E5; - padding : 1px; -} - -.update-list-query -{ - font-family : monospace; - font-size : 12px; - border-bottom : 1px solid #E5E5E5; - padding : 1px; -} - -.update-list-item-applied -{ - background-color : #A0F0A0; -} - -.update-list-item-notapplied -{ - background-color : #E0E0E0; -} - -.update-list-item-error -{ - background-color : #F0A0A0; -} - -/** SEARCH **/ -.search-header -{ - background-color : #E5E5E5; - font-size : 0.9em; - letter-spacing : 0.1em; - padding-left : 2em; - border-top : #20B0E5 1px solid; -} - -.search-result -{ - border-top : #E5C484 1px dashed; - border-bottom : #E5C484 1px dashed; - margin-top : 0.25em; - margin-bottom : 0.25em; -} - -.search-result h3 -{ - font-size : 1em; - margin : 0; - padding : 0; -} - -.search-group -{ - color : #208444; -} - -.search-parent -{ - color : #204484; -} - -.search-object -{ -} diff -Nurb netmrg-0.19/www/webfiles/index.php netmrg-0.20/ChangeLog/www/webfiles/index.php --- netmrg-0.19/www/webfiles/index.php 2003-01-14 09:02:53.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/index.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,15 +0,0 @@ - diff -Nurb netmrg-0.19/www/webfiles/login.php netmrg-0.20/ChangeLog/www/webfiles/login.php --- netmrg-0.19/www/webfiles/login.php 2005-09-09 22:53:07.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/login.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,111 +0,0 @@ - -

-User Login -

- - -
- -
- -
- - - - -
User:
Password:
-
- - diff -Nurb netmrg-0.19/www/webfiles/logout.php netmrg-0.20/ChangeLog/www/webfiles/logout.php --- netmrg-0.19/www/webfiles/logout.php 2003-01-14 09:02:53.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/logout.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,18 +0,0 @@ - diff -Nurb netmrg-0.19/www/webfiles/monitors.php netmrg-0.20/ChangeLog/www/webfiles/monitors.php --- netmrg-0.19/www/webfiles/monitors.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/monitors.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,437 +0,0 @@ - -
" method="post" name="form"> - - - - checkbox_toolbar()), - array("text" => "Test"), - array("text" => "Data"), - array("text" => "Graph") - ); // end make_display_table(); - - $mon_results = db_query("SELECT * FROM monitors WHERE sub_dev_id='{$_REQUEST['sub_dev_id']}'"); - $mons = array(); - while ($arow = mysql_fetch_array($mon_results)) - { - $arow['short_name'] = get_short_monitor_name($arow["id"]); - array_push($mons, $arow); - } - - function mon_sort($a, $b) - { - return strcmp($a['short_name'], $b['short_name']); - } - - usort($mons, mon_sort); - $mon_count = 0; - - foreach ($mons as $mon_row) - { - $mon_id = $mon_row["id"]; - - if ($mon_row["data_type"] != -1) - { - $graph = ""; - } - else - { - $graph = "Not Graphed"; - } // end if data type - - if ((!isset($mon_row['delta_time'])) || ($mon_row["delta_time"] == 0) || !isset($mon_row['last_val'])) - { - $rate_of_change = ""; - } - else - { - $rate_of_change = sanitize_number($mon_row["delta_val"] / $mon_row["delta_time"],2); - } // end if delta - - if (!isset($mon_row['last_val'])) - { - $mon_row['last_val'] = ""; - } - else - { - $mon_row['last_val'] = sanitize_number($mon_row['last_val']); - } - - if (!isset($mon_row['last_time'])) - { - $mon_row['last_time'] = ""; - } - - $data = ' - - - - - - - - - - - -
Value' . $mon_row["last_val"] . '
Rate of Change'. $rate_of_change .'
Time Stamp'. $mon_row["last_time"] .'
'; - - $html_name = htmlspecialchars($mon_row['short_name']); - $java_name = addslashes($html_name); - - make_display_item("editfield".($mon_count%2), - array("checkboxname" => "monitor", "checkboxid" => $mon_row['id']), - array("text" => $html_name, "href" => "events.php?mon_id={$mon_row['id']}&tripid={$_REQUEST['tripid']}"), - array("text" => $data), - array("text" => $graph), - array("text" => formatted_link("Duplicate", "{$_SERVER['PHP_SELF']}?action=duplicate&mon_id=$mon_id&sub_dev_id={$_REQUEST['sub_dev_id']}&tripid={$_REQUEST['tripid']}", "", "duplicate") . " " . - formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&mon_id=$mon_id&sub_dev_id={$_REQUEST['sub_dev_id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete","javascript:del('$java_name', '$mon_id')", "", "delete")) - ); // end make_display_item(); - - $mon_count++; - - } // end for each monitor - make_checkbox_command("", 5, - array("text" => "Duplicate", "action" => "multiduplicate"), - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked monitors?") - ); // end make_checkbox_command - make_status_line("monitor", $mon_count); - ?> - -
- - - function redisplay(selectedIndex) - { - window.location = '{$_SERVER['PHP_SELF']}?mon_id={$_REQUEST['mon_id']}&tripid={$_REQUEST['tripid']}&action={$_REQUEST['action']}" . $dev_thingy . "&type=' + selectedIndex; - } - - function validateform() - { - if (document.editform.min_val.value != 'U' - && document.editform.max_val.value != 'U' - && document.editform.min_val.value >= document.editform.max_val.value) - { - alert('Minimum not allowed to be greater than or equal to Maximum'); - return false; - } - - return true; - } - - function make_min_undefined() - { - document.editform.min_val.value = 'U'; - } - function make_max_undefined() - { - document.editform.max_val.value = 'U'; - } - - "; - - // if we've been passed a test type - if (!empty($_REQUEST["type"])) - { - $mon_row["test_type"] = $_REQUEST["type"]; - } // end if test type is set - // else default to test type 1 (script) - else if (empty($mon_row["test_type"])) - { - $mon_row["test_type"] = 1; - } // end if no test type - GLOBAL $TEST_TYPES; - make_edit_select_from_array("Monitoring Type:", "test_type", $TEST_TYPES, $mon_row["test_type"], "onChange='redisplay(form.test_type.options[selectedIndex].value);'"); - - if ($mon_row["test_type"] == 1) - { - make_edit_group("Script Options"); - if ($_REQUEST["action"] == "add") - { - make_edit_select_from_table("Script Test:", "test_id", "tests_script", "dl4392l234"); - } // end if adding - else - { - make_edit_select_from_table("Script Test:", "test_id", "tests_script", $mon_row["test_id"]); - } // end if editing - } - - if ($mon_row["test_type"] == 2) - { - make_edit_group("SNMP Options"); - if ($_REQUEST["action"] == "add") - { - make_edit_select_from_table("SNMP Test:", "test_id", "tests_snmp", "dl4392l234"); - } // end if adding - else - { - make_edit_select_from_table("SNMP Test:", "test_id", "tests_snmp", $mon_row["test_id"]); - } // end if editing - } - - if ($mon_row["test_type"] == 3) - { - make_edit_group("SQL Options"); - if ($_REQUEST["action"] == "add") - { - make_edit_select_from_table("SQL Test:", "test_id", "tests_sql", "dl4392l234"); - } // end if adding - else - { - make_edit_select_from_table("SQL Test:", "test_id", "tests_sql", $mon_row["test_id"]); - } // end if editing - } - - if ($mon_row["test_type"] == 4) - { - make_edit_group("Internal Test Options"); - if ($_REQUEST["action"] == "add") - { - make_edit_select_from_table("Internal Test:", "test_id", "tests_internal", "dl4392l234"); - } // end if adding - else - { - make_edit_select_from_table("Internal Test:", "test_id", "tests_internal", $mon_row["test_id"]); - } // end if editing - } - - make_edit_text("Parameters:", "test_params", 50, 100, htmlspecialchars($mon_row["test_params"])); - make_edit_group("Graphing Options"); - make_edit_select_from_table("Data Type:", "data_type", "data_types", $mon_row["data_type"]); - make_edit_text("Minimum Value:", "min_val", "10", "20", $mon_row["min_val"]); - make_edit_text("Maximum Value:", "max_val", "10", "20", $mon_row["max_val"]); - make_edit_label('[make minimum undefined] - [make maximum undefined]'); - - make_edit_group("Ownership"); - if ($_REQUEST["edit_subdevice"] == 1) - { - make_edit_select_subdevice($_REQUEST["sub_dev_id"]); - } - else - { - $label = "Subdevice:
"; - $label .= get_dev_sub_device_name($_REQUEST['sub_dev_id']); - $label .= " [change]"; - make_edit_label($label); - make_edit_hidden("subdev_id[]", $_REQUEST["sub_dev_id"]); - } - - make_edit_hidden("action","doedit"); - make_edit_hidden("mon_id",$_REQUEST["mon_id"]); - make_edit_hidden("sub_dev_id",$_REQUEST["sub_dev_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - - make_edit_submit_button(); - make_edit_end(); - - end_page(); -} // end edit(); - -function redirect() -{ - header("Location: monitors.php?sub_dev_id={$_REQUEST['sub_dev_id']}&tripid={$_REQUEST['tripid']}"); -} // end redirect() - - -function do_edit() -{ - if ($_REQUEST["mon_id"] == 0) - { - $db_cmd = "INSERT INTO"; - $db_end = ""; - } - else - { - $db_cmd = "UPDATE"; - $db_end = "WHERE id='{$_REQUEST['mon_id']}'"; - } - - if ($_REQUEST["min_val"] == "U") { $_REQUEST["min_val"] = "NULL"; } - if ($_REQUEST["max_val"] == "U") { $_REQUEST["max_val"] = "NULL"; } - - - db_update("$db_cmd monitors SET - sub_dev_id='{$_REQUEST['subdev_id'][0]}', - test_type='{$_REQUEST['test_type']}', - test_id='{$_REQUEST['test_id']}', - test_params='" . $_REQUEST['test_params'] ."', - data_type='{$_REQUEST['data_type']}', - min_val={$_REQUEST['min_val']}, - max_val={$_REQUEST['max_val']}, - tuned=0 $db_end"); - -} // end do_edit() - -?> diff -Nurb netmrg-0.19/www/webfiles/notifications.php netmrg-0.20/ChangeLog/www/webfiles/notifications.php --- netmrg-0.19/www/webfiles/notifications.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/notifications.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,160 +0,0 @@ - "Name"), - array("text" => "Disabled"), - array("text" => "Command") - ); // end make_display_table(); - - $res = db_query("SELECT * FROM notifications"); - - // For each notification - for ($i = 0; $i < db_num_rows($res); $i++) - { - $row = db_fetch_array($res); - - make_display_item("editfield".($i%2), - array("text" => $row["name"]), - array("text" => ($row['disabled'] == 1 ? "Yes" : "No")), - array("text" => $row["command"]), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id={$row['id']}", "", "edit") . " " . - formatted_link("Duplicate", "{$_SERVER["PHP_SELF"]}?action=duplicate&id=" . $row['id'], "", "duplicate") . " " . - formatted_link("Delete", "javascript:del('". addslashes($row['name'])."', '{$row['id']}')", "", "delete")) - ); // end make_display_item(); - } - - ?> - - diff -Nurb netmrg-0.19/www/webfiles/recache.php netmrg-0.20/ChangeLog/www/webfiles/recache.php --- netmrg-0.19/www/webfiles/recache.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/recache.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,37 +0,0 @@ - diff -Nurb netmrg-0.19/www/webfiles/responses.php netmrg-0.20/ChangeLog/www/webfiles/responses.php --- netmrg-0.19/www/webfiles/responses.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/responses.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,156 +0,0 @@ - -
" method="post" name="form"> - - - - checkbox_toolbar()), - array("text" => "Name"), - array("text" => "Parameters") - ); - - $res = db_query(" SELECT responses.id, notifications.name, responses.parameters - FROM responses, notifications - WHERE responses.notification_id=notifications.id - AND event_id={$_REQUEST['event_id']} - ORDER BY notifications.name, responses.parameters"); - $rowcount = 0; - while ($row = db_fetch_array($res)) - { - make_display_item("editfield".($rowcount%2), - array("checkboxname" => "response", "checkboxid" => $row['id']), - array("text" => $row['name']), - array("text" => $row['parameters']), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del('{$row['name']}','{$row['id']}')", "", "delete")) - ); // end make_display_item(); - $rowcount++; - } - make_checkbox_command("", 5, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked responses?") - ); // end make_checkbox_command - make_status_line("response", $rowcount); - ?> - -
- diff -Nurb netmrg-0.19/www/webfiles/search.php netmrg-0.20/ChangeLog/www/webfiles/search.php --- netmrg-0.19/www/webfiles/search.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/search.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,233 +0,0 @@ -'."\n"; - echo 'Your search for '.htmlspecialchars(stripslashes($query)).' produced ' . $search_result_count . ' result(s)'; - echo "\n"; - - while (list($obj_type, $s_result) = each($search_result)) - { - foreach($s_result as $sitem) - { - display_result($obj_type, $sitem["id"], $sitem["name"], $sitem["groups"], $sitem["parent"]); - } // end foreach search result item - } // end while each search result type - - end_page(); -} // end display(); - - -/** -* display_result(); -* -* a wrapper for the search results -* -* @param string $object_type type of object (group, device, subdevice) -* @param integer $object_id id of object -* @param string $object_value value of object -* @param array $object_groups group ids and names object is in -* @param array $object_parent parent name and id -*/ -function display_result($object_type, $object_id, $object_value, $object_groups, $object_parent) -{ - global $SEARCH_ITEMS; - -?> -
-

-'; - $loopcount = 0; - foreach ($object_groups as $group_id => $group_name) - { - if ($loopcount != 0) echo ", "; - echo $group_name; - if (GetNumAssocItems("group", $group_id) > 0) - { - echo "\n". - ''. - 'View'."\n". - ''."\n"; - } // end if we have items in this view - $loopcount++; - } - echo "]\n"; - - // display object parents - if (isset($object_parent)) - { - echo ' : ' . $object_parent["name"] . "\n"; - if (GetNumAssocItems($object_parent["type"], $object_parent["id"]) > 0) - { - echo "\n". - ''. - 'View'. - ''."\n"; - } // end if we have items in this view - } // end if parent exists - - // display object - echo ' : '; - echo $object_value; - if (GetNumAssocItems($object_type, $object_id) > 0) - { - echo "\n". - ''. - 'View'. - ''."\n"; - } // end if we have items in this view - echo "
\n"; -?> -
- $parent_id, - "name" => $parent_name, - "type" => "device"); - } // end if allowed to view device - } // end if subdevice or subdevice parameter - } // end else allowed to view, get more info - } // end foreach search result item - } // end while each search result type - - // clear out any empty results - reset($result); - while (list($obj_type, $s_result) = each($result)) - { - if (!is_array($s_result) || count($s_result) == 0 || empty($s_result)) - { - unset($result[$obj_type]); - } - } // end while each object - - reset($result); - return $result; -} // end perform_search(); - -?> diff -Nurb netmrg-0.19/www/webfiles/snmp_cache_view.php netmrg-0.20/ChangeLog/www/webfiles/snmp_cache_view.php --- netmrg-0.19/www/webfiles/snmp_cache_view.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/snmp_cache_view.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,351 +0,0 @@ - -
" method="post" name="form"> - "dindex", "checkboxid" => $row["disk_index"], "checkdisabled" => isset($s_row['id'])), - array("text" => $row['disk_index']), - array("text" => $row['disk_device']), - array("text" => $row['disk_path']), - array("text" => $links) - ); // end make_display_item(); - } - - make_checkbox_command("", 9, - array("text" => "Monitor/Graph All Checked", "action" => "graphmultidisk") - ); // end make_checkbox_command - echo("\n"); - echo("
\n"); - end_page(); -} - -function view_interface_cache() -{ - $sort_href = "{$_SERVER['PHP_SELF']}?action=view&type=interface&dev_id={$_REQUEST['dev_id']}&order_by"; - $handle = db_query("SELECT * FROM snmp_interface_cache snmp WHERE snmp.dev_id={$_REQUEST['dev_id']}"); - $results = array(); - while ($row = db_fetch_array($handle)) - { - array_push($results, $row); - } - - function sortme($a, $b) - { - $ob = $_REQUEST['order_by']; - switch($ob) - { - case "ifName": - case "ifDescr": return compare_interface_names($a[$ob], $b[$ob]); - case "ifAlias": return strcmp($a['ifAlias'], $b['ifAlias']); - case "ifIP": return compare_ip_addresses($a['ifIP'], $b['ifIP']); - case "ifMAC": return compare_mac_addresses($a['ifMAC'], $b['ifMAC']); - default: return ($a['ifIndex'] - $b['ifIndex']); - } - } - - usort($results, sortme); - - $dev_name = get_device_name($_REQUEST['dev_id']); - - begin_page("snmp_cache_view.php", "$dev_name - Interface Cache"); - js_checkbox_utils(); - PrepGroupNavHistory("device", $_REQUEST["dev_id"]); - DrawGroupNavHistory("device", $_REQUEST["dev_id"]); - - -?> -
" method="post" name="form"> -Monitor/Graph>'; - } - - make_display_item("editfield".($i%2), - array("checkboxname" => "iface", "checkboxid" => $row["ifIndex"], "checkdisabled" => isset($s_row['id'])), - array("text" => $row["ifIndex"]), - array("text" => $status), - array("text" => $row["ifName"]), - array("text" => $row["ifDescr"]), - array("text" => $row["ifAlias"]), - array("text" => $row["ifIP"]), - array("text" => $row["ifMAC"]), - array("text" => $links) - ); // end make_display_item(); - } // end for each row - echo "\n"; - echo ''; - echo "Checked Items:  \n"; - echo '<Monitor/Graph All Checked>'; - echo ''."\n"; - echo '\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - end_page(); -} -?> diff -Nurb netmrg-0.19/www/webfiles/sub_devices.php netmrg-0.20/ChangeLog/www/webfiles/sub_devices.php --- netmrg-0.19/www/webfiles/sub_devices.php 2006-01-31 04:34:35.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/sub_devices.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,215 +0,0 @@ - -
" method="post" name="form"> - - - - checkbox_toolbar()), - array("text" => "Sub-Devices"), - array("text" => "Type") - ); // end make_display_table(); - - GLOBAL $SUB_DEVICE_TYPES; - - for ($i = 0; $i < db_num_rows($results); $i++) - { - $row = $rows[$i]; - make_display_item("editfield".($i%2), - array("checkboxname" => "subdevice", "checkboxid" => $row['id']), - array("text" => $row["name"], "href" => "monitors.php?sub_dev_id={$row['id']}&tripid={$_REQUEST['tripid']}"), - array("text" => $SUB_DEVICE_TYPES[$row["type"]]), - array("text" => - formatted_link("Add Templates", "graphs.php?action=applytemplates&sub_dev_id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "applytemplate") . " " . - formatted_link("Parameters", "sub_dev_param.php?dev_id={$_REQUEST['dev_id']}&sub_dev_id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "parameters") . " " . - formatted_link("View", "view.php?action=view&object_type=subdevice&object_id={$row['id']}", "", "view") . " " . - formatted_link("Duplicate", "{$_SERVER['PHP_SELF']}?action=duplicate&dev_id={$_REQUEST['dev_id']}&sub_dev_id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "duplicate") . " " . - formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&dev_id={$_REQUEST['dev_id']}&sub_dev_id={$row['id']}&tripid={$_REQUEST['tripid']}", "", "edit") . " " . - formatted_link("Delete", "javascript:del('".addslashes($row['name'])."','{$row['id']}')", "", "delete")) - ); // end make_display_item(); - } - make_checkbox_command("", 5, - array("text" => "Duplicate", "action" => "multiduplicate"), - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked sub-devices?") - ); // end make_checkbox_command - make_status_line("sub-device", $i); - ?> - -
- 0) - { - $query = db_query("SELECT * FROM sub_devices WHERE id = {$_REQUEST['sub_dev_id']}"); - $row = db_fetch_array($query); - } - - make_edit_table("Sub-Device Properties"); - make_edit_text("Name:", "name", 40, 80, $row["name"]); - make_edit_select_from_array("Sub-Device Type:", "type", $GLOBALS['SUB_DEVICE_TYPES'], $row["type"]); - make_edit_select_from_table("Device:", "edit_dev_id", "devices", $_REQUEST["dev_id"]); - make_edit_hidden("action","doedit"); - make_edit_hidden("sub_dev_id", $_REQUEST["sub_dev_id"]); - make_edit_hidden("dev_id", $_REQUEST["dev_id"]); - make_edit_hidden("tripid", $_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); - -} // end displayedit(); - - -?> diff -Nurb netmrg-0.19/www/webfiles/sub_dev_param.php netmrg-0.20/ChangeLog/www/webfiles/sub_dev_param.php --- netmrg-0.19/www/webfiles/sub_dev_param.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/sub_dev_param.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,130 +0,0 @@ - "Name"), - array("text" => "Value") - ); // end make_display_table(); - - for ($i = 0; $i < db_num_rows($results); $i++) - { - $row = db_fetch_array($results); - make_display_item("editfield".($i%2), - array("text" => $row["name"]), - array("text" => $row["value"]), - array("text" => formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&sub_dev_id={$_REQUEST['sub_dev_id']}&tripid={$_REQUEST['tripid']}&name=" . $row["name"]) . " " . - formatted_link("Delete", "javascript:del('".addslashes(htmlspecialchars($row['name']))."', '".addslashes(htmlspecialchars($row['name']))."')"), "") - ); // end make_display_item(); - } - - ?>

"Name"), - array("text" => "Value") - ); // end make_display_table(); - - for ($i = 0; $i < db_num_rows($results); $i++) - { - $row = db_fetch_array($results); - make_display_item("editfield".($i%2), - array("text" => $row["name"]), - array("text" => $row["value"]), - array("text" => "") - ); // end make_display_item(); - } - - ?> 0) - { - $row = db_fetch_array($query); - make_edit_hidden("oldname", $row['name']); - } - } - else - { - $row["name"] = ""; - $row["value"] = ""; - } - - make_edit_text("Name:", "name", 40, 80, $row["name"]); - make_edit_text("Value:", "value", 40, 80, $row["value"]); - make_edit_hidden("type", $_REQUEST['action']); - make_edit_hidden("action","doedit"); - make_edit_hidden("sub_dev_id",$_REQUEST["sub_dev_id"]); - make_edit_hidden("tripid",$_REQUEST["tripid"]); - make_edit_submit_button(); - make_edit_end(); - end_page(); - -} - -elseif ($_REQUEST["action"] == "dodelete") -{ - check_auth($GLOBALS['PERMIT']["ReadWrite"]); - db_update("DELETE FROM sub_dev_variables WHERE sub_dev_id={$_REQUEST['sub_dev_id']} AND name='{$_REQUEST['name']}' AND type='static'"); - header("Location: " . $_SERVER["PHP_SELF"] . "?sub_dev_id={$_REQUEST['sub_dev_id']}&tripid={$_REQUEST['tripid']}"); -} - -?> diff -Nurb netmrg-0.19/www/webfiles/tests_script.php netmrg-0.20/ChangeLog/www/webfiles/tests_script.php --- netmrg-0.19/www/webfiles/tests_script.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/tests_script.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,155 +0,0 @@ - -
" method="post" name="form"> - - checkbox_toolbar()), - array("text" => "Name"), - array("text" => "Command"), - array("text" => "Data Type") -); // end make_display_table(); - -$test_results = db_query(" - SELECT id, - name, - cmd, - data_type - FROM tests_script - ORDER BY name -"); // end test_results - -$test_total = db_num_rows($test_results); - -for ($test_count = 1; $test_count <= $test_total; ++$test_count) -{ - - $test_row = db_fetch_array($test_results); - $test_id = $test_row["id"]; - - make_display_item("editfield".(($test_count-1)%2), - array("checkboxname" => "test", "checkboxid" => $test_id), - array("text" => htmlspecialchars($test_row["name"])), - array("text" => htmlspecialchars($test_row["cmd"])), - array("text" => $GLOBALS["SCRIPT_DATA_TYPES"][$test_row["data_type"]]), - array("text" => formatted_link("Edit", "{$_SERVER["PHP_SELF"]}?action=edit&test_id=$test_id", "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes(htmlspecialchars($test_row["name"])) . "', '" . $test_row["id"] . "')", "", "delete")) - ); // end make_display_item(); -} // end tests -make_checkbox_command("", 5, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked Script tests?") -); // end make_checkbox_command -make_status_line("script test", $test_count - 1); -?> - -
- diff -Nurb netmrg-0.19/www/webfiles/tests_snmp.php netmrg-0.20/ChangeLog/www/webfiles/tests_snmp.php --- netmrg-0.19/www/webfiles/tests_snmp.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/tests_snmp.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,146 +0,0 @@ - -
" method="post" name="form"> - - checkbox_toolbar()), - array("text" => "Name"), - array("text" => "OID") -); // end make_display_table(); - -$test_results = db_query("SELECT * FROM tests_snmp ORDER BY name"); -$test_total = db_num_rows($test_results); - -// For each test -for ($test_count = 1; $test_count <= $test_total; ++$test_count) -{ - $test_row = db_fetch_array($test_results); - - make_display_item("editfield".(($test_count-1)%2), - array("checkboxname" => "test", "checkboxid" => $test_row['id']), - array("text" => htmlspecialchars($test_row["name"])), - array("text" => htmlspecialchars($test_row["oid"])), - array("text" => formatted_link("Edit", "{$_SERVER["PHP_SELF"]}?action=edit&test_id=" . $test_row["id"], "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes(htmlspecialchars($test_row["name"])) . "', '" . $test_row["id"] . "')", "", "delete")) - ); // end make_display_item(); -} // end tests - - make_checkbox_command("", 5, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked SNMP tests?") - ); // end make_checkbox_command - make_status_line("SNMP test", $test_count - 1); -?> - -
- "Direct (Get)" , 1 => "Nth Item (Walk)" , 2 => "Count of Items (Walk)"), $test_row["type"]); - make_edit_text("Item #:", "subitem", "3", "10", $test_row["subitem"]); - make_edit_hidden("action","doedit"); - make_edit_hidden("test_id",$_REQUEST["test_id"]); - make_edit_submit_button(); - make_edit_end(); - - end_page(); - -} // End editing screen - - -?> diff -Nurb netmrg-0.19/www/webfiles/tests_sql.php netmrg-0.20/ChangeLog/www/webfiles/tests_sql.php --- netmrg-0.19/www/webfiles/tests_sql.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/tests_sql.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,159 +0,0 @@ - -
" method="post" name="form"> - - checkbox_toolbar()), - array("text" => "Name"), - array("text" => "Host"), - array("text" => "User"), - array("text" => "Query") -); // end make_display_table(); - -$test_results = db_query("SELECT * FROM tests_sql ORDER BY name"); -$test_total = db_num_rows($test_results); - -// For each test -for ($test_count = 1; $test_count <= $test_total; ++$test_count) -{ - $test_row = db_fetch_array($test_results); - - make_display_item("editfield".(($test_count-1)%2), - array("checkboxname" => "test", "checkboxid" => $test_row['id']), - array("text" => htmlspecialchars($test_row["name"])), - array("text" => htmlspecialchars($test_row["host"])), - array("text" => htmlspecialchars($test_row["user"])), - array("text" => htmlspecialchars(paraphrase($test_row["query"],75))), - array("text" => formatted_link("Edit", "{$_SERVER["PHP_SELF"]}?action=edit&test_id=" . $test_row["id"], "", "edit") . " " . - formatted_link("Delete", "javascript:del('" . addslashes(htmlspecialchars($test_row["name"])) . "', '" . $test_row["id"] . "')", "", "delete")) - ); // end make_display_item(); -} // end tests - - make_checkbox_command("", 6, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked SQL tests?") - ); // end make_checkbox_command - make_status_line("SQL test", $test_count - 1); -?> - -
- diff -Nurb netmrg-0.19/www/webfiles/updater.php netmrg-0.20/ChangeLog/www/webfiles/updater.php --- netmrg-0.19/www/webfiles/updater.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/updater.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,486 +0,0 @@ - array("ver" => array("name" => "Update Name", "query" => "SELECT 1;")); -$dbupdates = array( - "0.10pre1" => array(), // end 0.10pre1 - - "0.10pre2" => array( - array( - "name" => "Graph Options", - "query" => "ALTER TABLE `graphs` ADD `options` SET( 'nolegend', 'logarithmic' ) NOT NULL ;" - ), - array( - "name" => "Graph Options2", - "query" => "ALTER TABLE `graphs` ADD `base` INT DEFAULT '1000' NOT NULL ;" - ), - array( - "name" => "Graph Item Times", - "query" => "ALTER TABLE `graph_ds` ADD `start_time` VARCHAR( 20 ) NOT NULL ;" - ), - array( - "name" => "Graph Item Times2", - "query" => "ALTER TABLE `graph_ds` ADD `end_time` VARCHAR( 20 ) NOT NULL ;" - ), - array( - "name" => "Graph Title", - "query" => "ALTER TABLE `graphs` ADD `title` VARCHAR( 100 ) NOT NULL AFTER `name`;" - ), - array( - "name" => "Graph Item Muliplier", - "query" => "ALTER TABLE `graph_ds` CHANGE `multiplier` `multiplier` VARCHAR( 100 ) DEFAULT '1' NOT NULL;" - ), - array( - "name" => "SNMP ifSpeed", - "query" => "ALTER TABLE snmp_interface_cache ADD COLUMN ifSpeed int(11) NOT NULL;" - ), - array( - "name" => "Graph Title Fill-in", - "query" => "UPDATE graphs SET title = name WHERE title = '';" - ) - ), // end 0.10pre2 - - "0.10" => array(), // end 0.10 - - "0.12" => array( - array( - "name" => "SNMP Version Support", - "query" => "ALTER TABLE `devices` CHANGE `snmp_enabled` `snmp_version` TINYINT( 4 ) DEFAULT '1' NOT NULL ;" - ), - array( - "name" => "SNMP Timeout", - "query" => "ALTER TABLE `devices` ADD `snmp_timeout` INT UNSIGNED DEFAULT '1000000' NOT NULL AFTER `snmp_version`, ADD `snmp_retries` TINYINT UNSIGNED DEFAULT '3' NOT NULL AFTER `snmp_timeout`, ADD `snmp_port` SMALLINT UNSIGNED DEFAULT '161' NOT NULL AFTER `snmp_retries` ;" - ), - array( - "name" => "User Prefs", - "query" => "CREATE TABLE user_prefs ( id INT NOT NULL AUTO_INCREMENT, uid INT NOT NULL, module VARCHAR(64) NOT NULL, pref VARCHAR(64) NOT NULL, value VARCHAR(64) NOT NULL, PRIMARY KEY (id), KEY uid (uid), KEY uid_module_pref (uid, module, pref));" - ), - array( - "name" => "User Prefs Slideshow Default", - "query" => "INSERT INTO user_prefs (uid, module, pref, value) SELECT id, 'SlideShow', 'AutoScroll', 1 FROM user;" - ) - ), // end 0.12 - - "0.13" => array(), // end 0.13 - - "0.14" => array( - array( - "name" => "SNMP Recache Method", - "query" => "ALTER TABLE `devices` ADD `snmp_recache_method` SMALLINT DEFAULT '0' NOT NULL AFTER `dev_type`;" - ), - array( - "name" => "SNMP Recache Method Default", - "query" => "UPDATE devices SET snmp_recache_method = 4 WHERE snmp_recache = 1;" - ), - array( - "name" => "SNMP Recache Method Default2", - "query" => "UPDATE devices SET snmp_recache_method = 3 WHERE snmp_recache = 0 AND snmp_check_ifnumber = 1;" - ), - array( - "name" => "SNMP Recache Method Default3", - "query" => "UPDATE devices SET snmp_recache_method = 1 WHERE snmp_recache = 0 AND snmp_check_ifnumber = 0;" - ), - array( - "name" => "SNMP Recache Drop", - "query" => "ALTER TABLE `devices` DROP `snmp_recache`;" - ), - array( - "name" => "SNMP ifNumber Drop", - "query" => "ALTER TABLE `devices` DROP `snmp_check_ifnumber`;" - ), - array( - "name" => "Log Table", - "query" => "CREATE TABLE `log` ( `id` BIGINT NOT NULL AUTO_INCREMENT, `date` DATETIME NOT NULL, `dev_id` INT, `subdev_id` INT, `mon_id` INT, `level` INT NOT NULL , `component` INT NOT NULL , `message` VARCHAR( 200 ) NOT NULL , PRIMARY KEY ( `id` ) , INDEX ( `date` ) , INDEX ( `dev_id` ), INDEX ( `subdev_id` ) , INDEX( `mon_id` ));" - ), - array( - "name" => "User Index Drop", - "query" => "ALTER TABLE user DROP INDEX user;" - ), - array( - "name" => "User Unique Index", - "query" => "ALTER TABLE user ADD CONSTRAINT UNIQUE user (user);" - ) - ), // end 0.14 - - "0.15" => array(), // end 0.15 - - "0.16" => array( - array( - "name" => "Device SNMP Uptime Check Option", - "query" => "ALTER TABLE `devices` ADD `no_snmp_uptime_check` TINYINT DEFAULT '0' NOT NULL ;" - ), - array( - "name" => "SNMP Test Type", - "query" => "ALTER TABLE `tests_snmp` ADD `type` TINYINT DEFAULT '0' NOT NULL , ADD `subitem` INT DEFAULT '0' NOT NULL ;" - ), - array( - "name" => "Graph Min/Max", - "query" => "ALTER TABLE `graphs` ADD `max` INT, ADD `min` INT;" - ) - ), // end 0.16 - - "0.17" => array( - array( - "name" => "Internal Test Name Lengthen", - "query" => "ALTER TABLE `tests_internal` CHANGE `name` `name` VARCHAR( 200 ) NOT NULL ;" - ), - array( - "name" => "Script Test Name Lengthen", - "query" => "ALTER TABLE `tests_script` CHANGE `name` `name` VARCHAR( 200 ) NOT NULL ;" - ), - array( - "name" => "SQL Test Name Lengthen", - "query" => "ALTER TABLE `tests_sql` CHANGE `name` `name` VARCHAR( 200 ) NOT NULL ;" - ), - array( - "name" => "New Internal Test - Lucent TNT Good Modems", - "query" => "INSERT INTO tests_internal VALUES (2,'Lucent TNT \"Good\" Modems (available modems minus suspect modems)');" - ), - array( - "name" => "New Internal Test - UCD CPU Load", - "query" => "INSERT INTO tests_internal VALUES (3,'UCD CPU Load (user + system)');" - ), - array( - "name" => "New Internal Test - Windows Disk Usage", - "query" => "INSERT INTO tests_internal VALUES (4,'Windows Disk Usage (percent)');" - ), - array( - "name" => "New Internal Test - UCD Swap Usage", - "query" => "INSERT INTO tests_internal VALUES (5,'UCD Swap Usage (percent)');" - ), - array( - "name" => "New Internal Test - Read Value from File", - "query" => "INSERT INTO tests_internal VALUES (6,'Read Value from File');" - ), - array( - "name" => "User Disabled Support", - "query" => "ALTER TABLE `user` ADD `disabled` TINYINT DEFAULT '0' NOT NULL;" - ) - ), // end 0.17 - - "0.18" => array( - array( - "name" => "Graph Multiply Sum Support", - "query" => "ALTER TABLE `graph_ds` CHANGE `stats` `stats` SET( 'CURRENT', 'AVERAGE', 'MAXIMUM', 'SUMS', 'INTEGER', 'MULTSUM' ) DEFAULT 'CURRENT,AVERAGE,MAXIMUM' NOT NULL ;" - ), - array( - "name" => "New Internal Test - SNMP Failure", - "query" => "INSERT INTO tests_internal VALUES (7,'SNMP Failure');" - ), - array( - "name" => "SQL Test Timeout", - "query" => "ALTER TABLE `tests_sql` ADD `timeout` INT DEFAULT '10' NOT NULL ;" - ) - ), // end 0.18 - - "0.18.1" => array(), // end 0.18.1 - - "0.18.2" => array(), // end 0.18.2 - - "0.19" => array( - array( - "name" => "Increase size of monitors.type_id", - "query" => "ALTER TABLE monitors MODIFY test_id INT NOT NULL;" - ), - array( - "name" => "Increase size of view.pos", - "query" => "ALTER TABLE view MODIFY pos INT NOT NULL;" - ), - array( - "name" => "Windows CPU Internal Test", - "query" => "INSERT INTO tests_internal VALUES (8,'Windows CPU Load');" - ), - array( - "name" => "Livingston Portmaster Modems Script Test", - "query" => "INSERT INTO tests_script SET name='Livingston Portmaster Active Modems', cmd='pmmodems.pl %snmp_read_community% %ip%', data_type='2'"), - array( - "name" => "Graph Min NULL Fix", - "query" => "UPDATE graphs SET min=NULL WHERE min=0"), - array( - "name" => "Graph Max NULL Fix", - "query" => "UPDATE graphs SET max=NULL WHERE max=0") - ) // end 0.19cvs - -); // end $dbupdates; - - - -/***** ACTIONS *****/ -// check default action -if (empty($_REQUEST['action'])) -{ - $_REQUEST["action"] = "prompt"; -} // end if no action - -// check what to do -switch ($_REQUEST['action']) -{ - case "viewupdates": - Updater($dbupdates); - break; - - case "performupdate": - if (!isset($_REQUEST["force_update"])) - { - $_REQUEST["force_update"] = false; - } // end if no force set - if (!isset($_REQUEST["which_update"])) - { - $_REQUEST["which_update"] = ""; - } // end if no update selected - if (!isset($_REQUEST["update_version"])) - { - $_REQUEST["update_version"] = ""; - } // end if no update_version - Updater($dbupdates, $_REQUEST["update_version"], $_REQUEST["which_update"], $_REQUEST["force_update"]); - break; - - case "prompt": - default: - prompt(); - break; -} // end switch action - - - -/***** FUNCTIONS *****/ - -/** -* prompt() -* -* tells a user what we're about to do -*/ -function prompt() -{ - begin_page("updater.php", "Updater"); - - $dbver = $GLOBALS["netmrg"]["dbversion"]; - - if ($dbver != $GLOBALS["netmrg"]["version"]) - { -?> -
" method="POST"> - - - - -
-
-The current database needs to be updated from version - to
-[apply all updates] -
- -
-Your database is already at the latest version, -. No upgrade is needed. -
- -
-View all available updates -
- - [Home] - [Updater] - -
" method="POST"> - - - - -
- - $dbqueries) - { - $numupdates = count($dbqueries); - $updates_applied = 0; - - echo '\n"; - echo ''."\n"; - echo ''."\n"; - echo '\n"; - echo '\n"; - echo '\n"; - echo ''."\n"; - - } // end foreach db query - - // update the database version if we're updating this version or all versions - if (($version == $dbupver || $version == "all") - && $GLOBALS["netmrg"]["verhist"][$dbupver] > $GLOBALS["netmrg"]["verhist"][$dbver] - && $numupdates == $updates_applied) - { - UpdateDBVersion($dbupver); - } // end if this version > db version - - echo ''."\n"; - } // end foreach update version -?> -
v'.$dbupver; - echo " - ".$numupdates." update"; - echo ($numupdates != 1) ? "s" : ""; - echo "[apply all]
NameApplied - '; - echo 'yes '; - echo 'no '; - echo 'error'; - echo "action'."\n"; - foreach ($dbqueries as $dbkey => $dbquery) - { - $update_status = "notapplied"; - $update_error = ""; - - // check if the update is applied - if (CheckUpdate($dbupver, $dbquery['name'])) - { - $update_status = "applied"; - $updates_applied++; - } // end if update is applied - - if (($version == $dbupver && ($which_update == $dbkey || $which_update == "all")) - || ($version == "all" && $which_update == "all")) - { - if (!CheckUpdate($dbupver, $dbquery['name']) || $force) - { - db_query($dbquery['query'], true); - - // check for error - if (!mysql_errno($GLOBALS["netmrg"]["dbconn"])) - { - $update_status = "applied"; - $updates_applied++; - LogUpdate($dbupver, $dbquery['name'], $dbver); - } // if no error - else - { - $update_status = "error"; - $update_error = "
DB_ERROR: Couldn't execute query:
\n
{$dbquery['query']}

\n
".mysql_error($GLOBALS["netmrg"]["dbconn"])."

\n\n"; - if ($force) - { - LogUpdate($dbupver, $dbquery['name'], $dbver); - } // end if we were forcing this update, we need to log it - } // end if error - } // end if the update isn't applied and we aren't forcing it - - } // end if we need to try to apply this update - - echo '
'. $dbquery['name'] ."'; - echo (strlen($dbquery['query']) > 45) ? substr($dbquery['query'], 0, 42)."..." : $dbquery['query']; - echo $update_error; - echo "[apply] [force]
'; - echo $updates_applied." update"; - echo ($updates_applied != 1) ? "s" : ""; - echo ' applied
-
- [Home] - [Updater] - $dbqueries) - { - foreach ($dbqueries as $dbkey => $dbquery) - { - // we'll assume updates lower than $dbver are applied - if ($GLOBALS["netmrg"]["verhist"][$dbupver] <= $GLOBALS["netmrg"]["verhist"][$dbver]) - { - LogUpdate($dbupver, $dbquery['name'], "pre-$dbver"); - } // end if dbupver < this ver - } // end foreach db query - } // end foreach update version - } // end if we don't have an 'updates' table -} // end PrepUpdater(); - - -/** -* LogUpdate(); -* -* log that we did an update -*/ -function LogUpdate($update_version, $name, $version_applied_to) -{ - if (!CheckUpdate($update_version, $name)) - { - db_query("INSERT INTO updates SET - update_version = '$update_version', - name = '$name', - version_applied_to = '$version_applied_to', - dateapplied = now()"); - } // end if the update's not already logged -} // end LogUpdate(); - - -/** -* CheckUpdate($update_version, $name); -* -*/ -function CheckUpdate($update_version, $name) -{ - if (db_fetch_cell("SELECT 1 FROM updates WHERE update_version = '$update_version' AND name = '$name'")) - { - return true; - } // end if the update exists - - return false; -} // end CheckUpdate(); - - -?> diff -Nurb netmrg-0.19/www/webfiles/user_prefs.php netmrg-0.20/ChangeLog/www/webfiles/user_prefs.php --- netmrg-0.19/www/webfiles/user_prefs.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/user_prefs.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,151 +0,0 @@ - diff -Nurb netmrg-0.19/www/webfiles/users.php netmrg-0.20/ChangeLog/www/webfiles/users.php --- netmrg-0.19/www/webfiles/users.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/users.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,203 +0,0 @@ -Error: your passwords don't match; please go back and try again"; - end_page(); - exit(0); - } // end if pass doesn't match vpass - } // end if pass - - if ($_REQUEST["user_id"] == 0) - { - $db_cmd = "INSERT INTO"; - $db_end = ""; - } - else - { - $db_cmd = "UPDATE"; - $db_end = "WHERE id='{$_REQUEST['user_id']}'"; - } - - $pass_cmd = ""; - if (!empty($_REQUEST["pass"])) - { - $pass_cmd = "pass = md5('{$_REQUEST['pass']}'), "; - } // end if new password to set - - if (empty($_REQUEST["group_id"])) - { - $_REQUEST["group_id"] = 0; - } // end if no group id set - - if (empty($_REQUEST["disabled"])) - { - $_REQUEST["disabled"] = 0; - } // end if no disabled value set - - db_update("$db_cmd user SET user='{$_REQUEST['user']}', - fullname='{$_REQUEST['fullname']}', $pass_cmd - permit='{$_REQUEST['permit']}', group_id='{$_REQUEST['group_id']}', disabled='{$_REQUEST['disabled']}' $db_end"); - - header("Location: {$_SERVER['PHP_SELF']}"); - exit(0); -} // done editing - -if (!empty($action) && $action == "dodelete") -{ - db_update("DELETE FROM user WHERE id='{$_REQUEST['user_id']}'"); - header("Location: {$_SERVER['PHP_SELF']}"); - exit(0); - -} // done deleting - -if (!empty($action) && $action == "deletemulti") -{ - if (isset($_REQUEST["user"])) - { - while (list($key,$value) = each($_REQUEST["user"])) - { - db_update("DELETE FROM user WHERE id='$key'"); - } - } - header("Location: {$_SERVER['PHP_SELF']}"); - exit(0); - -} // done multi-deleting - - -// Display a list - -begin_page("users.php", "User Management"); -js_checkbox_utils(); -?> -
" method="post" name="form"> - checkbox_toolbar()), - array("text" => "User ID"), - array("text" => "Name"), - array("text" => "Permissions") -); // end make_display_table(); - -$user_results = db_query("SELECT * FROM user ORDER BY user.user"); - -$user_total = db_num_rows($user_results); - -js_confirm_dialog("del", "Are you sure you want to delete user ", " ?", "{$_SERVER['PHP_SELF']}?action=dodelete&user_id="); - -// For each user -for ($user_count = 1; $user_count <= $user_total; ++$user_count) -{ - $user_row = db_fetch_array($user_results); - $user_id = $user_row["id"]; - - make_display_item("editfield".(($user_count-1)%2), - array("checkboxname" => "user", "checkboxid" => $user_id), - array("text" => $user_row["user"]), - array("text" => $user_row["fullname"]), - array("text" => (get_permit($user_row["user"])==$PERMIT["Disabled"]) ? 'Disabled' : $GLOBALS['PERMIT_TYPES'][$user_row['permit']]), - array("text" => formatted_link("Prefs", "user_prefs.php?uid=$user_id") . " " . - formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=edit&user_id=$user_id", "", "edit") . " " . - formatted_link("Delete", "javascript:del('".addslashes($user_row['user'])."', '{$user_row['id']}')", "", "delete") - ) - ); // end make_display_item(); - -} // end users - -make_checkbox_command("", 5, - array("text" => "Delete", "action" => "deletemulti", "prompt" => "Are you sure you want to delete the checked users?") -); // end make_checkbox_command -make_status_line("user", $user_count - 1); -?> - -
- - - -'; - - if ($action == "add") - { - $user_id = 0; - } - else - { - $user_id = $_REQUEST["user_id"]; - } // end if add or not - - $user_results = db_query("SELECT * FROM user WHERE id='$user_id'"); - $user_row = db_fetch_array($user_results); - - make_edit_table("Edit User"); - make_edit_text("User ID:", "user", "25", "50", $user_row["user"]); - make_edit_text("Full Name", "fullname", "25", "75", $user_row["fullname"]); - if (!$GLOBALS["netmrg"]["externalAuth"]) - { - make_edit_password("Password:", "pass", "25", "50", ""); - make_edit_password("Verify Password:", "vpass", "25", "50", ""); - } // end if not using external auth, show password form - make_edit_select_from_array("Permit Type:", "permit", $GLOBALS['PERMIT_TYPES'], $user_row["permit"], 'onChange="enableGroup(this.value)"'); - make_edit_select_from_table("Group:", "group_id", "groups", $user_row["group_id"], "", array(0 => "-Root-")); - make_edit_checkbox("Disabled", "disabled", $user_row["disabled"]); - make_edit_hidden("action", "doedit"); - make_edit_hidden("user_id", $user_id); - make_edit_submit_button(); - make_edit_end(); - -} // End editing screen - -end_page(); - -?> diff -Nurb netmrg-0.19/www/webfiles/view.php netmrg-0.20/ChangeLog/www/webfiles/view.php --- netmrg-0.19/www/webfiles/view.php 2006-01-11 03:24:57.000000000 +0530 +++ netmrg-0.20/ChangeLog/www/webfiles/view.php 1970-01-01 05:30:00.000000000 +0530 @@ -1,554 +0,0 @@ - $myr['object_type'] , "object_id" => $myr['object_id'] )); - } -} - -function ss_descendants($group) -{ - $q = db_query("SELECT id FROM groups WHERE parent_id = $group ORDER BY name"); - while ($r = db_fetch_array($q)) - { - ss_descendants($r['id']); - } - - $q = db_query(" SELECT dev.id AS id, count(view.id) AS view_items - FROM dev_parents dp - LEFT JOIN devices dev ON dp.dev_id=dev.id - LEFT JOIN view ON dev.id=view.object_id - WHERE grp_id = $group - AND object_type = 'device' - AND dev.disabled = 0 - GROUP BY dev.id - ORDER BY dev.name"); - while ($r = db_fetch_array($q)) - { - if ($r['view_items'] > 0) - array_push($_SESSION["netmrgsess"]["slideshow"]["views"], array( "object_type" => "device" , "object_id" => $r['id'])); - } -} - -function do_slideshow() -{ - if (isset($_REQUEST["type"])) - { - // we're just starting a slideshow, not in the middle of one. - - $_SESSION["netmrgsess"]["slideshow"]["views"] = array(); - $_SESSION["netmrgsess"]["slideshow"]["current"] = 0; - $_SESSION["netmrgsess"]["slideshow"]["type"] = $_REQUEST['type']; - - switch ($_REQUEST['type']) - { - case 0: ss_random_all(); break; - case 1: ss_descendants($_REQUEST['group_id']); break; - } - - header("Location: {$_SERVER['PHP_SELF']}?action=slideshow"); - exit(0); - } - - if (count($_SESSION["netmrgsess"]["slideshow"]["views"]) == 0) - { - begin_page("view.php", "Slide Show"); - echo("This slide show is empty."); - end_page(); - exit(0); - } - - if (isset($_REQUEST['jump'])) - { - $_SESSION["netmrgsess"]["slideshow"]["current"] = $_REQUEST['jump']; - } - - $GLOBALS["slideshow"] = true; - $_REQUEST['action'] = "view"; - $view = $_SESSION["netmrgsess"]["slideshow"]["views"][$_SESSION["netmrgsess"]["slideshow"]["current"]]; - $_REQUEST['object_type'] = $view['object_type']; - $_REQUEST['object_id'] = $view['object_id']; - $GLOBALS["slide_show_formatted_link"] = cond_formatted_link($_SESSION["netmrgsess"]["slideshow"]["current"] > 0, "Previous Slide", "{$_SERVER['PHP_SELF']}?action=slideshow&jump=" . ($_SESSION["netmrgsess"]["slideshow"]["current"] - 1)); - $_SESSION["netmrgsess"]["slideshow"]["current"]++; - - if ( count($_SESSION["netmrgsess"]["slideshow"]["views"]) == $_SESSION["netmrgsess"]["slideshow"]["current"]) - { - $_SESSION["netmrgsess"]["slideshow"]["current"] = 0; - $GLOBALS["slide_show_formatted_link"] .= formatted_link("Restart Slideshow", "{$_SERVER['PHP_SELF']}?action=slideshow"); - } - else - { - $GLOBALS["slide_show_formatted_link"] .= formatted_link("Next Slide", "{$_SERVER['PHP_SELF']}?action=slideshow"); - } - - ?> - - '."\n"; - echo "
"; - - if (isset($_REQUEST['hist'])) - $hist = "&hist={$_REQUEST['hist']}"; - - while ($row = db_fetch_array($view_result)) - { - switch ($row['type']) - { - case "graph": - echo ''."\n"; - echo ' '."\n"; - echo "
\n"; - break; - - case "template": - echo ''."\n"; - echo ' '."\n"; - echo "
\n"; - break; - - case "separator": - echo '
' . $row["separator_text"] . '
'."\n"; - break; - } // end switch row type - } // end while each row - - echo "
\n"; - echo ''."\n"; - - $histnum = 0; - foreach ($GLOBALS['TIMEFRAMES'] as $tf) - { - print(formatted_link($tf['name'], "{$_SERVER['PHP_SELF']}?action=view&object_type={$_REQUEST['object_type']}&object_id={$_REQUEST['object_id']}&hist=$histnum")); - $histnum++; - } - print("
"); - - if ($_SESSION["netmrgsess"]["permit"] > 1) - { - print(formatted_link("Edit", "{$_SERVER['PHP_SELF']}?action=list&object_type={$_REQUEST['object_type']}&object_id={$_REQUEST['object_id']}")); - } - - if ($GLOBALS["slideshow"]) - { - print($GLOBALS["slide_show_formatted_link"]); - } - - } - else - { - js_confirm_dialog("del", "Do you want to remove ", " from this view?", "{$_SERVER['PHP_SELF']}?action=dodelete&object_type={$_REQUEST['object_type']}&object_id={$_REQUEST['object_id']}&id="); - - js_checkbox_utils(); - - ?> -
" method="post" name="form"> - checkbox_toolbar()), - array("text" => "Item"), - array("text" => "Type") - ); // end make_display_table(); - - for ($i = 0; $i < $num; $i++) - { - $row = db_fetch_array($view_result); - - if ($i == 0) - { - $move_up = image_link_disabled("arrow_limit-up", "Move Top") . image_link_disabled("arrow-up", "Move Up"); - } - else - { - $move_up = image_link("arrow_limit-up", "Move Top", "{$_SERVER['PHP_SELF']}?action=move_top&object_id={$_REQUEST['object_id']}&object_type={$_REQUEST['object_type']}&id={$row['id']}") . image_link("arrow-up", "Move Up", "{$_SERVER['PHP_SELF']}?action=move_up&object_id={$_REQUEST['object_id']}&object_type={$_REQUEST['object_type']}&id={$row['id']}"); - } - - if ($i == ($num - 1)) - { - $move_down = image_link_disabled("arrow-down", "Move Down") . image_link_disabled("arrow_limit-down", "Move Bottom"); - } - else - { - $move_down = image_link("arrow-down", "Move Down", "{$_SERVER['PHP_SELF']}?action=move_down&object_id={$_REQUEST['object_id']}&object_type={$_REQUEST['object_type']}&id={$row['id']}") . image_link("arrow_limit-down", "Move Bottom", "{$_SERVER['PHP_SELF']}?action=move_bottom&object_id={$_REQUEST['object_id']}&object_type={$_REQUEST['object_type']}&id={$row['id']}"); - } - - switch ($row['type']) - { - case 'graph': - $name = $row['title']; - $extra_options = formatted_link("Edit Graph", "graph_items.php?graph_id={$row['graph_id']}"); - $type = "Graph"; - break; - - case 'template': - $name = expand_parameters($row['title'], $row['subdev_id']); - $extra_options = formatted_link("Edit Template", "graph_items.php?graph_id={$row['graph_id']}"); - $type = "Template (" . $row['name'] . ")"; - break; - - case 'separator': - $name = "" . $row['separator_text'] . ""; - $extra_options = ""; - $type = "Separator"; - break; - - default: - $extra_options = ""; - } - - make_display_item("editfield".($i%2), - array("checkboxname" => "viewitem", "checkboxid" => $row['id']), - array("text" => $name), - array("text" => $type), - array("text" => $move_up . " " . - $move_down . " " . - formatted_link("Edit", "{$_SERVER['PHP_SELF']}?id={$row['id']}&action=edit", "", "edit") . " " . - formatted_link("Delete","javascript:del('".str_replace('%', '', addslashes($name))."', '{$row['id']}')", "", "delete") . " " . - $extra_options) - ); // end make_display_item(); - } - make_checkbox_command("", 5, - array("text" => "Delete", "action" => "multidodelete", "prompt" => "Are you sure you want to delete the checked items?"), - array("text" => "Move Up", "action" => "move_up"), - array("text" => "Move Down", "action" => "move_down") - ); // end make_checkbox_command - make_status_line("{$_REQUEST["type"]} item", $i); - print("
"); - print(formatted_link("Done Editing", "{$_SERVER['PHP_SELF']}?action=view&object_type={$_REQUEST['object_type']}&object_id={$_REQUEST['object_id']}")); - - } - - end_page(); -} - -?>