Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 277427 | Differences between
and this patch

Collapse All | Expand All

(-)eventwatcher-0.4.3-orig/admin/acinclude.m4.in (-174 / +734 lines)
Lines 16-23 Link Here
16
16
17
dnl    You should have received a copy of the GNU Library General Public License
17
dnl    You should have received a copy of the GNU Library General Public License
18
dnl    along with this library; see the file COPYING.LIB.  If not, write to
18
dnl    along with this library; see the file COPYING.LIB.  If not, write to
19
dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20
dnl    Boston, MA 02111-1307, USA.
20
dnl    Boston, MA 02110-1301, USA.
21
21
22
dnl IMPORTANT NOTE:
22
dnl IMPORTANT NOTE:
23
dnl Please do not modify this file unless you expect your modifications to be
23
dnl Please do not modify this file unless you expect your modifications to be
Lines 96-102 Link Here
96
  # Don't add to $LIBS permanently.
96
  # Don't add to $LIBS permanently.
97
  ac_save_LIBS="$LIBS"
97
  ac_save_LIBS="$LIBS"
98
  LIBS="-l$x_direct_test_library $LIBS"
98
  LIBS="-l$x_direct_test_library $LIBS"
99
AC_TRY_LINK(, [${x_direct_test_function}()],
99
AC_TRY_LINK([#include <X11/Intrinsic.h>], [${x_direct_test_function}(1)],
100
[LIBS="$ac_save_LIBS"
100
[LIBS="$ac_save_LIBS"
101
# We can link X programs with no special library path.
101
# We can link X programs with no special library path.
102
ac_x_libraries=],
102
ac_x_libraries=],
Lines 561-588 Link Here
561
AC_DEFUN([KDE_SUBST_PROGRAMS],
561
AC_DEFUN([KDE_SUBST_PROGRAMS],
562
[
562
[
563
    AC_ARG_WITH(arts,
563
    AC_ARG_WITH(arts,
564
        AC_HELP_STRING([--without-arts],[build without aRts [default=yes]]),
564
        AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
565
        [build_arts=$withval],
565
        [build_arts=$withval],
566
        [build_arts=yes]
566
        [build_arts=yes]
567
    )
567
    )
568
    AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
568
    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
569
    if test "$build_arts" = "no"; then
570
        AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
571
    fi
569
572
570
        KDE_SET_DEFAULT_BINDIRS
573
        KDE_SET_DEFAULT_BINDIRS
571
        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
574
        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
572
        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
575
        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
573
        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
576
        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
574
        if test "$build_arts" != "no"; then
577
        if test "$build_arts" '!=' "no"; then
575
          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
578
          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
576
          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
579
          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
577
        fi
580
        fi
578
        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
581
        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
579
582
580
        kde32ornewer=1
583
        kde32ornewer=1
584
        kde33ornewer=1
581
        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
585
        if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
582
            kde32ornewer=
586
            kde32ornewer=
587
            kde33ornewer=
583
        else
588
        else
584
            if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
589
            if test "$kde_qtver" = "3"; then
590
              if test "$kde_qtsubver" -le 1; then
585
                kde32ornewer=
591
                kde32ornewer=
592
              fi
593
              if test "$kde_qtsubver" -le 2; then
594
                kde33ornewer=
595
              fi
596
              if test "$KDECONFIG" != "compiled"; then
597
                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
598
                  kde33ornewer=
599
                fi
600
              fi
586
            fi
601
            fi
587
        fi
602
        fi
588
603
Lines 590-598 Link Here
590
            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
605
            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
591
            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
606
            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
592
        fi
607
        fi
593
        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
608
        if test -n "$kde33ornewer"; then
609
            KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
610
            AC_SUBST(MAKEKDEWIDGETS)
611
        fi
612
        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
594
613
595
        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
614
        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
596
 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
615
 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
597
            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
616
            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
598
            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
617
            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
Lines 759-768 Link Here
759
   # darwin requires a poll emulation library
778
   # darwin requires a poll emulation library
760
   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
779
   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
761
780
781
   # for some image handling on Mac OS X
782
   AC_CHECK_HEADERS(Carbon/Carbon.h)
783
762
   # CoreAudio framework
784
   # CoreAudio framework
763
   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
785
   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
764
     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
786
     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
765
     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
787
     FRAMEWORK_COREAUDIO="-Wl,-framework,CoreAudio"
766
   ])
788
   ])
767
789
768
   AC_CHECK_RES_INIT
790
   AC_CHECK_RES_INIT
Lines 786-791 Link Here
786
   KDE_CHECK_TYPES
808
   KDE_CHECK_TYPES
787
   KDE_CHECK_LIBDL
809
   KDE_CHECK_LIBDL
788
   KDE_CHECK_STRLCPY
810
   KDE_CHECK_STRLCPY
811
   KDE_CHECK_PIE_SUPPORT
789
812
790
# darwin needs this to initialize the environment
813
# darwin needs this to initialize the environment
791
AC_CHECK_HEADERS(crt_externs.h)
814
AC_CHECK_HEADERS(crt_externs.h)
Lines 870-875 Link Here
870
  kde_use_qt_mac=no
893
  kde_use_qt_mac=no
871
)
894
)
872
895
896
# used to disable x11-specific stuff on special platforms
897
AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
898
873
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
899
if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
874
900
875
AC_MSG_CHECKING(for X)
901
AC_MSG_CHECKING(for X)
Lines 957-963 Link Here
957
  X_INCLUDES="-I$x_includes"
983
  X_INCLUDES="-I$x_includes"
958
fi
984
fi
959
985
960
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
986
if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
961
  X_LDFLAGS=""
987
  X_LDFLAGS=""
962
  x_libraries="/usr/lib"; dnl better than nothing :-
988
  x_libraries="/usr/lib"; dnl better than nothing :-
963
 else
989
 else
Lines 965-971 Link Here
965
  X_LDFLAGS="-L$x_libraries"
991
  X_LDFLAGS="-L$x_libraries"
966
fi
992
fi
967
all_includes="$X_INCLUDES"
993
all_includes="$X_INCLUDES"
968
all_libraries="$X_LDFLAGS"
994
all_libraries="$X_LDFLAGS $LDFLAGS_AS_NEEDED $LDFLAGS_NEW_DTAGS"
969
995
970
# Check for libraries that X11R6 Xt/Xaw programs need.
996
# Check for libraries that X11R6 Xt/Xaw programs need.
971
ac_save_LDFLAGS="$LDFLAGS"
997
ac_save_LDFLAGS="$LDFLAGS"
Lines 1127-1135 Link Here
1127
AC_DEFUN([KDE_USE_QT],
1153
AC_DEFUN([KDE_USE_QT],
1128
[
1154
[
1129
if test -z "$1"; then
1155
if test -z "$1"; then
1130
  # Current default Qt version: 3.2
1156
  # Current default Qt version: 3.3
1131
  kde_qtver=3
1157
  kde_qtver=3
1132
  kde_qtsubver=2
1158
  kde_qtsubver=3
1133
else
1159
else
1134
  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
1160
  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
1135
  # following is the check if subversion isnt found in passed argument
1161
  # following is the check if subversion isnt found in passed argument
Lines 1153-1164 Link Here
1153
  if test "$kde_qtver" = "3"; then
1179
  if test "$kde_qtver" = "3"; then
1154
    if test $kde_qtsubver -gt 0; then
1180
    if test $kde_qtsubver -gt 0; then
1155
	 if test $kde_qtsubver -gt 1; then
1181
	 if test $kde_qtsubver -gt 1; then
1156
	    kde_qt_minversion=">= Qt 3.2"
1182
	    if test $kde_qtsubver -gt 2; then
1183
		kde_qt_minversion=">= Qt 3.3 and < 4.0"
1184
	    else
1185
	        kde_qt_minversion=">= Qt 3.2 and < 4.0"
1186
	    fi
1157
	 else
1187
	 else
1158
            kde_qt_minversion=">= Qt 3.1 (20021021)"
1188
            kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
1159
         fi
1189
         fi
1160
    else
1190
    else
1161
      kde_qt_minversion=">= Qt 3.0"
1191
      kde_qt_minversion=">= Qt 3.0 and < 4.0"
1162
    fi
1192
    fi
1163
  fi
1193
  fi
1164
  if test "$kde_qtver" = "1"; then
1194
  if test "$kde_qtver" = "1"; then
Lines 1171-1181 Link Here
1171
if test -z "$3"; then
1201
if test -z "$3"; then
1172
   if test $kde_qtver = 3; then
1202
   if test $kde_qtver = 3; then
1173
     if test $kde_qtsubver -gt 0; then
1203
     if test $kde_qtsubver -gt 0; then
1174
       kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
1204
       kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
1175
       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
1205
       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
1176
       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
1206
       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
1177
     else
1207
     else
1178
       kde_qt_verstring="QT_VERSION >= 300"
1208
       kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
1179
     fi
1209
     fi
1180
   fi
1210
   fi
1181
   if test $kde_qtver = 2; then
1211
   if test $kde_qtver = 2; then
Lines 1192-1199 Link Here
1192
   kde_qt_verstring="$3"
1222
   kde_qt_verstring="$3"
1193
fi
1223
fi
1194
1224
1225
if test $kde_qtver = 4; then
1226
  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1227
fi
1195
if test $kde_qtver = 3; then
1228
if test $kde_qtver = 3; then
1196
  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
1229
  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3"
1230
  if test -z "$PKG_CONFIG"; then
1231
      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1232
  fi
1233
  if test "$PKG_CONFIG" != "no" ; then
1234
    if $PKG_CONFIG --exists qt-mt ; then
1235
       kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
1236
    fi
1237
  fi
1197
fi
1238
fi
1198
if test $kde_qtver = 2; then
1239
if test $kde_qtver = 2; then
1199
   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
1240
   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
Lines 1323-1344 Link Here
1323
  fi
1364
  fi
1324
fi
1365
fi
1325
1366
1326
if test -z "$LIBQT"; then
1327
dnl ------------------------------------------------------------
1367
dnl ------------------------------------------------------------
1328
dnl If we got --enable-embedded then adjust the Qt library name.
1368
dnl If we got --enable-embedded then adjust the Qt library name.
1329
dnl ------------------------------------------------------------
1369
dnl ------------------------------------------------------------
1330
  if test "x$kde_use_qt_emb" = "xyes"; then
1370
if test "x$kde_use_qt_emb" = "xyes"; then
1331
    qtlib="qte"
1371
  qtlib="qte"
1332
  else
1333
    qtlib="qt"
1334
  fi
1335
1336
  kde_int_qt="-l$qtlib"
1337
else
1372
else
1338
  kde_int_qt="$LIBQT"
1373
  qtlib="qt"
1339
  kde_lib_qt_set=yes
1340
fi
1374
fi
1341
1375
1376
kde_int_qt="-l$qtlib"
1377
1342
if test -z "$LIBQPE"; then
1378
if test -z "$LIBQPE"; then
1343
dnl ------------------------------------------------------------
1379
dnl ------------------------------------------------------------
1344
dnl If we got --enable-palmtop then add -lqpe to the link line
1380
dnl If we got --enable-palmtop then add -lqpe to the link line
Lines 1359-1371 Link Here
1359
dnl ------------------------------------------------------------------------
1395
dnl ------------------------------------------------------------------------
1360
1396
1361
if test "x$kde_use_qt_mt" = "xyes"; then
1397
if test "x$kde_use_qt_mt" = "xyes"; then
1362
  if test -z "$LIBQT"; then
1398
  LIBQT="-l$qtlib-mt"
1363
    LIBQT="-l$qtlib-mt"
1399
  kde_int_qt="-l$qtlib-mt"
1364
    kde_int_qt="-l$qtlib-mt"
1365
  else
1366
    LIBQT="$qtlib-mt"
1367
    kde_int_qt="$qtlib-mt"
1368
  fi
1369
  LIBQT_GLOB="lib$qtlib-mt.*"
1400
  LIBQT_GLOB="lib$qtlib-mt.*"
1370
  USING_QT_MT="using -mt"
1401
  USING_QT_MT="using -mt"
1371
else
1402
else
Lines 1420-1425 Link Here
1420
for dir in $kde_qt_dirs; do
1451
for dir in $kde_qt_dirs; do
1421
   qt_incdirs="$qt_incdirs $dir/include $dir"
1452
   qt_incdirs="$qt_incdirs $dir/include $dir"
1422
done
1453
done
1454
if test -z "$PKG_CONFIG"; then
1455
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1456
fi
1457
if test "$PKG_CONFIG" != "no" ; then
1458
  if $PKG_CONFIG --exists qt-mt ; then
1459
      qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
1460
  fi
1461
fi
1423
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
1462
qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
1424
if test ! "$ac_qt_includes" = "NO"; then
1463
if test ! "$ac_qt_includes" = "NO"; then
1425
   qt_incdirs="$ac_qt_includes $qt_incdirs"
1464
   qt_incdirs="$ac_qt_includes $qt_incdirs"
Lines 1436-1443 Link Here
1436
1475
1437
qt_libdirs=""
1476
qt_libdirs=""
1438
for dir in $kde_qt_dirs; do
1477
for dir in $kde_qt_dirs; do
1439
   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
1478
   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir"
1440
done
1479
done
1480
if test -z "$PKG_CONFIG"; then
1481
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
1482
fi
1483
if test "$PKG_CONFIG" != "no" ; then
1484
  if $PKG_CONFIG --exists qt-mt ; then
1485
      qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
1486
  fi
1487
fi
1441
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1488
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
1442
if test ! "$ac_qt_libraries" = "NO"; then
1489
if test ! "$ac_qt_libraries" = "NO"; then
1443
  qt_libdir=$ac_qt_libraries
1490
  qt_libdir=$ac_qt_libraries
Lines 1543-1549 Link Here
1543
 QT_LDFLAGS=""
1590
 QT_LDFLAGS=""
1544
else
1591
else
1545
 QT_LDFLAGS="-L$qt_libraries"
1592
 QT_LDFLAGS="-L$qt_libraries"
1546
 all_libraries="$all_libraries $QT_LDFLAGS"
1593
 all_libraries="$QT_LDFLAGS $all_libraries"
1547
fi
1594
fi
1548
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
1595
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
1549
1596
Lines 1620-1626 Link Here
1620
1667
1621
AC_MSG_RESULT([$kde_cv_uic_plugins])
1668
AC_MSG_RESULT([$kde_cv_uic_plugins])
1622
if test "$kde_cv_uic_plugins" != yes; then
1669
if test "$kde_cv_uic_plugins" != yes; then
1623
	AC_MSG_ERROR([you need to install kdelibs first.])
1670
	AC_MSG_ERROR([
1671
you need to install kdelibs first.
1672
1673
If you did install kdelibs, then the Qt version that is picked up by
1674
this configure is not the same version you used to compile kdelibs. 
1675
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
1676
_same Qt version_, compiled with the _same compiler_ and the same Qt
1677
configuration settings.
1678
])
1624
fi
1679
fi
1625
fi
1680
fi
1626
])
1681
])
Lines 1673-1678 Link Here
1673
  AC_SUBST(KDE_NO_UNDEFINED)
1728
  AC_SUBST(KDE_NO_UNDEFINED)
1674
])
1729
])
1675
1730
1731
dnl Check if the linker supports --enable-new-dtags and --as-needed
1732
AC_DEFUN([KDE_CHECK_NEW_LDFLAGS],
1733
[
1734
  AC_ARG_ENABLE(new_ldflags,
1735
		AC_HELP_STRING([--enable-new-ldflags],
1736
		[enable the new linker flags]),
1737
	kde_use_new_ldflags=$enableval, 
1738
	kde_use_new_ldflags=no)
1739
1740
  LDFLAGS_AS_NEEDED=""
1741
  LDFLAGS_NEW_DTAGS=""
1742
  if test "x$kde_use_new_ldflags" = "xyes"; then
1743
       LDFLAGS_NEW_DTAGS=""
1744
       KDE_CHECK_COMPILER_FLAG([Wl,--enable-new-dtags],
1745
		[LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"],)
1746
1747
       KDE_CHECK_COMPILER_FLAG([Wl,--as-needed],
1748
		[LDFLAGS_AS_NEEDED="-Wl,--as-needed"],)
1749
  fi
1750
  AC_SUBST(LDFLAGS_AS_NEEDED)
1751
  AC_SUBST(LDFLAGS_NEW_DTAGS)
1752
])
1753
1676
AC_DEFUN([KDE_CHECK_NMCHECK],
1754
AC_DEFUN([KDE_CHECK_NMCHECK],
1677
[
1755
[
1678
  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
1756
  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
Lines 1833-1839 Link Here
1833
 
1911
 
1834
KDE_LDFLAGS="-L$kde_libraries"
1912
KDE_LDFLAGS="-L$kde_libraries"
1835
if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
1913
if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
1836
 all_libraries="$all_libraries $KDE_LDFLAGS"
1914
 all_libraries="$KDE_LDFLAGS $all_libraries"
1837
fi
1915
fi
1838
1916
1839
AC_SUBST(KDE_LDFLAGS)
1917
AC_SUBST(KDE_LDFLAGS)
Lines 2009-2017 Link Here
2009
   AC_REQUIRE([K_PATH_X])
2087
   AC_REQUIRE([K_PATH_X])
2010
2088
2011
if test $kde_qtver = 3; then
2089
if test $kde_qtver = 3; then
2090
   case $host in 
2091
               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2092
               *) lib_kded="" ;;
2093
       esac
2094
   AC_SUBST(LIB_KDED, $lib_kded)
2012
   AC_SUBST(LIB_KDECORE, "-lkdecore")
2095
   AC_SUBST(LIB_KDECORE, "-lkdecore")
2013
   AC_SUBST(LIB_KDEUI, "-lkdeui")
2096
   AC_SUBST(LIB_KDEUI, "-lkdeui")
2014
   AC_SUBST(LIB_KIO, "-lkio")
2097
   AC_SUBST(LIB_KIO, "-lkio")
2098
   AC_SUBST(LIB_KJS, "-lkjs")
2015
   AC_SUBST(LIB_SMB, "-lsmb")
2099
   AC_SUBST(LIB_SMB, "-lsmb")
2016
   AC_SUBST(LIB_KAB, "-lkab")
2100
   AC_SUBST(LIB_KAB, "-lkab")
2017
   AC_SUBST(LIB_KABC, "-lkabc")
2101
   AC_SUBST(LIB_KABC, "-lkabc")
Lines 2021-2026 Link Here
2021
   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2105
   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2022
   AC_SUBST(LIB_KUTILS, "-lkutils")
2106
   AC_SUBST(LIB_KUTILS, "-lkutils")
2023
   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2107
   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2108
   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2109
   AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2110
   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2111
   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2024
# these are for backward compatibility
2112
# these are for backward compatibility
2025
   AC_SUBST(LIB_KSYCOCA, "-lkio")
2113
   AC_SUBST(LIB_KSYCOCA, "-lkio")
2026
   AC_SUBST(LIB_KFILE, "-lkio")
2114
   AC_SUBST(LIB_KFILE, "-lkio")
Lines 2274-2279 Link Here
2274
	[MKSTEMPS])
2362
	[MKSTEMPS])
2275
])
2363
])
2276
2364
2365
AC_DEFUN([AC_CHECK_MKSTEMP],
2366
[
2367
	KDE_CHECK_FUNC_EXT(mkstemp, [
2368
#include <stdlib.h>
2369
#include <unistd.h>
2370
],
2371
	[
2372
mkstemp("/tmp/aaaXXXXXX");
2373
],
2374
	[int mkstemp(char *)],
2375
	[MKSTEMP])
2376
])
2377
2277
AC_DEFUN([AC_CHECK_MKDTEMP],
2378
AC_DEFUN([AC_CHECK_MKDTEMP],
2278
[
2379
[
2279
	KDE_CHECK_FUNC_EXT(mkdtemp, [
2380
	KDE_CHECK_FUNC_EXT(mkdtemp, [
Lines 2313-2335 Link Here
2313
  LIBS=$kde_libs_safe
2414
  LIBS=$kde_libs_safe
2314
  AC_SUBST(LIBRESOLV)
2415
  AC_SUBST(LIBRESOLV)
2315
2416
2316
  AC_MSG_CHECKING([if res_init is available])
2417
  KDE_CHECK_FUNC_EXT(res_init,
2317
  AC_TRY_COMPILE(
2318
    [
2418
    [
2319
#include <sys/types.h>
2419
#include <sys/types.h>
2320
#include <netinet/in.h>
2420
#include <netinet/in.h>
2321
#include <arpa/nameser.h>
2421
#include <arpa/nameser.h>
2322
#include <resolv.h>
2422
#include <resolv.h>
2323
    ],
2423
    ],
2324
    [
2424
    [res_init()],
2325
      res_init();
2425
    [int res_init(void)],
2326
    ],
2426
    [RES_INIT])
2327
    [
2328
      AC_MSG_RESULT(yes)
2329
      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
2330
    ],
2331
    [ AC_MSG_RESULT(no) ]
2332
  )
2333
])
2427
])
2334
2428
2335
AC_DEFUN([AC_CHECK_STRLCPY],
2429
AC_DEFUN([AC_CHECK_STRLCPY],
Lines 2357-2362 Link Here
2357
	[STRLCAT])
2451
	[STRLCAT])
2358
])
2452
])
2359
2453
2454
AC_DEFUN([AC_CHECK_RES_QUERY],
2455
[
2456
	KDE_CHECK_FUNC_EXT(res_query, [
2457
#include <sys/types.h>
2458
#include <netinet/in.h>
2459
#include <arpa/nameser.h>
2460
#include <resolv.h>
2461
#include <netdb.h>
2462
],
2463
[
2464
res_query(NULL, 0, 0, NULL, 0);
2465
],
2466
	[int res_query(const char *, int, int, unsigned char *, int)],
2467
	[RES_QUERY])
2468
])
2469
2470
AC_DEFUN([AC_CHECK_DN_SKIPNAME],
2471
[
2472
	KDE_CHECK_FUNC_EXT(dn_skipname, [
2473
#include <sys/types.h>
2474
#include <netinet/in.h>
2475
#include <arpa/nameser.h>
2476
#include <resolv.h>
2477
],
2478
[
2479
dn_skipname (NULL, NULL);
2480
],
2481
	[int dn_skipname (unsigned char *, unsigned char *)],
2482
	[DN_SKIPNAME])
2483
])
2484
2485
2360
AC_DEFUN([AC_FIND_GIF],
2486
AC_DEFUN([AC_FIND_GIF],
2361
   [AC_MSG_CHECKING([for giflib])
2487
   [AC_MSG_CHECKING([for giflib])
2362
AC_CACHE_VAL(ac_cv_lib_gif,
2488
AC_CACHE_VAL(ac_cv_lib_gif,
Lines 2401-2422 Link Here
2401
ac_save_CFLAGS="$CFLAGS"
2527
ac_save_CFLAGS="$CFLAGS"
2402
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
2528
CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
2403
AC_TRY_LINK(
2529
AC_TRY_LINK(
2404
[/* Override any gcc2 internal prototype to avoid an error.  */
2530
[
2405
struct jpeg_decompress_struct;
2406
typedef struct jpeg_decompress_struct * j_decompress_ptr;
2407
typedef int size_t;
2408
#ifdef __cplusplus
2531
#ifdef __cplusplus
2409
extern "C" {
2532
extern "C" {
2410
#endif
2533
#endif
2411
    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
2534
void jpeg_CreateDecompress();
2412
                                    int version, size_t structsize);
2413
#ifdef __cplusplus
2535
#ifdef __cplusplus
2414
}
2536
}
2415
#endif
2537
#endif
2416
/* We use char because int might match the return type of a gcc2
2417
    builtin and then its argument prototype would still apply.  */
2418
],
2538
],
2419
            [jpeg_CreateDecompress(0L, 0, 0);],
2539
[jpeg_CreateDecompress();],
2420
            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
2540
            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
2421
            eval "ac_cv_lib_jpeg_$1=no")
2541
            eval "ac_cv_lib_jpeg_$1=no")
2422
LIBS="$ac_save_LIBS"
2542
LIBS="$ac_save_LIBS"
Lines 2535-2540 Link Here
2535
AC_TRY_LINK(dnl
2655
AC_TRY_LINK(dnl
2536
[
2656
[
2537
#include<zlib.h>
2657
#include<zlib.h>
2658
#include<string.h>
2538
],
2659
],
2539
[
2660
[
2540
  char buf[42];
2661
  char buf[42];
Lines 2542-2548 Link Here
2542
  /* this would segfault.. but we only link, don't run */
2663
  /* this would segfault.. but we only link, don't run */
2543
  (void) gzgets(f, buf, sizeof(buf));
2664
  (void) gzgets(f, buf, sizeof(buf));
2544
2665
2545
  return (zlibVersion() == ZLIB_VERSION); 
2666
  return (strcmp(zlibVersion(), ZLIB_VERSION) == 0);
2546
],
2667
],
2547
            eval "ac_cv_lib_z='-lz'",
2668
            eval "ac_cv_lib_z='-lz'",
2548
            eval "ac_cv_lib_z=no")
2669
            eval "ac_cv_lib_z=no")
Lines 2623-2628 Link Here
2623
AC_SUBST(LIBTIFF)
2744
AC_SUBST(LIBTIFF)
2624
])
2745
])
2625
2746
2747
AC_DEFUN([KDE_FIND_LIBEXR],
2748
[
2749
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
2750
AC_REQUIRE([AC_FIND_ZLIB])
2751
AC_CACHE_VAL(ac_cv_libexr,
2752
[
2753
  if test -z "$PKG_CONFIG"; then
2754
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
2755
  fi
2756
2757
  AC_MSG_CHECKING([for OpenEXR libraries])
2758
2759
  if test "$PKG_CONFIG" = "no" ; then
2760
     AC_MSG_RESULT(no)
2761
     echo "*** The pkg-config script could not be found. Make sure it is"
2762
     echo "*** in your path, or set the PKG_CONFIG environment variable"
2763
     echo "*** to the full path to pkg-config."
2764
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
2765
  else
2766
     if ! $PKG_CONFIG --exists OpenEXR ; then
2767
        AC_MSG_RESULT(no)
2768
        EXRSTATUS=no
2769
     else
2770
        if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then
2771
           AC_MSG_RESULT(no)
2772
           EXRSTATUS=old
2773
        else
2774
           kde_save_LIBS="$LIBS"
2775
           LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs OpenEXR` $LIBZ"
2776
           AC_LANG_SAVE
2777
           AC_LANG_CPLUSPLUS
2778
           kde_save_CXXFLAGS="$CXXFLAGS"
2779
           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
2780
           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
2781
2782
           AC_TRY_LINK(dnl
2783
               [
2784
               #include <ImfRgbaFile.h>
2785
               ],
2786
               [
2787
               using namespace Imf;
2788
               RgbaInputFile file ("dummy");
2789
               return 0;
2790
               ],
2791
               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
2792
               eval "ac_cv_libexr=no"
2793
           )
2794
           LIBS="$kde_save_LIBS"
2795
           CXXFLAGS="$kde_save_CXXFLAGS"
2796
           AC_LANG_RESTORE
2797
           ])dnl
2798
           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
2799
               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
2800
               LIB_EXR="$ac_cv_libexr"
2801
               AC_MSG_RESULT($ac_cv_libexr)
2802
           else
2803
               AC_MSG_RESULT(no)
2804
               LIB_EXR=""
2805
           fi
2806
        fi
2807
     fi
2808
  fi
2809
  AC_SUBST(LIB_EXR)
2810
  AC_SUBST(EXR_FLAGS)
2811
])
2812
2813
2626
2814
2627
AC_DEFUN([AC_FIND_PNG],
2815
AC_DEFUN([AC_FIND_PNG],
2628
[
2816
[
Lines 2811-2816 Link Here
2811
  fi
2999
  fi
2812
])
3000
])
2813
3001
3002
3003
AC_DEFUN([KDE_CHECK_FOR_BAD_COMPILER],
3004
[
3005
  AC_MSG_CHECKING([whether $CC is blacklisted])
3006
3007
  dnl In theory we have tu run this test against $CC and $CXX
3008
  dnl in C and in C++ mode, because its perfectly legal for
3009
  dnl the user to mix compiler versions, since C has a defined
3010
  dnl ABI. 
3011
  dnl 
3012
  dnl For now, we assume the user is not on crack.
3013
3014
  AC_TRY_COMPILE([
3015
#ifdef __GNUC__
3016
#if __GNUC__ == 4 && __GNUC_MINOR__ == 0 && __GNUC_PATCHLEVEL__ == 0
3017
choke me
3018
#endif
3019
#endif
3020
], ,
3021
  kde_bad_compiler=no, 
3022
  kde_bad_compiler=yes
3023
)
3024
3025
  AC_MSG_RESULT($kde_bad_compiler)
3026
3027
if test "$kde_bad_compiler" = "yes"; then
3028
  AC_MSG_ERROR([
3029
3030
This particular compiler version is blacklisted because it
3031
is known to miscompile KDE. Please use a newer version, or
3032
if that is not yet available, choose an older version. 
3033
3034
Please do not report a bug or bother us reporting this
3035
configure error. We know about it, and we introduced
3036
it by intention to avoid untraceable bugs or crashes in KDE.
3037
3038
])
3039
fi
3040
3041
])
3042
3043
3044
AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
3045
[
3046
  AC_CACHE_CHECK([whether system headers can cope with -O2 -fno-inline],
3047
    kde_cv_opt_noinline_match,
3048
  [
3049
  kde_cv_opt_noinline_match=irrelevant
3050
  dnl if we don't use both -O2 and -fno-inline, this check is moot
3051
  if echo "$CFLAGS" | grep -e -O2 >/dev/null 2>/dev/null \
3052
     && echo "$CFLAGS" | grep -e -fno-inline >/dev/null 2>/dev/null ; then
3053
3054
    ac_cflags_save="$CFLAGS"
3055
    CFLAGS="$CFLAGS -D_USE_GNU"
3056
3057
    AC_TRY_LINK([
3058
  #include <string.h>
3059
], [  const char *pt, *et;
3060
  et = __extension__      ({ char __a0, __a1, __a2;       (__builtin_constant_p (  ";,"  ) && ((size_t)(const void *)((   ";,"   )+ 1) - (size_t)(const void *)(   ";,"   ) == 1)        ? ((__a0 =((__const char  *) (  ";,"  ))[0], __a0 == '\0')     ? ((void) (  pt ),((void *)0) )        : ((__a1 = ((__const char *) (  ";,"  ))[1], __a1== '\0')      ? (__extension__ (__builtin_constant_p (  __a0 ) && ( __a0 ) == '\0'   ? (char *) __rawmemchr (   pt  ,   __a0)       : strchr(   pt  ,   __a0 )))   : ((__a2 = ((__const char *) (  ";,"  ))[2], __a2 == '\0')      ? __strpbrk_c2 (  pt , __a0, __a1)      :(((__const char *) (  ";,"  ))[3] == '\0'     ? __strpbrk_c3 (  pt ,__a0, __a1, __a2): strpbrk (  pt ,   ";,"  ))))) : strpbrk (  pt ,  ";,"  )); }) ;
3061
],
3062
    kde_cv_opt_noinline_match=yes,
3063
    kde_cv_opt_noinline_match=no
3064
    )
3065
3066
    CFLAGS="$ac_cflags_save"
3067
  fi
3068
  ])
3069
])
3070
3071
2814
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
3072
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
2815
AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
3073
AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
2816
[dnl
3074
[dnl
Lines 2864-2870 Link Here
2864
    fi
3122
    fi
2865
   ], [kde_use_strict_options="no"])
3123
   ], [kde_use_strict_options="no"])
2866
3124
2867
  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similiar]),
3125
  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similar]),
2868
   [
3126
   [
2869
    if test $enableval = "no"; then
3127
    if test $enableval = "no"; then
2870
         kde_use_warnings="no"
3128
         kde_use_warnings="no"
Lines 2895-2901 Link Here
2895
      if test $kde_use_debug_code = "full"; then
3153
      if test $kde_use_debug_code = "full"; then
2896
        CFLAGS="-g3 -fno-inline $CFLAGS"
3154
        CFLAGS="-g3 -fno-inline $CFLAGS"
2897
      else
3155
      else
2898
        CFLAGS="-g -O2 $CFLAGS"
3156
        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
2899
      fi
3157
      fi
2900
    else
3158
    else
2901
      CFLAGS="-O2 $CFLAGS"
3159
      CFLAGS="-O2 $CFLAGS"
Lines 2920-2925 Link Here
2920
3178
2921
  AC_PROG_CXX
3179
  AC_PROG_CXX
2922
3180
3181
  KDE_CHECK_FOR_BAD_COMPILER
3182
2923
  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
3183
  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
2924
    if test "$kde_use_debug_code" != "no"; then
3184
    if test "$kde_use_debug_code" != "no"; then
2925
      if test "$CXX" = "KCC"; then
3185
      if test "$CXX" = "KCC"; then
Lines 2928-2934 Link Here
2928
        if test "$kde_use_debug_code" = "full"; then
3188
        if test "$kde_use_debug_code" = "full"; then
2929
          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
3189
          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
2930
        else
3190
        else
2931
          CXXFLAGS="-g -O2 $CXXFLAGS"
3191
          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
2932
        fi
3192
        fi
2933
      fi
3193
      fi
2934
      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
3194
      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
Lines 2941-2947 Link Here
2941
        CXXFLAGS="+K3 $CXXFLAGS"
3201
        CXXFLAGS="+K3 $CXXFLAGS"
2942
      else
3202
      else
2943
        CXXFLAGS="-O2 $CXXFLAGS"
3203
        CXXFLAGS="-O2 $CXXFLAGS"
2944
      fi  
3204
      fi
2945
    fi
3205
    fi
2946
  fi
3206
  fi
2947
3207
Lines 2959-3002 Link Here
2959
3219
2960
  if test "$kde_use_warnings" = "yes"; then
3220
  if test "$kde_use_warnings" = "yes"; then
2961
      if test "$GCC" = "yes"; then
3221
      if test "$GCC" = "yes"; then
2962
        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
3222
        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
2963
        case $host in
3223
        case $host in
2964
          *-*-linux-gnu)	
3224
          *-*-linux-gnu)	
2965
            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
3225
            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
2966
            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
3226
            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
2967
            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
3227
            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
2968
            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
3228
            KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
2969
          ;;
3229
          ;;
2970
        esac
3230
        esac
2971
        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
3231
        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
2972
        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
3232
        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
2973
        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
3233
        dnl ### FIXME: revert for KDE 4
3234
        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
2974
     fi
3235
     fi
2975
  fi
3236
  fi
2976
3237
2977
  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
3238
  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
2978
    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
3239
    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
2979
  fi
3240
  fi
2980
    
3241
3242
  AC_ARG_ENABLE(pch,
3243
     AC_HELP_STRING([--enable-pch],
3244
                    [enables precompiled header support (currently only KCC or gcc >=3.4+unsermake) [default=no]]),
3245
    [ kde_use_pch=$enableval ],[ kde_use_pch=no ])
3246
 
3247
  HAVE_GCC_VISIBILITY=0
3248
  AC_SUBST([HAVE_GCC_VISIBILITY])
3249
2981
  if test "$GXX" = "yes"; then
3250
  if test "$GXX" = "yes"; then
3251
    gcc_no_reorder_blocks=NO
3252
    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
3253
    if test $kde_use_debug_code != "no" && \
3254
       test $kde_use_debug_code != "full" && \
3255
       test "YES" = "$gcc_no_reorder_blocks" ; then
3256
          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
3257
          CFLAGS="$CFLAGS -fno-reorder-blocks"
3258
    fi
2982
    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
3259
    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
2983
    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
3260
    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
2984
    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
3261
    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
2985
    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
3262
    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
3263
    ENABLE_PERMISSIVE_FLAG="-fpermissive"
3264
3265
    if test "$kde_use_pch" = "yes"; then
3266
        AC_MSG_CHECKING(whether gcc supports precompiling c header files)
3267
        echo >conftest.h
3268
        if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
3269
            kde_gcc_supports_pch=yes
3270
            AC_MSG_RESULT(yes)
3271
        else
3272
            kde_gcc_supports_pch=no
3273
            AC_MSG_RESULT(no)
3274
        fi
3275
        if test "$kde_gcc_supports_pch" = "yes"; then
3276
            AC_MSG_CHECKING(whether gcc supports precompiling c++ header files)
3277
            if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
3278
                kde_gcc_supports_pch=yes
3279
                AC_MSG_RESULT(yes)
3280
            else
3281
                kde_gcc_supports_pch=no
3282
                AC_MSG_RESULT(no)
3283
            fi
3284
        fi
3285
        rm -f conftest.h conftest.h.gch
3286
    fi
3287
3288
    KDE_CHECK_FOR_OPT_NOINLINE_MATCH
3289
    if test "x$kde_cv_opt_noinline_match" = "xno" ; then
3290
       CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
3291
    fi
2986
  fi
3292
  fi
3293
  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
2987
  if test "$CXX" = "KCC"; then
3294
  if test "$CXX" = "KCC"; then
2988
    dnl unfortunately we currently cannot disable exception support in KCC
3295
    dnl unfortunately we currently cannot disable exception support in KCC
2989
    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
3296
    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
2990
    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
3297
    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
2991
    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
3298
    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
2992
3299
2993
    AC_ARG_ENABLE(pch,
2994
	AC_HELP_STRING([--enable-pch],
2995
		       [enables precompiled header support (currently only KCC) [default=no]]),
2996
    [
2997
      kde_use_pch=$enableval
2998
    ],[kde_use_pch=no])
2999
 
3000
    if test "$kde_use_pch" = "yes"; then
3300
    if test "$kde_use_pch" = "yes"; then
3001
      dnl TODO: support --pch-dir!
3301
      dnl TODO: support --pch-dir!
3002
      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
3302
      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
Lines 3051-3059 Link Here
3051
  fi
3351
  fi
3052
  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
3352
  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
3053
3353
3354
  AC_ARG_ENABLE(coverage,
3355
    AC_HELP_STRING([--enable-coverage],[use gcc coverage testing]), [
3356
      if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
3357
        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
3358
        ac_coverage_linker="-lgcc"
3359
      elif test "$am_cv_CC_dependencies_compiler_type" = "gcc"; then
3360
        ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
3361
        ac_coverage_linker=""
3362
      else
3363
        AC_MSG_ERROR([coverage with your compiler is not supported])
3364
      fi
3365
      CFLAGS="$CFLAGS $ac_coverage_compiler"
3366
      CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
3367
      LDFLAGS="$LDFLAGS $ac_coverage_linker"
3368
    ])
3369
3054
  AC_SUBST(NOOPT_CXXFLAGS)
3370
  AC_SUBST(NOOPT_CXXFLAGS)
3055
  AC_SUBST(NOOPT_CFLAGS)
3371
  AC_SUBST(NOOPT_CFLAGS)
3372
  AC_SUBST(ENABLE_PERMISSIVE_FLAG)
3056
3373
3374
  KDE_CHECK_NEW_LDFLAGS
3057
  KDE_CHECK_FINAL
3375
  KDE_CHECK_FINAL
3058
  KDE_CHECK_CLOSURE
3376
  KDE_CHECK_CLOSURE
3059
  KDE_CHECK_NMCHECK
3377
  KDE_CHECK_NMCHECK
Lines 3061-3066 Link Here
3061
  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
3379
  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
3062
])
3380
])
3063
3381
3382
AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
3383
  [
3384
    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
3385
      [
3386
        AC_LANG_SAVE
3387
        AC_LANG_CPLUSPLUS
3388
3389
        safe_CXXFLAGS=$CXXFLAGS
3390
        safe_LDFLAGS=$LDFLAGS
3391
        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
3392
        LDFLAGS="$LDFLAGS -shared -fPIC"
3393
3394
        AC_TRY_LINK(
3395
        [
3396
          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
3397
	  #include <string>
3398
          int some_function( void ) __attribute__ ((visibility("default")));
3399
          int some_function( void )
3400
          {
3401
	    std::string s("blafasel");
3402
            return 0;
3403
          }
3404
        ], [/* elvis is alive */],
3405
        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
3406
3407
        CXXFLAGS=$safe_CXXFLAGS
3408
        LDFLAGS=$safe_LDFLAGS
3409
        AC_LANG_RESTORE
3410
      ]
3411
    )
3412
3413
    if test x$kde_cv_val_gcc_visibility_bug = xno; then
3414
      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
3415
    fi
3416
  ]
3417
)
3418
3419
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
3420
[
3421
  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
3422
3423
  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
3424
3425
  if test "x$GXX" = "xyes"; then
3426
    AC_LANG_SAVE
3427
    AC_LANG_CPLUSPLUS
3428
    AC_EGREP_CPP(
3429
       [GCC visibility push],
3430
       [ #include <exception> 
3431
       ], 
3432
    [
3433
      AC_MSG_RESULT(yes)
3434
      kde_stdc_visibility_patched=yes ],
3435
    [ 
3436
      AC_MSG_RESULT(no)
3437
      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
3438
                   visibility support. Disabling -fvisibility=hidden])
3439
3440
      kde_stdc_visibility_patched=no ])
3441
3442
    AC_LANG_RESTORE
3443
3444
    kde_have_gcc_visibility=no
3445
    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
3446
    [
3447
      kde_have_gcc_visibility=yes
3448
      dnl the whole toolchain is just a mess, gcc is just too buggy
3449
      dnl to handle STL with visibility enabled. Lets reconsider 
3450
      dnl when gcc 4.2 is out or when things get fixed in the compiler.
3451
      dnl Contact mueller@kde.org for details.
3452
      AC_ARG_ENABLE(gcc-hidden-visibility,
3453
        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
3454
          [kde_have_gcc_visibility=$enableval],
3455
          [kde_have_gcc_visibility=no])
3456
3457
      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
3458
        [
3459
          AC_LANG_SAVE
3460
          AC_LANG_CPLUSPLUS
3461
3462
          safe_CXXFLAGS=$CXXFLAGS
3463
          CXXFLAGS="$CXXFLAGS $all_includes"
3464
3465
          AC_TRY_COMPILE(
3466
          [
3467
#include <qglobal.h>
3468
#if Q_EXPORT - 0 != 0
3469
/* if this compiles, then Q_EXPORT is undefined */
3470
/* if Q_EXPORT is nonempty, this will break compilation */
3471
#endif
3472
          ], [/* elvis is alive */],
3473
          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
3474
3475
          CXXFLAGS=$safe_CXXFLAGS
3476
          AC_LANG_RESTORE
3477
        ]
3478
      )
3479
3480
      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
3481
        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
3482
        KDE_CHECK_VISIBILITY_GCC_BUG
3483
        HAVE_GCC_VISIBILITY=1
3484
        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
3485
      fi
3486
    ])
3487
  fi
3488
])
3489
3064
AC_DEFUN([KDE_ADD_DEPENDENCIES],
3490
AC_DEFUN([KDE_ADD_DEPENDENCIES],
3065
[
3491
[
3066
   [A]M_DEPENDENCIES(CC)
3492
   [A]M_DEPENDENCIES(CC)
Lines 3088-3107 Link Here
3088
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3514
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3089
AC_SUBST(KDE_PLUGIN)
3515
AC_SUBST(KDE_PLUGIN)
3090
3516
3517
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
3518
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
3519
AC_SUBST(KDE_CHECK_PLUGIN)
3520
3091
# we patch configure quite some so we better keep that consistent for incremental runs 
3521
# we patch configure quite some so we better keep that consistent for incremental runs 
3092
AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
3522
AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
3093
])
3523
])
3094
3524
3095
AC_DEFUN([KDE_CHECK_LIB64],
3525
AC_DEFUN([KDE_CHECK_LIB64],
3096
[
3526
[
3097
    kdelibsuff=no
3098
    AC_ARG_ENABLE(libsuffix,
3527
    AC_ARG_ENABLE(libsuffix,
3099
        AC_HELP_STRING([--enable-libsuffix],
3528
        AC_HELP_STRING([--enable-libsuffix],
3100
            [/lib directory suffix (64,32,none[=default])]),
3529
            [/lib directory suffix (64,32,none,auto[=default])]),
3101
            kdelibsuff=$enableval)
3530
            kdelibsuff=$enableval, kdelibsuff="auto")
3102
    # TODO: add an auto case that compiles a little C app to check
3531
    
3103
    # where the glibc is
3532
    if test "$kdelibsuff" = "auto"; then
3104
    if test "$kdelibsuff" = "no"; then
3533
    
3534
cat > conftest.c << EOF
3535
#include <stdio.h>
3536
int main() {
3537
 return 0;
3538
}
3539
EOF
3540
        kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{
3541
    s,.*/lib\([[^\/]]*\)/.*,\1, 
3542
    p 
3543
}'`
3544
	rm -rf conftest.*
3545
    fi	
3546
	
3547
    if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then
3105
       kdelibsuff=
3548
       kdelibsuff=
3106
    fi
3549
    fi
3107
    if test -z "$kdelibsuff"; then
3550
    if test -z "$kdelibsuff"; then
Lines 3112-3118 Link Here
3112
            libdir="$libdir${kdelibsuff}"
3555
            libdir="$libdir${kdelibsuff}"
3113
            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3556
            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
3114
        fi
3557
        fi
3115
        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
3558
        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
3116
        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3559
        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
3117
    fi
3560
    fi
3118
])
3561
])
Lines 3147-3153 Link Here
3147
3590
3148
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
3591
if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
3149
3592
3150
  KDE_RPATH="-R \$(kde_libraries)"
3593
  KDE_RPATH="-R \$(libdir)"
3594
3595
  if test "$kde_libraries" != "$libdir"; then
3596
      KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
3597
  fi
3151
3598
3152
  if test -n "$qt_libraries"; then
3599
  if test -n "$qt_libraries"; then
3153
    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
3600
    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
Lines 3168-3207 Link Here
3168
])
3615
])
3169
3616
3170
dnl Check for the type of the third argument of getsockname
3617
dnl Check for the type of the third argument of getsockname
3171
AC_DEFUN([AC_CHECK_SOCKLEN_T], [
3618
AC_DEFUN([AC_CHECK_SOCKLEN_T],
3172
  AC_MSG_CHECKING(for socklen_t)
3619
[
3173
  AC_CACHE_VAL(ac_cv_socklen_t, [
3620
   AC_MSG_CHECKING(for socklen_t)
3174
    AC_LANG_SAVE
3621
   AC_CACHE_VAL(kde_cv_socklen_t,
3175
    AC_LANG_CPLUSPLUS
3622
   [
3176
    AC_TRY_COMPILE([
3623
      AC_LANG_PUSH(C++)
3177
#include <sys/types.h>
3624
      kde_cv_socklen_t=no
3178
#include <sys/socket.h>
3179
      ],[
3180
socklen_t a=0;
3181
getsockname(0,(struct sockaddr*)0, &a);
3182
      ],
3183
      ac_cv_socklen_t=socklen_t,
3184
      AC_TRY_COMPILE([
3625
      AC_TRY_COMPILE([
3185
#include <sys/types.h>
3626
         #include <sys/types.h>
3186
#include <sys/socket.h>
3627
         #include <sys/socket.h>
3187
        ],[
3628
      ],
3188
int a=0;
3629
      [
3189
getsockname(0,(struct sockaddr*)0, &a);
3630
         socklen_t len;
3190
        ],
3631
         getpeername(0,0,&len);
3191
        ac_cv_socklen_t=int,
3632
      ],
3192
        ac_cv_socklen_t=size_t
3633
      [
3193
      )
3634
         kde_cv_socklen_t=yes
3194
    )
3635
         kde_cv_socklen_t_equiv=socklen_t
3195
    AC_LANG_RESTORE
3636
      ])
3196
  ])
3637
      AC_LANG_POP(C++)
3197
3638
   ])
3198
  AC_MSG_RESULT($ac_cv_socklen_t)
3639
   AC_MSG_RESULT($kde_cv_socklen_t)
3199
  if test "$ac_cv_socklen_t" != "socklen_t"; then
3640
   if test $kde_cv_socklen_t = no; then
3200
    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
3641
      AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
3201
        [Define the real type of socklen_t])
3642
      AC_CACHE_VAL(kde_cv_socklen_t_equiv,
3202
  fi
3643
      [
3203
  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
3644
         kde_cv_socklen_t_equiv=int
3204
3645
         AC_LANG_PUSH(C++)
3646
         for t in int size_t unsigned long "unsigned long"; do
3647
            AC_TRY_COMPILE([
3648
               #include <sys/types.h>
3649
               #include <sys/socket.h>
3650
            ],
3651
            [
3652
               $t len;
3653
               getpeername(0,0,&len);
3654
            ],
3655
            [
3656
               kde_cv_socklen_t_equiv="$t"
3657
               break
3658
            ])
3659
         done
3660
         AC_LANG_POP(C++)
3661
      ])
3662
      AC_MSG_RESULT($kde_cv_socklen_t_equiv)
3663
   fi
3664
   AC_DEFINE_UNQUOTED(kde_socklen_t, $kde_cv_socklen_t_equiv,
3665
                     [type to use in place of socklen_t if not defined])
3666
   AC_DEFINE_UNQUOTED(ksize_t, $kde_cv_socklen_t_equiv,
3667
                     [type to use in place of socklen_t if not defined (deprecated, use kde_socklen_t)])
3205
])
3668
])
3206
3669
3207
dnl This is a merge of some macros out of the gettext aclocal.m4
3670
dnl This is a merge of some macros out of the gettext aclocal.m4
Lines 3493-3499 Link Here
3493
      ac_save_ldflags="$LDFLAGS"
3956
      ac_save_ldflags="$LDFLAGS"
3494
      ac_save_cflags="$CFLAGS"
3957
      ac_save_cflags="$CFLAGS"
3495
      ac_save_libs="$LIBS"
3958
      ac_save_libs="$LIBS"
3496
      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
3959
      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
3960
      LIBS="-lX11 -lXext $LIBSOCKET"
3497
      CFLAGS="$CFLAGS $X_INCLUDES"
3961
      CFLAGS="$CFLAGS $X_INCLUDES"
3498
      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
3962
      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
3499
      AC_TRY_LINK([
3963
      AC_TRY_LINK([
Lines 3504-3515 Link Here
3504
	  int foo_test_dpms()
3968
	  int foo_test_dpms()
3505
	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
3969
	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
3506
	  ac_cv_have_dpms="yes", [
3970
	  ac_cv_have_dpms="yes", [
3507
              LDFLAGS="$ac_save_ldflags"
3971
              LIBS="-lXdpms $LIBS"
3508
              CFLAGS="$ac_save_cflags"
3509
              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
3510
              LIBS="$LIBS -lXdpms"
3511
              CFLAGS="$CFLAGS $X_INCLUDES"
3512
              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
3513
              AC_TRY_LINK([
3972
              AC_TRY_LINK([
3514
	          #include <X11/Xproto.h>
3973
	          #include <X11/Xproto.h>
3515
        	  #include <X11/X.h>
3974
        	  #include <X11/X.h>
Lines 3558-3569 Link Here
3558
   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
4017
   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
3559
 AC_CHECK_DECL(DPMSCapable,
4018
 AC_CHECK_DECL(DPMSCapable,
3560
   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
4019
   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
3561
   [#include <X11/extensions/dpms.h>])
4020
   [#include <X11/Xlib.h>
4021
   #include <X11/extensions/dpms.h>])
3562
 AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
4022
 AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
3563
   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
4023
   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
3564
 AC_CHECK_DECL(DPMSInfo,
4024
 AC_CHECK_DECL(DPMSInfo,
3565
   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
4025
   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
3566
   [#include <X11/extensions/dpms.h>])
4026
   [#include <X11/Xlib.h>
4027
   #include <X11/extensions/dpms.h>])
3567
 CFLAGS="$ac_save_cflags"
4028
 CFLAGS="$ac_save_cflags"
3568
 AC_SUBST(DPMSINC)
4029
 AC_SUBST(DPMSINC)
3569
 AC_SUBST(DPMSLIB)
4030
 AC_SUBST(DPMSLIB)
Lines 3589-3619 Link Here
3589
   [
4050
   [
3590
    AC_LANG_SAVE
4051
    AC_LANG_SAVE
3591
    AC_LANG_CPLUSPLUS
4052
    AC_LANG_CPLUSPLUS
3592
    ac_save_ldflags="$LDFLAGS"
4053
    ac_save_ldflags=$LDFLAGS
3593
    ac_save_cxxflags="$CXXFLAGS"
4054
    ac_save_cxxflags=$CXXFLAGS
3594
    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU"
4055
    ac_save_libs=$LIBS
3595
    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
4056
    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
3596
    LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
4057
    LIBS="$LIBS -lGL -lGLU"
4058
    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
4059
    LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
3597
    CXXFLAGS="$CFLAGS $X_INCLUDES"
4060
    CXXFLAGS="$CFLAGS $X_INCLUDES"
3598
    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
4061
    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
3599
    AC_TRY_LINK([#include <GL/gl.h>
4062
    AC_TRY_LINK([#include <GL/gl.h>
3600
#include <GL/glu.h>
4063
#include <GL/glu.h>
3601
], [],
4064
], [],
3602
	ac_cv_have_gl="mesa", ac_cv_have_gl="no")
4065
	ac_cv_have_gl="yes", ac_cv_have_gl="no")
3603
    if test "x$ac_cv_have_gl" = "xno"; then
3604
      LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL"
3605
      test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
3606
      LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
3607
      CXXFLAGS="$ac_save_cflags $X_INCLUDES"
3608
      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
3609
      AC_TRY_LINK([#include <GL/gl.h>
3610
#include <GL/glu.h>
3611
], [],
3612
	  ac_cv_have_gl="yes", ac_cv_have_gl="no")
3613
    fi
3614
    AC_LANG_RESTORE
4066
    AC_LANG_RESTORE
3615
    LDFLAGS="$ac_save_ldflags"
4067
    LDFLAGS=$ac_save_ldflags
3616
    CXXFLAGS="$ac_save_cxxflags"
4068
    CXXFLAGS=$ac_save_cxxflags
4069
    LIBS=$ac_save_libs
3617
   ])dnl
4070
   ])dnl
3618
4071
3619
  if test "$ac_cv_have_gl" = "no"; then
4072
  if test "$ac_cv_have_gl" = "no"; then
Lines 3624-3640 Link Here
3624
  else
4077
  else
3625
    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
4078
    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
3626
    if test "$GL_LDFLAGS" = ""; then
4079
    if test "$GL_LDFLAGS" = ""; then
3627
       if test "$ac_cv_have_gl" = "mesa"; then
4080
       GLLIB='-lGLU -lGL $(LIB_X11)'
3628
          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
3629
       else
3630
          GLLIB='-lGLU -lGL $(LIB_X11)'
3631
       fi
3632
    else
4081
    else
3633
       if test "$ac_cv_have_gl" = "mesa"; then
4082
       GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
3634
          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
3635
       else
3636
          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
3637
       fi
3638
    fi
4083
    fi
3639
    if test "$GL_INCLUDE" = ""; then
4084
    if test "$GL_INCLUDE" = ""; then
3640
       GLINC=""
4085
       GLINC=""
Lines 3933-3949 Link Here
3933
4378
3934
AC_DEFUN([KDE_CHECK_LIBPTHREAD],
4379
AC_DEFUN([KDE_CHECK_LIBPTHREAD],
3935
[
4380
[
4381
  dnl This code is here specifically to handle the
4382
  dnl various flavors of threading library on FreeBSD
4383
  dnl 4-, 5-, and 6-, and the (weird) rules around it.
4384
  dnl There may be an environment PTHREAD_LIBS that 
4385
  dnl specifies what to use; otherwise, search for it.
4386
  dnl -pthread is special cased and unsets LIBPTHREAD
4387
  dnl below if found.
3936
  LIBPTHREAD=""
4388
  LIBPTHREAD=""
3937
4389
3938
  if test -n "$PTHREAD_LIBS"; then
4390
  if test -n "$PTHREAD_LIBS"; then
3939
    PTHREAD_LIBS_save="$PTHREAD_LIBS"
4391
    if test "x$PTHREAD_LIBS" = "x-pthread" ; then
3940
    PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
4392
      LIBPTHREAD="PTHREAD"
3941
    KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [LIBPTHREAD="$PTHREAD_LIBS_save"] )
4393
    else
3942
    PTHREAD_LIBS="$PTHREAD_LIBS_save"
4394
      PTHREAD_LIBS_save="$PTHREAD_LIBS"
4395
      PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
4396
      AC_MSG_CHECKING([for pthread_create in $PTHREAD_LIBS])
4397
      KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [
4398
          LIBPTHREAD="$PTHREAD_LIBS_save"])
4399
      PTHREAD_LIBS="$PTHREAD_LIBS_save"
4400
    fi
3943
  fi
4401
  fi
3944
4402
4403
  dnl Is this test really needed, in the face of the Tru64 test below?
3945
  if test -z "$LIBPTHREAD"; then
4404
  if test -z "$LIBPTHREAD"; then
3946
    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
4405
    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
4406
  fi
4407
4408
  dnl This is a special Tru64 check, see BR 76171 issue #18.
4409
  if test -z "$LIBPTHREAD" ; then
4410
    AC_MSG_CHECKING([for pthread_create in -lpthread])
4411
    kde_safe_libs=$LIBS
4412
    LIBS="$LIBS -lpthread"
4413
    AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
4414
        AC_MSG_RESULT(yes)
4415
        LIBPTHREAD="-lpthread"],[
4416
	AC_MSG_RESULT(no)])
4417
    LIBS=$kde_safe_libs
4418
  fi
4419
4420
  dnl Un-special-case for FreeBSD.
4421
  if test "x$LIBPTHREAD" = "xPTHREAD" ; then
4422
    LIBPTHREAD=""
3947
  fi
4423
  fi
3948
4424
3949
  AC_SUBST(LIBPTHREAD)
4425
  AC_SUBST(LIBPTHREAD)
Lines 4173-4186 Link Here
4173
4649
4174
AC_DEFUN([KDE_CHECK_PYTHON],
4650
AC_DEFUN([KDE_CHECK_PYTHON],
4175
[
4651
[
4176
  KDE_CHECK_PYTHON_INTERN("2.3", 
4652
  KDE_CHECK_PYTHON_INTERN("2.5",
4177
   [KDE_CHECK_PYTHON_INTERN("2.2", 
4653
    [KDE_CHECK_PYTHON_INTERN("2.4",
4178
     [KDE_CHECK_PYTHON_INTERN("2.1", 
4654
     [KDE_CHECK_PYTHON_INTERN("2.3", 
4179
       [KDE_CHECK_PYTHON_INTERN("2.0", 
4655
       [KDE_CHECK_PYTHON_INTERN("2.2", 
4180
         [KDE_CHECK_PYTHON_INTERN($1, $2) ])
4656
         [KDE_CHECK_PYTHON_INTERN("2.1", 
4657
           [KDE_CHECK_PYTHON_INTERN("2.0", 
4658
             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
4659
           ])
4660
         ])
4181
       ])
4661
       ])
4182
     ])
4662
     ])
4183
   ])
4663
  ])
4184
])
4664
])
4185
4665
4186
AC_DEFUN([KDE_CHECK_STL],
4666
AC_DEFUN([KDE_CHECK_STL],
Lines 4212-4218 Link Here
4212
   else
4692
   else
4213
	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
4693
	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
4214
Check config.log for details - if you're using a Linux distribution you might miss
4694
Check config.log for details - if you're using a Linux distribution you might miss
4215
a package named similiar to libstd++-dev.])
4695
a package named similar to libstdc++-dev.])
4216
   fi
4696
   fi
4217
4697
4218
   CXXFLAGS="$ac_save_CXXFLAGS"
4698
   CXXFLAGS="$ac_save_CXXFLAGS"
Lines 4304-4313 Link Here
4304
[
4784
[
4305
4785
4306
DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
4786
DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
4787
TOPSUBDIRS=""
4307
4788
4308
if test ! -s $srcdir/subdirs; then
4789
if test ! -s $srcdir/subdirs; then
4309
  dnl Note: Makefile.common creates subdirs, so this is just a fallback
4790
  dnl Note: Makefile.common creates subdirs, so this is just a fallback
4310
  TOPSUBDIRS=""
4311
  files=`cd $srcdir && ls -1`
4791
  files=`cd $srcdir && ls -1`
4312
  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
4792
  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
4313
  for i in $dirs; do
4793
  for i in $dirs; do
Lines 4448-4460 Link Here
4448
4928
4449
AC_DEFUN([KDE_CHECK_HEADER],
4929
AC_DEFUN([KDE_CHECK_HEADER],
4450
[
4930
[
4451
   AC_LANG_SAVE
4452
   kde_safe_cppflags=$CPPFLAGS
4931
   kde_safe_cppflags=$CPPFLAGS
4453
   CPPFLAGS="$CPPFLAGS $all_includes"
4932
   CPPFLAGS="$CPPFLAGS $all_includes"
4933
   AC_LANG_SAVE
4454
   AC_LANG_CPLUSPLUS
4934
   AC_LANG_CPLUSPLUS
4455
   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
4935
   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
4456
   CPPFLAGS=$kde_safe_cppflags
4457
   AC_LANG_RESTORE
4936
   AC_LANG_RESTORE
4937
   CPPFLAGS=$kde_safe_cppflags
4458
])
4938
])
4459
4939
4460
AC_DEFUN([KDE_CHECK_HEADERS],
4940
AC_DEFUN([KDE_CHECK_HEADERS],
Lines 4507-4512 Link Here
4507
  # And delete superfluous '/' to make compares easier
4987
  # And delete superfluous '/' to make compares easier
4508
  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
4988
  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
4509
  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
4989
  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
4990
4991
  kde_libs_prefix='$(prefix)'
4992
  kde_libs_htmldir='$(kde_htmldir)'
4993
  AC_SUBST(kde_libs_prefix)
4994
  AC_SUBST(kde_libs_htmldir)
4510
  KDE_FAST_CONFIGURE
4995
  KDE_FAST_CONFIGURE
4511
  KDE_CONF_FILES
4996
  KDE_CONF_FILES
4512
])
4997
])
Lines 4755-4763 Link Here
4755
      for dir in $javadirs; do
5240
      for dir in $javadirs; do
4756
          dnl Check for the java executable
5241
          dnl Check for the java executable
4757
	  if test -x "$dir/java"; then
5242
	  if test -x "$dir/java"; then
5243
	      sane_path=$(cd $dir; /bin/pwd)
4758
	      dnl And also check for a libjvm.so somewhere under there
5244
	      dnl And also check for a libjvm.so somewhere under there
4759
	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
5245
	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
4760
              if test "$dir" != "/usr/bin"; then
5246
              if test "$sane_path" != "/usr/bin"; then
4761
                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
5247
                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
4762
		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
5248
		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
4763
		  jredirs="$jredirs $dir"
5249
		  jredirs="$jredirs $dir"
Lines 4914-4920 Link Here
4914
  JAVAC=$kde_java_bindir/javac
5400
  JAVAC=$kde_java_bindir/javac
4915
  JAVAH=$kde_java_bindir/javah
5401
  JAVAH=$kde_java_bindir/javah
4916
  JAR=$kde_java_bindir/jar
5402
  JAR=$kde_java_bindir/jar
4917
  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
5403
  JVMLIBS="-Wl,-framework,JavaVM"
4918
5404
4919
  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
5405
  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
4920
  AC_MSG_RESULT([Apple Java Framework])
5406
  AC_MSG_RESULT([Apple Java Framework])
Lines 5435-5437 Link Here
5435
	])
5921
	])
5436
    AC_SUBST(PERL)
5922
    AC_SUBST(PERL)
5437
])
5923
])
5924
5925
AC_DEFUN([KDE_CHECK_LARGEFILE],
5926
[
5927
AC_SYS_LARGEFILE
5928
if test "$ac_cv_sys_file_offset_bits" != no; then
5929
  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
5930
fi
5931
5932
if test "x$ac_cv_sys_large_files" != "xno"; then
5933
  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=1"
5934
fi
5935
5936
])
5937
5938
dnl A small extension to PKG_CHECK_MODULES (defined in pkg.m4.in)
5939
dnl which allows to search for libs that get installed into the KDE prefix.
5940
dnl
5941
dnl Syntax:  KDE_PKG_CHECK_MODULES(KSTUFF, libkexif >= 0.2 glib = 1.3.4, action-if, action-not)
5942
dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
5943
dnl also defines KSTUFF_PKG_ERRORS on error
5944
AC_DEFUN([KDE_PKG_CHECK_MODULES], [
5945
5946
   PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5947
   if test "$prefix" != "$kde_libs_prefix"; then
5948
       PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
5949
   fi
5950
   export PKG_CONFIG_PATH
5951
   PKG_CHECK_MODULES([$1],[$2],[$3],[$4])
5952
])
5953
5954
5955
dnl Check for PIE support in the compiler and linker
5956
AC_DEFUN([KDE_CHECK_PIE_SUPPORT],
5957
[
5958
  AC_CACHE_CHECK([for PIE support], kde_cv_val_pie_support,
5959
  [
5960
    AC_LANG_SAVE
5961
    AC_LANG_CPLUSPLUS
5962
    safe_CXXFLAGS=$CXXFLAGS
5963
    safe_LDFLAGS=$LDFLAGS
5964
    CXXFLAGS="$CXXFLAGS -fPIE"
5965
    LDFLAGS="$LDFLAGS -pie"
5966
5967
    AC_TRY_LINK([int foo;], [], [kde_cv_val_pie_support=yes], [kde_cv_val_pie_support=no])
5968
5969
    CXXFLAGS=$safe_CXXFLAGS
5970
    LDFLAGS=$safe_LDFLAGS
5971
    AC_LANG_RESTORE
5972
  ])
5973
5974
  AC_MSG_CHECKING(if enabling -pie/fPIE support)
5975
5976
  AC_ARG_ENABLE(pie,
5977
    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
5978
      [kde_has_pie_support=$enableval],
5979
      [kde_has_pie_support=detect])
5980
5981
  if test "$kde_has_pie_support" = "detect"; then
5982
    kde_has_pie_support=$kde_cv_val_pie_support
5983
  fi
5984
5985
  AC_MSG_RESULT([$kde_has_pie_support])
5986
5987
  KDE_USE_FPIE=""
5988
  KDE_USE_PIE=""
5989
5990
  AC_SUBST([KDE_USE_FPIE])
5991
  AC_SUBST([KDE_USE_PIE])
5992
5993
  if test "$kde_has_pie_support" = "yes"; then
5994
    KDE_USE_FPIE="-fPIE"
5995
    KDE_USE_PIE="-pie"
5996
  fi
5997
])
(-)eventwatcher-0.4.3-orig/admin/am_edit (-13 / +16 lines)
Lines 351-357 Link Here
351
    my $tmp = "force-reedit:\n";
351
    my $tmp = "force-reedit:\n";
352
    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
352
    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
353
    appendLines($tmp);
353
    appendLines($tmp);
354
    
354
355
    make_bcheck_target();
355
    make_bcheck_target();
356
    make_meta_classes();
356
    make_meta_classes();
357
    tag_COMPILE_FIRST();
357
    tag_COMPILE_FIRST();
Lines 422-431 Link Here
422
      substituteLine($lookup, "RECURSIVE_TARGETS = $1 nmcheck-recursive bcheck-recursive");
422
      substituteLine($lookup, "RECURSIVE_TARGETS = $1 nmcheck-recursive bcheck-recursive");
423
    }
423
    }
424
424
425
    my $cvs_lines = "cvs-clean:\n";
426
    $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
427
    appendLines($cvs_lines);
428
429
    $cvs_lines  = "kde-rpo-clean:\n";
425
    $cvs_lines  = "kde-rpo-clean:\n";
430
    $cvs_lines .= "\t-rm -f *.rpo\n";
426
    $cvs_lines .= "\t-rm -f *.rpo\n";
431
    appendLines($cvs_lines);
427
    appendLines($cvs_lines);
Lines 483-488 Link Here
483
            $MakefileData =~ s/$lookup/$replacement/;
479
            $MakefileData =~ s/$lookup/$replacement/;
484
            $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
480
            $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
485
            $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
481
            $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
482
            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
486
            substituteLine($lookup, $replacement);
483
            substituteLine($lookup, $replacement);
487
        } else {
484
        } else {
488
            $found = 0;
485
            $found = 0;
Lines 634-640 Link Here
634
		if ($pre eq '' && exists($varcontent{$variable})) {
631
		if ($pre eq '' && exists($varcontent{$variable})) {
635
		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
632
		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
636
		    push(@objlist, @addlist);
633
		    push(@objlist, @addlist);
637
                } elsif ($variable !~ 'OBJEXT') {
634
                } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
638
                    $ocv = 1;
635
                    $ocv = 1;
639
		}
636
		}
640
            }
637
            }
Lines 875-882 Link Here
875
                $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
872
                $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
876
873
877
                $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
874
                $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
878
                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
875
                $lines .= "\techo '#include <kdemacros.h>' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
879
                $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
876
                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' >> ${kdeinit}_dummy.$cxxsuffix; \\\n";
877
                $lines .= "\techo 'extern \"C\" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
880
878
881
                push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
879
                push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
882
                push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
880
                push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
Lines 1368-1381 Link Here
1368
                    my ($mangled_source) = $source;
1366
                    my ($mangled_source) = $source;
1369
                    $mangled_source =~ s/[^A-Za-z0-9]/_/g;  # get rid of garbage
1367
                    $mangled_source =~ s/[^A-Za-z0-9]/_/g;  # get rid of garbage
1370
                    $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
1368
                    $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
1371
                    $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
1369
                    $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" | \$(PERL) -pe \"s,: QWizard\\(,: KWizard(,g\" >> $source.$cxxsuffix ;\\\n";
1372
		    $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
1370
		    $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
1373
                } else {
1371
                } else {
1374
                    $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
1372
                    $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
1375
                }
1373
                }
1376
		$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
1374
		$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
1377
                $dep_lines .= "$source.h: $sourcedir$source.ui\n";
1375
                $dep_lines .= "$source.h: $sourcedir$source.ui\n";
1378
                $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n\n";
1376
                $dep_lines .= "\trm -rf $source.h;\n";
1377
                if (!$kdeopts{"qtonly"}) {
1378
                    $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
1379
                } else {
1380
                    $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
1381
                }
1379
                $dep_lines .= "$source.moc: $source.h\n";
1382
                $dep_lines .= "$source.moc: $source.h\n";
1380
                $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
1383
                $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
1381
1384
Lines 2025-2031 Link Here
2025
2028
2026
      $lines .= "\n";
2029
      $lines .= "\n";
2027
      $lines .= "uninstall-docs:\n";
2030
      $lines .= "uninstall-docs:\n";
2028
      $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
2031
      $lines .= "\t-rm -rf \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
2029
      $lines .= "\n";
2032
      $lines .= "\n";
2030
      $lines .= "clean-docs:\n";
2033
      $lines .= "clean-docs:\n";
2031
      $lines .= "\t-rm -f index.cache.bz2\n";
2034
      $lines .= "\t-rm -f index.cache.bz2\n";
Lines 2274-2280 Link Here
2274
           "\t        echo \"\$\$i\"; \\\n" . 
2277
           "\t        echo \"\$\$i\"; \\\n" . 
2275
           "\t        if ! ";
2278
           "\t        if ! ";
2276
    $t .=  $cxxsuffix eq "KKK" ?
2279
    $t .=  $cxxsuffix eq "KKK" ?
2277
           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
2280
           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
2278
           "\$(CXXCOMPILE) ";
2281
           "\$(CXXCOMPILE) ";
2279
    $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
2282
    $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
2280
           "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
2283
           "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
Lines 2350-2356 Link Here
2350
    $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
2353
    $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
2351
    # Append our $progId line, _below_ the "generated by automake" line
2354
    # Append our $progId line, _below_ the "generated by automake" line
2352
    # because automake-1.6 relies on the first line to be his own.
2355
    # because automake-1.6 relies on the first line to be his own.
2353
    my $progIdLine = "\# $progId - " . '$Revision: 1.1.1.1 $ '."\n";
2356
    my $progIdLine = "\# $progId - " . '$Revision: 483858 $ '."\n";
2354
    if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
2357
    if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
2355
        warn "automake line not found in $makefile\n";
2358
        warn "automake line not found in $makefile\n";
2356
	# Fallback: first line
2359
	# Fallback: first line
(-)eventwatcher-0.4.3-orig/admin/bcheck.pl (+1 lines)
Lines 118-123 Link Here
118
118
119
    s/0x[0-9a-fA-F]+/0x......../g;
119
    s/0x[0-9a-fA-F]+/0x......../g;
120
    s/base size=/size=/g;
120
    s/base size=/size=/g;
121
    s/\(\)\s*$//g;
121
    s/base align=/align=/g;
122
    s/base align=/align=/g;
122
123
123
    $chunk .= $_ . "\n";
124
    $chunk .= $_ . "\n";
(-)eventwatcher-0.4.3-orig/admin/compile (-52 / +95 lines)
Lines 1-8 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
3
# Wrapper for compilers which do not understand `-c -o'.
2
# Wrapper for compilers which do not understand `-c -o'.
4
3
5
# Copyright 1999, 2000 Free Software Foundation, Inc.
4
scriptversion=2005-05-14.22
5
6
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
6
# Written by Tom Tromey <tromey@cygnus.com>.
7
# Written by Tom Tromey <tromey@cygnus.com>.
7
#
8
#
8
# This program is free software; you can redistribute it and/or modify
9
# This program is free software; you can redistribute it and/or modify
Lines 17-99 Link Here
17
#
18
#
18
# You should have received a copy of the GNU General Public License
19
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
20
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21
22
22
# As a special exception to the GNU General Public License, if you
23
# As a special exception to the GNU General Public License, if you
23
# distribute this file as part of a program that contains a
24
# distribute this file as part of a program that contains a
24
# configuration script generated by Autoconf, you may include it under
25
# configuration script generated by Autoconf, you may include it under
25
# the same distribution terms that you use for the rest of that program.
26
# the same distribution terms that you use for the rest of that program.
26
27
27
# Usage:
28
# This file is maintained in Automake, please report
28
# compile PROGRAM [ARGS]...
29
# bugs to <bug-automake@gnu.org> or send patches to
29
# `-o FOO.o' is removed from the args passed to the actual compile.
30
# <automake-patches@gnu.org>.
30
31
31
prog=$1
32
case $1 in
32
shift
33
  '')
34
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
35
     exit 1;
36
     ;;
37
  -h | --h*)
38
    cat <<\EOF
39
Usage: compile [--help] [--version] PROGRAM [ARGS]
40
41
Wrapper for compilers which do not understand `-c -o'.
42
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
43
arguments, and rename the output as expected.
44
45
If you are trying to build a whole package this is not the
46
right script to run: please start by reading the file `INSTALL'.
47
48
Report bugs to <bug-automake@gnu.org>.
49
EOF
50
    exit $?
51
    ;;
52
  -v | --v*)
53
    echo "compile $scriptversion"
54
    exit $?
55
    ;;
56
esac
33
57
34
ofile=
58
ofile=
35
cfile=
59
cfile=
36
args=
60
eat=
37
while test $# -gt 0; do
61
38
   case "$1" in
62
for arg
39
    -o)
63
do
40
       # configure might choose to run compile as `compile cc -o foo foo.c'.
64
  if test -n "$eat"; then
41
       # So we do something ugly here.
65
    eat=
42
       ofile=$2
66
  else
43
       shift
67
    case $1 in
44
       case "$ofile" in
68
      -o)
45
	*.o | *.obj)
69
	# configure might choose to run compile as `compile cc -o foo foo.c'.
46
	   ;;
70
	# So we strip `-o arg' only if arg is an object.
47
	*)
71
	eat=1
48
	   args="$args -o $ofile"
72
	case $2 in
49
	   ofile=
73
	  *.o | *.obj)
50
	   ;;
74
	    ofile=$2
51
       esac
75
	    ;;
52
       ;;
76
	  *)
53
    *.c)
77
	    set x "$@" -o "$2"
54
       cfile=$1
78
	    shift
55
       args="$args $1"
79
	    ;;
56
       ;;
80
	esac
57
    *)
81
	;;
58
       args="$args $1"
82
      *.c)
59
       ;;
83
	cfile=$1
60
   esac
84
	set x "$@" "$1"
61
   shift
85
	shift
86
	;;
87
      *)
88
	set x "$@" "$1"
89
	shift
90
	;;
91
    esac
92
  fi
93
  shift
62
done
94
done
63
95
64
if test -z "$ofile" || test -z "$cfile"; then
96
if test -z "$ofile" || test -z "$cfile"; then
65
   # If no `-o' option was seen then we might have been invoked from a
97
  # If no `-o' option was seen then we might have been invoked from a
66
   # pattern rule where we don't need one.  That is ok -- this is a
98
  # pattern rule where we don't need one.  That is ok -- this is a
67
   # normal compilation that the losing compiler can handle.  If no
99
  # normal compilation that the losing compiler can handle.  If no
68
   # `.c' file was seen then we are probably linking.  That is also
100
  # `.c' file was seen then we are probably linking.  That is also
69
   # ok.
101
  # ok.
70
   exec "$prog" $args
102
  exec "$@"
71
fi
103
fi
72
104
73
# Name of file we expect compiler to create.
105
# Name of file we expect compiler to create.
74
cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
106
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
75
107
76
# Create the lock directory.
108
# Create the lock directory.
77
# Note: use `[/.-]' here to ensure that we don't use the same name
109
# Note: use `[/.-]' here to ensure that we don't use the same name
78
# that we are using for the .o file.  Also, base the name on the expected
110
# that we are using for the .o file.  Also, base the name on the expected
79
# object file name, since that is what matters with a parallel build.
111
# object file name, since that is what matters with a parallel build.
80
lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
112
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
81
while true; do
113
while true; do
82
   if mkdir $lockdir > /dev/null 2>&1; then
114
  if mkdir "$lockdir" >/dev/null 2>&1; then
83
      break
115
    break
84
   fi
116
  fi
85
   sleep 1
117
  sleep 1
86
done
118
done
87
# FIXME: race condition here if user kills between mkdir and trap.
119
# FIXME: race condition here if user kills between mkdir and trap.
88
trap "rmdir $lockdir; exit 1" 1 2 15
120
trap "rmdir '$lockdir'; exit 1" 1 2 15
89
121
90
# Run the compile.
122
# Run the compile.
91
"$prog" $args
123
"$@"
92
status=$?
124
ret=$?
93
125
94
if test -f "$cofile"; then
126
if test -f "$cofile"; then
95
   mv "$cofile" "$ofile"
127
  mv "$cofile" "$ofile"
128
elif test -f "${cofile}bj"; then
129
  mv "${cofile}bj" "$ofile"
96
fi
130
fi
97
131
98
rmdir $lockdir
132
rmdir "$lockdir"
99
exit $status
133
exit $ret
134
135
# Local Variables:
136
# mode: shell-script
137
# sh-indentation: 2
138
# eval: (add-hook 'write-file-hooks 'time-stamp)
139
# time-stamp-start: "scriptversion="
140
# time-stamp-format: "%:y-%02m-%02d.%02H"
141
# time-stamp-end: "$"
142
# End:
(-)eventwatcher-0.4.3-orig/admin/conf.change.pl (-3 / +3 lines)
Lines 19-26 Link Here
19
19
20
#   You should have received a copy of the GNU Library General Public License
20
#   You should have received a copy of the GNU Library General Public License
21
#   along with this library; see the file COPYING.LIB.  If not, write to
21
#   along with this library; see the file COPYING.LIB.  If not, write to
22
#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22
#   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23
#   Boston, MA 02111-1307, USA.
23
#   Boston, MA 02110-1301, USA.
24
24
25
# we have to change two places
25
# we have to change two places
26
# 1. the splitting of the substitutions into chunks of 90 (or even 48 in
26
# 1. the splitting of the substitutions into chunks of 90 (or even 48 in
Lines 81-87 Link Here
81
# on autoconf 250, it ends with '# CONFIG_HEADER section'
81
# on autoconf 250, it ends with '# CONFIG_HEADER section'
82
#
82
#
83
# gg: if a post-processing commands section is found first, 
83
# gg: if a post-processing commands section is found first, 
84
#    stop there and insert a new loop to honour the case/esac.
84
#    stop there and insert a new loop to honor the case/esac.
85
# (pattern: /^\s+#\sRun the commands associated with the file./)
85
# (pattern: /^\s+#\sRun the commands associated with the file./)
86
86
87
	if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
87
	if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
(-)eventwatcher-0.4.3-orig/admin/config.guess (-346 / +447 lines)
Lines 1-9 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# Attempt to guess a canonical system name.
2
# Attempt to guess a canonical system name.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#   2000, 2001, 2002 Free Software Foundation, Inc.
4
#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5
5
6
timestamp='2002-10-21'
6
timestamp='2005-06-30'
7
7
8
# This file is free software; you can redistribute it and/or modify it
8
# This file is free software; you can redistribute it and/or modify it
9
# under the terms of the GNU General Public License as published by
9
# under the terms of the GNU General Public License as published by
Lines 17-29 Link Here
17
#
17
#
18
# You should have received a copy of the GNU General Public License
18
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
19
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21
# 02110-1301, USA.
21
#
22
#
22
# As a special exception to the GNU General Public License, if you
23
# As a special exception to the GNU General Public License, if you
23
# distribute this file as part of a program that contains a
24
# distribute this file as part of a program that contains a
24
# configuration script generated by Autoconf, you may include it under
25
# configuration script generated by Autoconf, you may include it under
25
# the same distribution terms that you use for the rest of that program.
26
# the same distribution terms that you use for the rest of that program.
26
27
28
27
# Originally written by Per Bothner <per@bothner.com>.
29
# Originally written by Per Bothner <per@bothner.com>.
28
# Please send patches to <config-patches@gnu.org>.  Submit a context
30
# Please send patches to <config-patches@gnu.org>.  Submit a context
29
# diff and a properly formatted ChangeLog entry.
31
# diff and a properly formatted ChangeLog entry.
Lines 53-59 Link Here
53
GNU config.guess ($timestamp)
55
GNU config.guess ($timestamp)
54
56
55
Originally written by Per Bothner.
57
Originally written by Per Bothner.
56
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
58
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
57
Free Software Foundation, Inc.
59
Free Software Foundation, Inc.
58
60
59
This is free software; see the source for copying conditions.  There is NO
61
This is free software; see the source for copying conditions.  There is NO
Lines 66-76 Link Here
66
while test $# -gt 0 ; do
68
while test $# -gt 0 ; do
67
  case $1 in
69
  case $1 in
68
    --time-stamp | --time* | -t )
70
    --time-stamp | --time* | -t )
69
       echo "$timestamp" ; exit 0 ;;
71
       echo "$timestamp" ; exit ;;
70
    --version | -v )
72
    --version | -v )
71
       echo "$version" ; exit 0 ;;
73
       echo "$version" ; exit ;;
72
    --help | --h* | -h )
74
    --help | --h* | -h )
73
       echo "$usage"; exit 0 ;;
75
       echo "$usage"; exit ;;
74
    -- )     # Stop option processing
76
    -- )     # Stop option processing
75
       shift; break ;;
77
       shift; break ;;
76
    - )	# Use stdin as input.
78
    - )	# Use stdin as input.
Lines 98-111 Link Here
98
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
100
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
99
# use `HOST_CC' if defined, but it is deprecated.
101
# use `HOST_CC' if defined, but it is deprecated.
100
102
101
# This shell variable is my proudest work .. or something. --bje
103
# Portable tmp directory creation inspired by the Autoconf team.
102
104
103
set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
105
set_cc_for_build='
104
(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
106
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
105
   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
107
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
106
dummy=$tmpdir/dummy ;
108
: ${TMPDIR=/tmp} ;
107
files="$dummy.c $dummy.o $dummy.rel $dummy" ;
109
 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
108
trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
110
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
111
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
112
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
113
dummy=$tmp/dummy ;
114
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109
case $CC_FOR_BUILD,$HOST_CC,$CC in
115
case $CC_FOR_BUILD,$HOST_CC,$CC in
110
 ,,)    echo "int x;" > $dummy.c ;
116
 ,,)    echo "int x;" > $dummy.c ;
111
	for c in cc gcc c89 c99 ; do
117
	for c in cc gcc c89 c99 ; do
Lines 113-127 Link Here
113
	     CC_FOR_BUILD="$c"; break ;
119
	     CC_FOR_BUILD="$c"; break ;
114
	  fi ;
120
	  fi ;
115
	done ;
121
	done ;
116
	rm -f $files ;
117
	if test x"$CC_FOR_BUILD" = x ; then
122
	if test x"$CC_FOR_BUILD" = x ; then
118
	  CC_FOR_BUILD=no_compiler_found ;
123
	  CC_FOR_BUILD=no_compiler_found ;
119
	fi
124
	fi
120
	;;
125
	;;
121
 ,,*)   CC_FOR_BUILD=$CC ;;
126
 ,,*)   CC_FOR_BUILD=$CC ;;
122
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
127
 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
123
esac ;
128
esac ;'
124
unset files'
125
129
126
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
130
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
127
# (ghazi@noc.rutgers.edu 1994-08-24)
131
# (ghazi@noc.rutgers.edu 1994-08-24)
Lines 178-321 Link Here
178
		;;
182
		;;
179
	esac
183
	esac
180
	# The OS release
184
	# The OS release
181
	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
185
	# Debian GNU/NetBSD machines have a different userland, and
186
	# thus, need a distinct triplet. However, they do not need
187
	# kernel version information, so it can be replaced with a
188
	# suitable tag, in the style of linux-gnu.
189
	case "${UNAME_VERSION}" in
190
	    Debian*)
191
		release='-gnu'
192
		;;
193
	    *)
194
		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
195
		;;
196
	esac
182
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
197
	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
183
	# contains redundant information, the shorter form:
198
	# contains redundant information, the shorter form:
184
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
199
	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
185
	echo "${machine}-${os}${release}"
200
	echo "${machine}-${os}${release}"
186
	exit 0 ;;
201
	exit ;;
187
    amiga:OpenBSD:*:*)
188
	echo m68k-unknown-openbsd${UNAME_RELEASE}
189
	exit 0 ;;
190
    arc:OpenBSD:*:*)
191
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
192
	exit 0 ;;
193
    hp300:OpenBSD:*:*)
194
	echo m68k-unknown-openbsd${UNAME_RELEASE}
195
	exit 0 ;;
196
    mac68k:OpenBSD:*:*)
197
	echo m68k-unknown-openbsd${UNAME_RELEASE}
198
	exit 0 ;;
199
    macppc:OpenBSD:*:*)
200
	echo powerpc-unknown-openbsd${UNAME_RELEASE}
201
	exit 0 ;;
202
    mvme68k:OpenBSD:*:*)
203
	echo m68k-unknown-openbsd${UNAME_RELEASE}
204
	exit 0 ;;
205
    mvme88k:OpenBSD:*:*)
206
	echo m88k-unknown-openbsd${UNAME_RELEASE}
207
	exit 0 ;;
208
    mvmeppc:OpenBSD:*:*)
209
	echo powerpc-unknown-openbsd${UNAME_RELEASE}
210
	exit 0 ;;
211
    pmax:OpenBSD:*:*)
212
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
213
	exit 0 ;;
214
    sgi:OpenBSD:*:*)
215
	echo mipseb-unknown-openbsd${UNAME_RELEASE}
216
	exit 0 ;;
217
    sun3:OpenBSD:*:*)
218
	echo m68k-unknown-openbsd${UNAME_RELEASE}
219
	exit 0 ;;
220
    wgrisc:OpenBSD:*:*)
221
	echo mipsel-unknown-openbsd${UNAME_RELEASE}
222
	exit 0 ;;
223
    *:OpenBSD:*:*)
202
    *:OpenBSD:*:*)
224
	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
203
	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
225
	exit 0 ;;
204
	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
205
	exit ;;
206
    *:ekkoBSD:*:*)
207
	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
208
	exit ;;
209
    macppc:MirBSD:*:*)
210
	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
211
	exit ;;
212
    *:MirBSD:*:*)
213
	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
214
	exit ;;
226
    alpha:OSF1:*:*)
215
    alpha:OSF1:*:*)
227
	if test $UNAME_RELEASE = "V4.0"; then
216
	case $UNAME_RELEASE in
217
	*4.0)
228
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
218
		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
229
	fi
219
		;;
220
	*5.*)
221
	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
222
		;;
223
	esac
224
	# According to Compaq, /usr/sbin/psrinfo has been available on
225
	# OSF/1 and Tru64 systems produced since 1995.  I hope that
226
	# covers most systems running today.  This code pipes the CPU
227
	# types through head -n 1, so we only detect the type of CPU 0.
228
	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
229
	case "$ALPHA_CPU_TYPE" in
230
	    "EV4 (21064)")
231
		UNAME_MACHINE="alpha" ;;
232
	    "EV4.5 (21064)")
233
		UNAME_MACHINE="alpha" ;;
234
	    "LCA4 (21066/21068)")
235
		UNAME_MACHINE="alpha" ;;
236
	    "EV5 (21164)")
237
		UNAME_MACHINE="alphaev5" ;;
238
	    "EV5.6 (21164A)")
239
		UNAME_MACHINE="alphaev56" ;;
240
	    "EV5.6 (21164PC)")
241
		UNAME_MACHINE="alphapca56" ;;
242
	    "EV5.7 (21164PC)")
243
		UNAME_MACHINE="alphapca57" ;;
244
	    "EV6 (21264)")
245
		UNAME_MACHINE="alphaev6" ;;
246
	    "EV6.7 (21264A)")
247
		UNAME_MACHINE="alphaev67" ;;
248
	    "EV6.8CB (21264C)")
249
		UNAME_MACHINE="alphaev68" ;;
250
	    "EV6.8AL (21264B)")
251
		UNAME_MACHINE="alphaev68" ;;
252
	    "EV6.8CX (21264D)")
253
		UNAME_MACHINE="alphaev68" ;;
254
	    "EV6.9A (21264/EV69A)")
255
		UNAME_MACHINE="alphaev69" ;;
256
	    "EV7 (21364)")
257
		UNAME_MACHINE="alphaev7" ;;
258
	    "EV7.9 (21364A)")
259
		UNAME_MACHINE="alphaev79" ;;
260
	esac
261
	# A Pn.n version is a patched version.
230
	# A Vn.n version is a released version.
262
	# A Vn.n version is a released version.
231
	# A Tn.n version is a released field test version.
263
	# A Tn.n version is a released field test version.
232
	# A Xn.n version is an unreleased experimental baselevel.
264
	# A Xn.n version is an unreleased experimental baselevel.
233
	# 1.2 uses "1.2" for uname -r.
265
	# 1.2 uses "1.2" for uname -r.
234
	eval $set_cc_for_build
266
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
235
	cat <<EOF >$dummy.s
267
	exit ;;
236
	.data
237
\$Lformat:
238
	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
239
240
	.text
241
	.globl main
242
	.align 4
243
	.ent main
244
main:
245
	.frame \$30,16,\$26,0
246
	ldgp \$29,0(\$27)
247
	.prologue 1
248
	.long 0x47e03d80 # implver \$0
249
	lda \$2,-1
250
	.long 0x47e20c21 # amask \$2,\$1
251
	lda \$16,\$Lformat
252
	mov \$0,\$17
253
	not \$1,\$18
254
	jsr \$26,printf
255
	ldgp \$29,0(\$26)
256
	mov 0,\$16
257
	jsr \$26,exit
258
	.end main
259
EOF
260
	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
261
	if test "$?" = 0 ; then
262
		case `$dummy` in
263
			0-0)
264
				UNAME_MACHINE="alpha"
265
				;;
266
			1-0)
267
				UNAME_MACHINE="alphaev5"
268
				;;
269
			1-1)
270
				UNAME_MACHINE="alphaev56"
271
				;;
272
			1-101)
273
				UNAME_MACHINE="alphapca56"
274
				;;
275
			2-303)
276
				UNAME_MACHINE="alphaev6"
277
				;;
278
			2-307)
279
				UNAME_MACHINE="alphaev67"
280
				;;
281
			2-1307)
282
				UNAME_MACHINE="alphaev68"
283
				;;
284
			3-1307)
285
				UNAME_MACHINE="alphaev7"
286
				;;
287
		esac
288
	fi
289
	rm -f $dummy.s $dummy && rmdir $tmpdir
290
	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
291
	exit 0 ;;
292
    Alpha\ *:Windows_NT*:*)
268
    Alpha\ *:Windows_NT*:*)
293
	# How do we know it's Interix rather than the generic POSIX subsystem?
269
	# How do we know it's Interix rather than the generic POSIX subsystem?
294
	# Should we change UNAME_MACHINE based on the output of uname instead
270
	# Should we change UNAME_MACHINE based on the output of uname instead
295
	# of the specific Alpha model?
271
	# of the specific Alpha model?
296
	echo alpha-pc-interix
272
	echo alpha-pc-interix
297
	exit 0 ;;
273
	exit ;;
298
    21064:Windows_NT:50:3)
274
    21064:Windows_NT:50:3)
299
	echo alpha-dec-winnt3.5
275
	echo alpha-dec-winnt3.5
300
	exit 0 ;;
276
	exit ;;
301
    Amiga*:UNIX_System_V:4.0:*)
277
    Amiga*:UNIX_System_V:4.0:*)
302
	echo m68k-unknown-sysv4
278
	echo m68k-unknown-sysv4
303
	exit 0;;
279
	exit ;;
304
    *:[Aa]miga[Oo][Ss]:*:*)
280
    *:[Aa]miga[Oo][Ss]:*:*)
305
	echo ${UNAME_MACHINE}-unknown-amigaos
281
	echo ${UNAME_MACHINE}-unknown-amigaos
306
	exit 0 ;;
282
	exit ;;
307
    *:[Mm]orph[Oo][Ss]:*:*)
283
    *:[Mm]orph[Oo][Ss]:*:*)
308
	echo ${UNAME_MACHINE}-unknown-morphos
284
	echo ${UNAME_MACHINE}-unknown-morphos
309
	exit 0 ;;
285
	exit ;;
310
    *:OS/390:*:*)
286
    *:OS/390:*:*)
311
	echo i370-ibm-openedition
287
	echo i370-ibm-openedition
312
	exit 0 ;;
288
	exit ;;
289
    *:z/VM:*:*)
290
	echo s390-ibm-zvmoe
291
	exit ;;
292
    *:OS400:*:*)
293
        echo powerpc-ibm-os400
294
	exit ;;
313
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
295
    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
314
	echo arm-acorn-riscix${UNAME_RELEASE}
296
	echo arm-acorn-riscix${UNAME_RELEASE}
315
	exit 0;;
297
	exit ;;
298
    arm:riscos:*:*|arm:RISCOS:*:*)
299
	echo arm-unknown-riscos
300
	exit ;;
316
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
301
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
317
	echo hppa1.1-hitachi-hiuxmpp
302
	echo hppa1.1-hitachi-hiuxmpp
318
	exit 0;;
303
	exit ;;
319
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
304
    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
320
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
305
	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
321
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
306
	if test "`(/bin/universe) 2>/dev/null`" = att ; then
Lines 323-351 Link Here
323
	else
308
	else
324
		echo pyramid-pyramid-bsd
309
		echo pyramid-pyramid-bsd
325
	fi
310
	fi
326
	exit 0 ;;
311
	exit ;;
327
    NILE*:*:*:dcosx)
312
    NILE*:*:*:dcosx)
328
	echo pyramid-pyramid-svr4
313
	echo pyramid-pyramid-svr4
329
	exit 0 ;;
314
	exit ;;
330
    DRS?6000:UNIX_SV:4.2*:7*)
315
    DRS?6000:unix:4.0:6*)
316
	echo sparc-icl-nx6
317
	exit ;;
318
    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
331
	case `/usr/bin/uname -p` in
319
	case `/usr/bin/uname -p` in
332
	    sparc) echo sparc-icl-nx7 && exit 0 ;;
320
	    sparc) echo sparc-icl-nx7; exit ;;
333
	esac ;;
321
	esac ;;
334
    sun4H:SunOS:5.*:*)
322
    sun4H:SunOS:5.*:*)
335
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
323
	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
336
	exit 0 ;;
324
	exit ;;
337
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
325
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
338
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
326
	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
339
	exit 0 ;;
327
	exit ;;
340
    i86pc:SunOS:5.*:*)
328
    i86pc:SunOS:5.*:*)
341
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329
	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
342
	exit 0 ;;
330
	exit ;;
343
    sun4*:SunOS:6*:*)
331
    sun4*:SunOS:6*:*)
344
	# According to config.sub, this is the proper way to canonicalize
332
	# According to config.sub, this is the proper way to canonicalize
345
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
333
	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
346
	# it's likely to be more like Solaris than SunOS4.
334
	# it's likely to be more like Solaris than SunOS4.
347
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335
	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
348
	exit 0 ;;
336
	exit ;;
349
    sun4*:SunOS:*:*)
337
    sun4*:SunOS:*:*)
350
	case "`/usr/bin/arch -k`" in
338
	case "`/usr/bin/arch -k`" in
351
	    Series*|S4*)
339
	    Series*|S4*)
Lines 354-363 Link Here
354
	esac
342
	esac
355
	# Japanese Language versions have a version number like `4.1.3-JL'.
343
	# Japanese Language versions have a version number like `4.1.3-JL'.
356
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
344
	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
357
	exit 0 ;;
345
	exit ;;
358
    sun3*:SunOS:*:*)
346
    sun3*:SunOS:*:*)
359
	echo m68k-sun-sunos${UNAME_RELEASE}
347
	echo m68k-sun-sunos${UNAME_RELEASE}
360
	exit 0 ;;
348
	exit ;;
361
    sun*:*:4.2BSD:*)
349
    sun*:*:4.2BSD:*)
362
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
350
	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
363
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
351
	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
Lines 369-378 Link Here
369
		echo sparc-sun-sunos${UNAME_RELEASE}
357
		echo sparc-sun-sunos${UNAME_RELEASE}
370
		;;
358
		;;
371
	esac
359
	esac
372
	exit 0 ;;
360
	exit ;;
373
    aushp:SunOS:*:*)
361
    aushp:SunOS:*:*)
374
	echo sparc-auspex-sunos${UNAME_RELEASE}
362
	echo sparc-auspex-sunos${UNAME_RELEASE}
375
	exit 0 ;;
363
	exit ;;
376
    # The situation for MiNT is a little confusing.  The machine name
364
    # The situation for MiNT is a little confusing.  The machine name
377
    # can be virtually everything (everything which is not
365
    # can be virtually everything (everything which is not
378
    # "atarist" or "atariste" at least should have a processor
366
    # "atarist" or "atariste" at least should have a processor
Lines 383-419 Link Here
383
    # be no problem.
371
    # be no problem.
384
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
372
    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
385
        echo m68k-atari-mint${UNAME_RELEASE}
373
        echo m68k-atari-mint${UNAME_RELEASE}
386
	exit 0 ;;
374
	exit ;;
387
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
375
    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
388
	echo m68k-atari-mint${UNAME_RELEASE}
376
	echo m68k-atari-mint${UNAME_RELEASE}
389
        exit 0 ;;
377
        exit ;;
390
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
378
    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
391
        echo m68k-atari-mint${UNAME_RELEASE}
379
        echo m68k-atari-mint${UNAME_RELEASE}
392
	exit 0 ;;
380
	exit ;;
393
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
381
    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
394
        echo m68k-milan-mint${UNAME_RELEASE}
382
        echo m68k-milan-mint${UNAME_RELEASE}
395
        exit 0 ;;
383
        exit ;;
396
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
384
    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
397
        echo m68k-hades-mint${UNAME_RELEASE}
385
        echo m68k-hades-mint${UNAME_RELEASE}
398
        exit 0 ;;
386
        exit ;;
399
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
387
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
400
        echo m68k-unknown-mint${UNAME_RELEASE}
388
        echo m68k-unknown-mint${UNAME_RELEASE}
401
        exit 0 ;;
389
        exit ;;
390
    m68k:machten:*:*)
391
	echo m68k-apple-machten${UNAME_RELEASE}
392
	exit ;;
402
    powerpc:machten:*:*)
393
    powerpc:machten:*:*)
403
	echo powerpc-apple-machten${UNAME_RELEASE}
394
	echo powerpc-apple-machten${UNAME_RELEASE}
404
	exit 0 ;;
395
	exit ;;
405
    RISC*:Mach:*:*)
396
    RISC*:Mach:*:*)
406
	echo mips-dec-mach_bsd4.3
397
	echo mips-dec-mach_bsd4.3
407
	exit 0 ;;
398
	exit ;;
408
    RISC*:ULTRIX:*:*)
399
    RISC*:ULTRIX:*:*)
409
	echo mips-dec-ultrix${UNAME_RELEASE}
400
	echo mips-dec-ultrix${UNAME_RELEASE}
410
	exit 0 ;;
401
	exit ;;
411
    VAX*:ULTRIX*:*:*)
402
    VAX*:ULTRIX*:*:*)
412
	echo vax-dec-ultrix${UNAME_RELEASE}
403
	echo vax-dec-ultrix${UNAME_RELEASE}
413
	exit 0 ;;
404
	exit ;;
414
    2020:CLIX:*:* | 2430:CLIX:*:*)
405
    2020:CLIX:*:* | 2430:CLIX:*:*)
415
	echo clipper-intergraph-clix${UNAME_RELEASE}
406
	echo clipper-intergraph-clix${UNAME_RELEASE}
416
	exit 0 ;;
407
	exit ;;
417
    mips:*:*:UMIPS | mips:*:*:RISCos)
408
    mips:*:*:UMIPS | mips:*:*:RISCos)
418
	eval $set_cc_for_build
409
	eval $set_cc_for_build
419
	sed 's/^	//' << EOF >$dummy.c
410
	sed 's/^	//' << EOF >$dummy.c
Lines 437-469 Link Here
437
	  exit (-1);
428
	  exit (-1);
438
	}
429
	}
439
EOF
430
EOF
440
	$CC_FOR_BUILD -o $dummy $dummy.c \
431
	$CC_FOR_BUILD -o $dummy $dummy.c &&
441
	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
432
	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
442
	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
433
	  SYSTEM_NAME=`$dummy $dummyarg` &&
443
	rm -f $dummy.c $dummy && rmdir $tmpdir
434
	    { echo "$SYSTEM_NAME"; exit; }
444
	echo mips-mips-riscos${UNAME_RELEASE}
435
	echo mips-mips-riscos${UNAME_RELEASE}
445
	exit 0 ;;
436
	exit ;;
446
    Motorola:PowerMAX_OS:*:*)
437
    Motorola:PowerMAX_OS:*:*)
447
	echo powerpc-motorola-powermax
438
	echo powerpc-motorola-powermax
448
	exit 0 ;;
439
	exit ;;
449
    Motorola:*:4.3:PL8-*)
440
    Motorola:*:4.3:PL8-*)
450
	echo powerpc-harris-powermax
441
	echo powerpc-harris-powermax
451
	exit 0 ;;
442
	exit ;;
452
    Night_Hawk:*:*:PowerMAX_OS)
443
    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
453
	echo powerpc-harris-powermax
444
	echo powerpc-harris-powermax
454
	exit 0 ;;
445
	exit ;;
455
    Night_Hawk:Power_UNIX:*:*)
446
    Night_Hawk:Power_UNIX:*:*)
456
	echo powerpc-harris-powerunix
447
	echo powerpc-harris-powerunix
457
	exit 0 ;;
448
	exit ;;
458
    m88k:CX/UX:7*:*)
449
    m88k:CX/UX:7*:*)
459
	echo m88k-harris-cxux7
450
	echo m88k-harris-cxux7
460
	exit 0 ;;
451
	exit ;;
461
    m88k:*:4*:R4*)
452
    m88k:*:4*:R4*)
462
	echo m88k-motorola-sysv4
453
	echo m88k-motorola-sysv4
463
	exit 0 ;;
454
	exit ;;
464
    m88k:*:3*:R3*)
455
    m88k:*:3*:R3*)
465
	echo m88k-motorola-sysv3
456
	echo m88k-motorola-sysv3
466
	exit 0 ;;
457
	exit ;;
467
    AViiON:dgux:*:*)
458
    AViiON:dgux:*:*)
468
        # DG/UX returns AViiON for all architectures
459
        # DG/UX returns AViiON for all architectures
469
        UNAME_PROCESSOR=`/usr/bin/uname -p`
460
        UNAME_PROCESSOR=`/usr/bin/uname -p`
Lines 479-507 Link Here
479
	else
470
	else
480
	    echo i586-dg-dgux${UNAME_RELEASE}
471
	    echo i586-dg-dgux${UNAME_RELEASE}
481
	fi
472
	fi
482
 	exit 0 ;;
473
 	exit ;;
483
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
474
    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
484
	echo m88k-dolphin-sysv3
475
	echo m88k-dolphin-sysv3
485
	exit 0 ;;
476
	exit ;;
486
    M88*:*:R3*:*)
477
    M88*:*:R3*:*)
487
	# Delta 88k system running SVR3
478
	# Delta 88k system running SVR3
488
	echo m88k-motorola-sysv3
479
	echo m88k-motorola-sysv3
489
	exit 0 ;;
480
	exit ;;
490
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
481
    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
491
	echo m88k-tektronix-sysv3
482
	echo m88k-tektronix-sysv3
492
	exit 0 ;;
483
	exit ;;
493
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
484
    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
494
	echo m68k-tektronix-bsd
485
	echo m68k-tektronix-bsd
495
	exit 0 ;;
486
	exit ;;
496
    *:IRIX*:*:*)
487
    *:IRIX*:*:*)
497
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
488
	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
498
	exit 0 ;;
489
	exit ;;
499
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
490
    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
500
	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
491
	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
501
	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
492
	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
502
    i*86:AIX:*:*)
493
    i*86:AIX:*:*)
503
	echo i386-ibm-aix
494
	echo i386-ibm-aix
504
	exit 0 ;;
495
	exit ;;
505
    ia64:AIX:*:*)
496
    ia64:AIX:*:*)
506
	if [ -x /usr/bin/oslevel ] ; then
497
	if [ -x /usr/bin/oslevel ] ; then
507
		IBM_REV=`/usr/bin/oslevel`
498
		IBM_REV=`/usr/bin/oslevel`
Lines 509-515 Link Here
509
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
500
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
510
	fi
501
	fi
511
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
502
	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
512
	exit 0 ;;
503
	exit ;;
513
    *:AIX:2:3)
504
    *:AIX:2:3)
514
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
505
	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
515
		eval $set_cc_for_build
506
		eval $set_cc_for_build
Lines 524-538 Link Here
524
			exit(0);
515
			exit(0);
525
			}
516
			}
526
EOF
517
EOF
527
		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
518
		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
528
		rm -f $dummy.c $dummy && rmdir $tmpdir
519
		then
529
		echo rs6000-ibm-aix3.2.5
520
			echo "$SYSTEM_NAME"
521
		else
522
			echo rs6000-ibm-aix3.2.5
523
		fi
530
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
524
	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
531
		echo rs6000-ibm-aix3.2.4
525
		echo rs6000-ibm-aix3.2.4
532
	else
526
	else
533
		echo rs6000-ibm-aix3.2
527
		echo rs6000-ibm-aix3.2
534
	fi
528
	fi
535
	exit 0 ;;
529
	exit ;;
536
    *:AIX:*:[45])
530
    *:AIX:*:[45])
537
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
531
	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
538
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
532
	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
Lines 546-573 Link Here
546
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
540
		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
547
	fi
541
	fi
548
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
542
	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
549
	exit 0 ;;
543
	exit ;;
550
    *:AIX:*:*)
544
    *:AIX:*:*)
551
	echo rs6000-ibm-aix
545
	echo rs6000-ibm-aix
552
	exit 0 ;;
546
	exit ;;
553
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
547
    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
554
	echo romp-ibm-bsd4.4
548
	echo romp-ibm-bsd4.4
555
	exit 0 ;;
549
	exit ;;
556
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
550
    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
557
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
551
	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
558
	exit 0 ;;                           # report: romp-ibm BSD 4.3
552
	exit ;;                             # report: romp-ibm BSD 4.3
559
    *:BOSX:*:*)
553
    *:BOSX:*:*)
560
	echo rs6000-bull-bosx
554
	echo rs6000-bull-bosx
561
	exit 0 ;;
555
	exit ;;
562
    DPX/2?00:B.O.S.:*:*)
556
    DPX/2?00:B.O.S.:*:*)
563
	echo m68k-bull-sysv3
557
	echo m68k-bull-sysv3
564
	exit 0 ;;
558
	exit ;;
565
    9000/[34]??:4.3bsd:1.*:*)
559
    9000/[34]??:4.3bsd:1.*:*)
566
	echo m68k-hp-bsd
560
	echo m68k-hp-bsd
567
	exit 0 ;;
561
	exit ;;
568
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
562
    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
569
	echo m68k-hp-bsd4.4
563
	echo m68k-hp-bsd4.4
570
	exit 0 ;;
564
	exit ;;
571
    9000/[34678]??:HP-UX:*:*)
565
    9000/[34678]??:HP-UX:*:*)
572
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
566
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
573
	case "${UNAME_MACHINE}" in
567
	case "${UNAME_MACHINE}" in
Lines 624-639 Link Here
624
              }
618
              }
625
EOF
619
EOF
626
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
620
		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
627
		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
621
		    test -z "$HP_ARCH" && HP_ARCH=hppa
628
		    rm -f $dummy.c $dummy && rmdir $tmpdir
629
		fi ;;
622
		fi ;;
630
	esac
623
	esac
624
	if [ ${HP_ARCH} = "hppa2.0w" ]
625
	then
626
	    # avoid double evaluation of $set_cc_for_build
627
	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
628
629
	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
630
	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
631
	    # generating 64-bit code.  GNU and HP use different nomenclature:
632
	    #
633
	    # $ CC_FOR_BUILD=cc ./config.guess
634
	    # => hppa2.0w-hp-hpux11.23
635
	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
636
	    # => hppa64-hp-hpux11.23
637
638
	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
639
		grep __LP64__ >/dev/null
640
	    then
641
		HP_ARCH="hppa2.0w"
642
	    else
643
		HP_ARCH="hppa64"
644
	    fi
645
	fi
631
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
646
	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
632
	exit 0 ;;
647
	exit ;;
633
    ia64:HP-UX:*:*)
648
    ia64:HP-UX:*:*)
634
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
649
	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
635
	echo ia64-hp-hpux${HPUX_REV}
650
	echo ia64-hp-hpux${HPUX_REV}
636
	exit 0 ;;
651
	exit ;;
637
    3050*:HI-UX:*:*)
652
    3050*:HI-UX:*:*)
638
	eval $set_cc_for_build
653
	eval $set_cc_for_build
639
	sed 's/^	//' << EOF >$dummy.c
654
	sed 's/^	//' << EOF >$dummy.c
Lines 661-806 Link Here
661
	  exit (0);
676
	  exit (0);
662
	}
677
	}
663
EOF
678
EOF
664
	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
679
	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
665
	rm -f $dummy.c $dummy && rmdir $tmpdir
680
		{ echo "$SYSTEM_NAME"; exit; }
666
	echo unknown-hitachi-hiuxwe2
681
	echo unknown-hitachi-hiuxwe2
667
	exit 0 ;;
682
	exit ;;
668
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
683
    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
669
	echo hppa1.1-hp-bsd
684
	echo hppa1.1-hp-bsd
670
	exit 0 ;;
685
	exit ;;
671
    9000/8??:4.3bsd:*:*)
686
    9000/8??:4.3bsd:*:*)
672
	echo hppa1.0-hp-bsd
687
	echo hppa1.0-hp-bsd
673
	exit 0 ;;
688
	exit ;;
674
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
689
    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
675
	echo hppa1.0-hp-mpeix
690
	echo hppa1.0-hp-mpeix
676
	exit 0 ;;
691
	exit ;;
677
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
692
    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
678
	echo hppa1.1-hp-osf
693
	echo hppa1.1-hp-osf
679
	exit 0 ;;
694
	exit ;;
680
    hp8??:OSF1:*:*)
695
    hp8??:OSF1:*:*)
681
	echo hppa1.0-hp-osf
696
	echo hppa1.0-hp-osf
682
	exit 0 ;;
697
	exit ;;
683
    i*86:OSF1:*:*)
698
    i*86:OSF1:*:*)
684
	if [ -x /usr/sbin/sysversion ] ; then
699
	if [ -x /usr/sbin/sysversion ] ; then
685
	    echo ${UNAME_MACHINE}-unknown-osf1mk
700
	    echo ${UNAME_MACHINE}-unknown-osf1mk
686
	else
701
	else
687
	    echo ${UNAME_MACHINE}-unknown-osf1
702
	    echo ${UNAME_MACHINE}-unknown-osf1
688
	fi
703
	fi
689
	exit 0 ;;
704
	exit ;;
690
    parisc*:Lites*:*:*)
705
    parisc*:Lites*:*:*)
691
	echo hppa1.1-hp-lites
706
	echo hppa1.1-hp-lites
692
	exit 0 ;;
707
	exit ;;
693
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
708
    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
694
	echo c1-convex-bsd
709
	echo c1-convex-bsd
695
        exit 0 ;;
710
        exit ;;
696
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
711
    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
697
	if getsysinfo -f scalar_acc
712
	if getsysinfo -f scalar_acc
698
	then echo c32-convex-bsd
713
	then echo c32-convex-bsd
699
	else echo c2-convex-bsd
714
	else echo c2-convex-bsd
700
	fi
715
	fi
701
        exit 0 ;;
716
        exit ;;
702
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
717
    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
703
	echo c34-convex-bsd
718
	echo c34-convex-bsd
704
        exit 0 ;;
719
        exit ;;
705
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
720
    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
706
	echo c38-convex-bsd
721
	echo c38-convex-bsd
707
        exit 0 ;;
722
        exit ;;
708
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
723
    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
709
	echo c4-convex-bsd
724
	echo c4-convex-bsd
710
        exit 0 ;;
725
        exit ;;
711
    CRAY*Y-MP:*:*:*)
726
    CRAY*Y-MP:*:*:*)
712
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
727
	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
713
	exit 0 ;;
728
	exit ;;
714
    CRAY*[A-Z]90:*:*:*)
729
    CRAY*[A-Z]90:*:*:*)
715
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
730
	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
716
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
731
	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
717
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
732
	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
718
	      -e 's/\.[^.]*$/.X/'
733
	      -e 's/\.[^.]*$/.X/'
719
	exit 0 ;;
734
	exit ;;
720
    CRAY*TS:*:*:*)
735
    CRAY*TS:*:*:*)
721
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
736
	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
722
	exit 0 ;;
737
	exit ;;
723
    CRAY*T3D:*:*:*)
724
	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
725
	exit 0 ;;
726
    CRAY*T3E:*:*:*)
738
    CRAY*T3E:*:*:*)
727
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
739
	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
728
	exit 0 ;;
740
	exit ;;
729
    CRAY*SV1:*:*:*)
741
    CRAY*SV1:*:*:*)
730
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
742
	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
731
	exit 0 ;;
743
	exit ;;
744
    *:UNICOS/mp:*:*)
745
	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
746
	exit ;;
732
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
747
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
733
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
748
	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
734
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
749
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
735
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
750
        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
736
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
751
        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
737
        exit 0 ;;
752
        exit ;;
753
    5000:UNIX_System_V:4.*:*)
754
        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
755
        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
756
        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
757
	exit ;;
738
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
758
    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
739
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
759
	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
740
	exit 0 ;;
760
	exit ;;
741
    sparc*:BSD/OS:*:*)
761
    sparc*:BSD/OS:*:*)
742
	echo sparc-unknown-bsdi${UNAME_RELEASE}
762
	echo sparc-unknown-bsdi${UNAME_RELEASE}
743
	exit 0 ;;
763
	exit ;;
744
    *:BSD/OS:*:*)
764
    *:BSD/OS:*:*)
745
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
765
	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
746
	exit 0 ;;
766
	exit ;;
747
    *:FreeBSD:*:*)
767
    *:FreeBSD:*:*)
748
	# Determine whether the default compiler uses glibc.
768
	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
749
	eval $set_cc_for_build
769
	exit ;;
750
	sed 's/^	//' << EOF >$dummy.c
751
	#include <features.h>
752
	#if __GLIBC__ >= 2
753
	LIBC=gnu
754
	#else
755
	LIBC=
756
	#endif
757
EOF
758
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
759
	rm -f $dummy.c && rmdir $tmpdir
760
	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
761
	exit 0 ;;
762
    i*:CYGWIN*:*)
770
    i*:CYGWIN*:*)
763
	echo ${UNAME_MACHINE}-pc-cygwin
771
	echo ${UNAME_MACHINE}-pc-cygwin
764
	exit 0 ;;
772
	exit ;;
765
    i*:MINGW*:*)
773
    i*:MINGW*:*)
766
	echo ${UNAME_MACHINE}-pc-mingw32
774
	echo ${UNAME_MACHINE}-pc-mingw32
767
	exit 0 ;;
775
	exit ;;
776
    i*:windows32*:*)
777
    	# uname -m includes "-pc" on this system.
778
    	echo ${UNAME_MACHINE}-mingw32
779
	exit ;;
768
    i*:PW*:*)
780
    i*:PW*:*)
769
	echo ${UNAME_MACHINE}-pc-pw32
781
	echo ${UNAME_MACHINE}-pc-pw32
770
	exit 0 ;;
782
	exit ;;
771
    x86:Interix*:3*)
783
    x86:Interix*:[34]*)
772
	echo i386-pc-interix3
784
	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
773
	exit 0 ;;
785
	exit ;;
786
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
787
	echo i${UNAME_MACHINE}-pc-mks
788
	exit ;;
774
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
789
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
775
	# How do we know it's Interix rather than the generic POSIX subsystem?
790
	# How do we know it's Interix rather than the generic POSIX subsystem?
776
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
791
	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
777
	# UNAME_MACHINE based on the output of uname instead of i386?
792
	# UNAME_MACHINE based on the output of uname instead of i386?
778
	echo i386-pc-interix
793
	echo i586-pc-interix
779
	exit 0 ;;
794
	exit ;;
780
    i*:UWIN*:*)
795
    i*:UWIN*:*)
781
	echo ${UNAME_MACHINE}-pc-uwin
796
	echo ${UNAME_MACHINE}-pc-uwin
782
	exit 0 ;;
797
	exit ;;
798
    amd64:CYGWIN*:*:*)
799
	echo x86_64-unknown-cygwin
800
	exit ;;
783
    p*:CYGWIN*:*)
801
    p*:CYGWIN*:*)
784
	echo powerpcle-unknown-cygwin
802
	echo powerpcle-unknown-cygwin
785
	exit 0 ;;
803
	exit ;;
786
    prep*:SunOS:5.*:*)
804
    prep*:SunOS:5.*:*)
787
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
805
	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
788
	exit 0 ;;
806
	exit ;;
789
    *:GNU:*:*)
807
    *:GNU:*:*)
808
	# the GNU system
790
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
809
	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
791
	exit 0 ;;
810
	exit ;;
811
    *:GNU/*:*:*)
812
	# other systems with GNU libc and userland
813
	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
814
	exit ;;
792
    i*86:Minix:*:*)
815
    i*86:Minix:*:*)
793
	echo ${UNAME_MACHINE}-pc-minix
816
	echo ${UNAME_MACHINE}-pc-minix
794
	exit 0 ;;
817
	exit ;;
795
    arm*:Linux:*:*)
818
    arm*:Linux:*:*)
796
	echo ${UNAME_MACHINE}-unknown-linux-gnu
819
	echo ${UNAME_MACHINE}-unknown-linux-gnu
797
	exit 0 ;;
820
	exit ;;
821
    cris:Linux:*:*)
822
	echo cris-axis-linux-gnu
823
	exit ;;
824
    crisv32:Linux:*:*)
825
	echo crisv32-axis-linux-gnu
826
	exit ;;
827
    frv:Linux:*:*)
828
    	echo frv-unknown-linux-gnu
829
	exit ;;
798
    ia64:Linux:*:*)
830
    ia64:Linux:*:*)
799
	echo ${UNAME_MACHINE}-unknown-linux-gnu
831
	echo ${UNAME_MACHINE}-unknown-linux-gnu
800
	exit 0 ;;
832
	exit ;;
833
    m32r*:Linux:*:*)
834
	echo ${UNAME_MACHINE}-unknown-linux-gnu
835
	exit ;;
801
    m68*:Linux:*:*)
836
    m68*:Linux:*:*)
802
	echo ${UNAME_MACHINE}-unknown-linux-gnu
837
	echo ${UNAME_MACHINE}-unknown-linux-gnu
803
	exit 0 ;;
838
	exit ;;
804
    mips:Linux:*:*)
839
    mips:Linux:*:*)
805
	eval $set_cc_for_build
840
	eval $set_cc_for_build
806
	sed 's/^	//' << EOF >$dummy.c
841
	sed 's/^	//' << EOF >$dummy.c
Lines 818-832 Link Here
818
	#endif
853
	#endif
819
EOF
854
EOF
820
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
855
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
821
	rm -f $dummy.c && rmdir $tmpdir
856
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
822
	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
857
	;;
858
    mips64:Linux:*:*)
859
	eval $set_cc_for_build
860
	sed 's/^	//' << EOF >$dummy.c
861
	#undef CPU
862
	#undef mips64
863
	#undef mips64el
864
	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
865
	CPU=mips64el
866
	#else
867
	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
868
	CPU=mips64
869
	#else
870
	CPU=
871
	#endif
872
	#endif
873
EOF
874
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
875
	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
823
	;;
876
	;;
824
    ppc:Linux:*:*)
877
    ppc:Linux:*:*)
825
	echo powerpc-unknown-linux-gnu
878
	echo powerpc-unknown-linux-gnu
826
	exit 0 ;;
879
	exit ;;
827
    ppc64:Linux:*:*)
880
    ppc64:Linux:*:*)
828
	echo powerpc64-unknown-linux-gnu
881
	echo powerpc64-unknown-linux-gnu
829
	exit 0 ;;
882
	exit ;;
830
    alpha:Linux:*:*)
883
    alpha:Linux:*:*)
831
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
884
	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
832
	  EV5)   UNAME_MACHINE=alphaev5 ;;
885
	  EV5)   UNAME_MACHINE=alphaev5 ;;
Lines 840-846 Link Here
840
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
893
	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
841
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
894
	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
842
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
895
	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
843
	exit 0 ;;
896
	exit ;;
844
    parisc:Linux:*:* | hppa:Linux:*:*)
897
    parisc:Linux:*:* | hppa:Linux:*:*)
845
	# Look for CPU level
898
	# Look for CPU level
846
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
899
	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
Lines 848-869 Link Here
848
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
901
	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
849
	  *)    echo hppa-unknown-linux-gnu ;;
902
	  *)    echo hppa-unknown-linux-gnu ;;
850
	esac
903
	esac
851
	exit 0 ;;
904
	exit ;;
852
    parisc64:Linux:*:* | hppa64:Linux:*:*)
905
    parisc64:Linux:*:* | hppa64:Linux:*:*)
853
	echo hppa64-unknown-linux-gnu
906
	echo hppa64-unknown-linux-gnu
854
	exit 0 ;;
907
	exit ;;
855
    s390:Linux:*:* | s390x:Linux:*:*)
908
    s390:Linux:*:* | s390x:Linux:*:*)
856
	echo ${UNAME_MACHINE}-ibm-linux
909
	echo ${UNAME_MACHINE}-ibm-linux
857
	exit 0 ;;
910
	exit ;;
911
    sh64*:Linux:*:*)
912
    	echo ${UNAME_MACHINE}-unknown-linux-gnu
913
	exit ;;
858
    sh*:Linux:*:*)
914
    sh*:Linux:*:*)
859
	echo ${UNAME_MACHINE}-unknown-linux-gnu
915
	echo ${UNAME_MACHINE}-unknown-linux-gnu
860
	exit 0 ;;
916
	exit ;;
861
    sparc:Linux:*:* | sparc64:Linux:*:*)
917
    sparc:Linux:*:* | sparc64:Linux:*:*)
862
	echo ${UNAME_MACHINE}-unknown-linux-gnu
918
	echo ${UNAME_MACHINE}-unknown-linux-gnu
863
	exit 0 ;;
919
	exit ;;
864
    x86_64:Linux:*:*)
920
    x86_64:Linux:*:*)
865
	echo x86_64-unknown-linux-gnu
921
	echo x86_64-unknown-linux-gnu
866
	exit 0 ;;
922
	exit ;;
867
    i*86:Linux:*:*)
923
    i*86:Linux:*:*)
868
	# The BFD linker knows what the default object file format is, so
924
	# The BFD linker knows what the default object file format is, so
869
	# first see if it will tell us. cd to the root directory to prevent
925
	# first see if it will tell us. cd to the root directory to prevent
Lines 881-895 Link Here
881
		;;
937
		;;
882
	  a.out-i386-linux)
938
	  a.out-i386-linux)
883
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
939
		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
884
		exit 0 ;;
940
		exit ;;
885
	  coff-i386)
941
	  coff-i386)
886
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
942
		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
887
		exit 0 ;;
943
		exit ;;
888
	  "")
944
	  "")
889
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
945
		# Either a pre-BFD a.out linker (linux-gnuoldld) or
890
		# one that does not give us useful --help.
946
		# one that does not give us useful --help.
891
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
947
		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
892
		exit 0 ;;
948
		exit ;;
893
	esac
949
	esac
894
	# Determine whether the default compiler is a.out or elf
950
	# Determine whether the default compiler is a.out or elf
895
	eval $set_cc_for_build
951
	eval $set_cc_for_build
Lines 912-929 Link Here
912
	LIBC=gnuaout
968
	LIBC=gnuaout
913
	#endif
969
	#endif
914
	#endif
970
	#endif
971
	#ifdef __dietlibc__
972
	LIBC=dietlibc
973
	#endif
915
EOF
974
EOF
916
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
975
	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
917
	rm -f $dummy.c && rmdir $tmpdir
976
	test x"${LIBC}" != x && {
918
	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
977
		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
919
	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
978
		exit
979
	}
980
	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
920
	;;
981
	;;
921
    i*86:DYNIX/ptx:4*:*)
982
    i*86:DYNIX/ptx:4*:*)
922
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
983
	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
923
	# earlier versions are messed up and put the nodename in both
984
	# earlier versions are messed up and put the nodename in both
924
	# sysname and nodename.
985
	# sysname and nodename.
925
	echo i386-sequent-sysv4
986
	echo i386-sequent-sysv4
926
	exit 0 ;;
987
	exit ;;
927
    i*86:UNIX_SV:4.2MP:2.*)
988
    i*86:UNIX_SV:4.2MP:2.*)
928
        # Unixware is an offshoot of SVR4, but it has its own version
989
        # Unixware is an offshoot of SVR4, but it has its own version
929
        # number series starting with 2...
990
        # number series starting with 2...
Lines 931-937 Link Here
931
	# I just have to hope.  -- rms.
992
	# I just have to hope.  -- rms.
932
        # Use sysv4.2uw... so that sysv4* matches it.
993
        # Use sysv4.2uw... so that sysv4* matches it.
933
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
994
	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
934
	exit 0 ;;
995
	exit ;;
996
    i*86:OS/2:*:*)
997
	# If we were able to find `uname', then EMX Unix compatibility
998
	# is probably installed.
999
	echo ${UNAME_MACHINE}-pc-os2-emx
1000
	exit ;;
1001
    i*86:XTS-300:*:STOP)
1002
	echo ${UNAME_MACHINE}-unknown-stop
1003
	exit ;;
1004
    i*86:atheos:*:*)
1005
	echo ${UNAME_MACHINE}-unknown-atheos
1006
	exit ;;
1007
    i*86:syllable:*:*)
1008
	echo ${UNAME_MACHINE}-pc-syllable
1009
	exit ;;
1010
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1011
	echo i386-unknown-lynxos${UNAME_RELEASE}
1012
	exit ;;
1013
    i*86:*DOS:*:*)
1014
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
1015
	exit ;;
935
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
1016
    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
936
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
1017
	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
937
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
1018
	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
Lines 939-953 Link Here
939
	else
1020
	else
940
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
1021
		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
941
	fi
1022
	fi
942
	exit 0 ;;
1023
	exit ;;
943
    i*86:*:5:[78]*)
1024
    i*86:*:5:[678]*)
1025
    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
944
	case `/bin/uname -X | grep "^Machine"` in
1026
	case `/bin/uname -X | grep "^Machine"` in
945
	    *486*)	     UNAME_MACHINE=i486 ;;
1027
	    *486*)	     UNAME_MACHINE=i486 ;;
946
	    *Pentium)	     UNAME_MACHINE=i586 ;;
1028
	    *Pentium)	     UNAME_MACHINE=i586 ;;
947
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
1029
	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
948
	esac
1030
	esac
949
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
1031
	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
950
	exit 0 ;;
1032
	exit ;;
951
    i*86:*:3.2:*)
1033
    i*86:*:3.2:*)
952
	if test -f /usr/options/cb.name; then
1034
	if test -f /usr/options/cb.name; then
953
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
1035
		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
Lines 965-1040 Link Here
965
	else
1047
	else
966
		echo ${UNAME_MACHINE}-pc-sysv32
1048
		echo ${UNAME_MACHINE}-pc-sysv32
967
	fi
1049
	fi
968
	exit 0 ;;
1050
	exit ;;
969
    i*86:*DOS:*:*)
970
	echo ${UNAME_MACHINE}-pc-msdosdjgpp
971
	exit 0 ;;
972
    pc:*:*:*)
1051
    pc:*:*:*)
973
	# Left here for compatibility:
1052
	# Left here for compatibility:
974
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
1053
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
975
        # the processor, so we play safe by assuming i386.
1054
        # the processor, so we play safe by assuming i386.
976
	echo i386-pc-msdosdjgpp
1055
	echo i386-pc-msdosdjgpp
977
        exit 0 ;;
1056
        exit ;;
978
    Intel:Mach:3*:*)
1057
    Intel:Mach:3*:*)
979
	echo i386-pc-mach3
1058
	echo i386-pc-mach3
980
	exit 0 ;;
1059
	exit ;;
981
    paragon:*:*:*)
1060
    paragon:*:*:*)
982
	echo i860-intel-osf1
1061
	echo i860-intel-osf1
983
	exit 0 ;;
1062
	exit ;;
984
    i860:*:4.*:*) # i860-SVR4
1063
    i860:*:4.*:*) # i860-SVR4
985
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
1064
	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
986
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
1065
	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
987
	else # Add other i860-SVR4 vendors below as they are discovered.
1066
	else # Add other i860-SVR4 vendors below as they are discovered.
988
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
1067
	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
989
	fi
1068
	fi
990
	exit 0 ;;
1069
	exit ;;
991
    mini*:CTIX:SYS*5:*)
1070
    mini*:CTIX:SYS*5:*)
992
	# "miniframe"
1071
	# "miniframe"
993
	echo m68010-convergent-sysv
1072
	echo m68010-convergent-sysv
994
	exit 0 ;;
1073
	exit ;;
995
    mc68k:UNIX:SYSTEM5:3.51m)
1074
    mc68k:UNIX:SYSTEM5:3.51m)
996
	echo m68k-convergent-sysv
1075
	echo m68k-convergent-sysv
997
	exit 0 ;;
1076
	exit ;;
998
    M68*:*:R3V[567]*:*)
1077
    M680?0:D-NIX:5.3:*)
999
	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1078
	echo m68k-diab-dnix
1000
    3[34]??:*: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)
1079
	exit ;;
1080
    M68*:*:R3V[5678]*:*)
1081
	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
1082
    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)
1001
	OS_REL=''
1083
	OS_REL=''
1002
	test -r /etc/.relid \
1084
	test -r /etc/.relid \
1003
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1085
	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1004
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1086
	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1005
	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
1087
	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1006
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1088
	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1007
	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
1089
	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1008
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1090
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1009
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1091
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1010
          && echo i486-ncr-sysv4 && exit 0 ;;
1092
          && { echo i486-ncr-sysv4; exit; } ;;
1011
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1093
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1012
	echo m68k-unknown-lynxos${UNAME_RELEASE}
1094
	echo m68k-unknown-lynxos${UNAME_RELEASE}
1013
	exit 0 ;;
1095
	exit ;;
1014
    mc68030:UNIX_System_V:4.*:*)
1096
    mc68030:UNIX_System_V:4.*:*)
1015
	echo m68k-atari-sysv4
1097
	echo m68k-atari-sysv4
1016
	exit 0 ;;
1098
	exit ;;
1017
    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1018
	echo i386-unknown-lynxos${UNAME_RELEASE}
1019
	exit 0 ;;
1020
    TSUNAMI:LynxOS:2.*:*)
1099
    TSUNAMI:LynxOS:2.*:*)
1021
	echo sparc-unknown-lynxos${UNAME_RELEASE}
1100
	echo sparc-unknown-lynxos${UNAME_RELEASE}
1022
	exit 0 ;;
1101
	exit ;;
1023
    rs6000:LynxOS:2.*:*)
1102
    rs6000:LynxOS:2.*:*)
1024
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1103
	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1025
	exit 0 ;;
1104
	exit ;;
1026
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1105
    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1027
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1106
	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1028
	exit 0 ;;
1107
	exit ;;
1029
    SM[BE]S:UNIX_SV:*:*)
1108
    SM[BE]S:UNIX_SV:*:*)
1030
	echo mips-dde-sysv${UNAME_RELEASE}
1109
	echo mips-dde-sysv${UNAME_RELEASE}
1031
	exit 0 ;;
1110
	exit ;;
1032
    RM*:ReliantUNIX-*:*:*)
1111
    RM*:ReliantUNIX-*:*:*)
1033
	echo mips-sni-sysv4
1112
	echo mips-sni-sysv4
1034
	exit 0 ;;
1113
	exit ;;
1035
    RM*:SINIX-*:*:*)
1114
    RM*:SINIX-*:*:*)
1036
	echo mips-sni-sysv4
1115
	echo mips-sni-sysv4
1037
	exit 0 ;;
1116
	exit ;;
1038
    *:SINIX-*:*:*)
1117
    *:SINIX-*:*:*)
1039
	if uname -p 2>/dev/null >/dev/null ; then
1118
	if uname -p 2>/dev/null >/dev/null ; then
1040
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
1119
		UNAME_MACHINE=`(uname -p) 2>/dev/null`
Lines 1042-1105 Link Here
1042
	else
1121
	else
1043
		echo ns32k-sni-sysv
1122
		echo ns32k-sni-sysv
1044
	fi
1123
	fi
1045
	exit 0 ;;
1124
	exit ;;
1046
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1125
    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1047
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1126
                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1048
        echo i586-unisys-sysv4
1127
        echo i586-unisys-sysv4
1049
        exit 0 ;;
1128
        exit ;;
1050
    *:UNIX_System_V:4*:FTX*)
1129
    *:UNIX_System_V:4*:FTX*)
1051
	# From Gerald Hewes <hewes@openmarket.com>.
1130
	# From Gerald Hewes <hewes@openmarket.com>.
1052
	# How about differentiating between stratus architectures? -djm
1131
	# How about differentiating between stratus architectures? -djm
1053
	echo hppa1.1-stratus-sysv4
1132
	echo hppa1.1-stratus-sysv4
1054
	exit 0 ;;
1133
	exit ;;
1055
    *:*:*:FTX*)
1134
    *:*:*:FTX*)
1056
	# From seanf@swdc.stratus.com.
1135
	# From seanf@swdc.stratus.com.
1057
	echo i860-stratus-sysv4
1136
	echo i860-stratus-sysv4
1058
	exit 0 ;;
1137
	exit ;;
1138
    i*86:VOS:*:*)
1139
	# From Paul.Green@stratus.com.
1140
	echo ${UNAME_MACHINE}-stratus-vos
1141
	exit ;;
1059
    *:VOS:*:*)
1142
    *:VOS:*:*)
1060
	# From Paul.Green@stratus.com.
1143
	# From Paul.Green@stratus.com.
1061
	echo hppa1.1-stratus-vos
1144
	echo hppa1.1-stratus-vos
1062
	exit 0 ;;
1145
	exit ;;
1063
    mc68*:A/UX:*:*)
1146
    mc68*:A/UX:*:*)
1064
	echo m68k-apple-aux${UNAME_RELEASE}
1147
	echo m68k-apple-aux${UNAME_RELEASE}
1065
	exit 0 ;;
1148
	exit ;;
1066
    news*:NEWS-OS:6*:*)
1149
    news*:NEWS-OS:6*:*)
1067
	echo mips-sony-newsos6
1150
	echo mips-sony-newsos6
1068
	exit 0 ;;
1151
	exit ;;
1069
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1152
    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1070
	if [ -d /usr/nec ]; then
1153
	if [ -d /usr/nec ]; then
1071
	        echo mips-nec-sysv${UNAME_RELEASE}
1154
	        echo mips-nec-sysv${UNAME_RELEASE}
1072
	else
1155
	else
1073
	        echo mips-unknown-sysv${UNAME_RELEASE}
1156
	        echo mips-unknown-sysv${UNAME_RELEASE}
1074
	fi
1157
	fi
1075
        exit 0 ;;
1158
        exit ;;
1076
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1159
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1077
	echo powerpc-be-beos
1160
	echo powerpc-be-beos
1078
	exit 0 ;;
1161
	exit ;;
1079
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1162
    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
1080
	echo powerpc-apple-beos
1163
	echo powerpc-apple-beos
1081
	exit 0 ;;
1164
	exit ;;
1082
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1165
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1083
	echo i586-pc-beos
1166
	echo i586-pc-beos
1084
	exit 0 ;;
1167
	exit ;;
1085
    SX-4:SUPER-UX:*:*)
1168
    SX-4:SUPER-UX:*:*)
1086
	echo sx4-nec-superux${UNAME_RELEASE}
1169
	echo sx4-nec-superux${UNAME_RELEASE}
1087
	exit 0 ;;
1170
	exit ;;
1088
    SX-5:SUPER-UX:*:*)
1171
    SX-5:SUPER-UX:*:*)
1089
	echo sx5-nec-superux${UNAME_RELEASE}
1172
	echo sx5-nec-superux${UNAME_RELEASE}
1090
	exit 0 ;;
1173
	exit ;;
1091
    SX-6:SUPER-UX:*:*)
1174
    SX-6:SUPER-UX:*:*)
1092
	echo sx6-nec-superux${UNAME_RELEASE}
1175
	echo sx6-nec-superux${UNAME_RELEASE}
1093
	exit 0 ;;
1176
	exit ;;
1094
    Power*:Rhapsody:*:*)
1177
    Power*:Rhapsody:*:*)
1095
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1178
	echo powerpc-apple-rhapsody${UNAME_RELEASE}
1096
	exit 0 ;;
1179
	exit ;;
1097
    *:Rhapsody:*:*)
1180
    *:Rhapsody:*:*)
1098
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1181
	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
1099
	exit 0 ;;
1182
	exit ;;
1100
    *:Darwin:*:*)
1183
    *:Darwin:*:*)
1101
	echo `uname -p`-apple-darwin${UNAME_RELEASE}
1184
	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1102
	exit 0 ;;
1185
	case $UNAME_PROCESSOR in
1186
	    *86) UNAME_PROCESSOR=i686 ;;
1187
	    unknown) UNAME_PROCESSOR=powerpc ;;
1188
	esac
1189
	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1190
	exit ;;
1103
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1191
    *:procnto*:*:* | *:QNX:[0123456789]*:*)
1104
	UNAME_PROCESSOR=`uname -p`
1192
	UNAME_PROCESSOR=`uname -p`
1105
	if test "$UNAME_PROCESSOR" = "x86"; then
1193
	if test "$UNAME_PROCESSOR" = "x86"; then
Lines 1107-1128 Link Here
1107
		UNAME_MACHINE=pc
1195
		UNAME_MACHINE=pc
1108
	fi
1196
	fi
1109
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1197
	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1110
	exit 0 ;;
1198
	exit ;;
1111
    *:QNX:*:4*)
1199
    *:QNX:*:4*)
1112
	echo i386-pc-qnx
1200
	echo i386-pc-qnx
1113
	exit 0 ;;
1201
	exit ;;
1114
    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
1202
    NSE-?:NONSTOP_KERNEL:*:*)
1203
	echo nse-tandem-nsk${UNAME_RELEASE}
1204
	exit ;;
1205
    NSR-?:NONSTOP_KERNEL:*:*)
1115
	echo nsr-tandem-nsk${UNAME_RELEASE}
1206
	echo nsr-tandem-nsk${UNAME_RELEASE}
1116
	exit 0 ;;
1207
	exit ;;
1117
    *:NonStop-UX:*:*)
1208
    *:NonStop-UX:*:*)
1118
	echo mips-compaq-nonstopux
1209
	echo mips-compaq-nonstopux
1119
	exit 0 ;;
1210
	exit ;;
1120
    BS2000:POSIX*:*:*)
1211
    BS2000:POSIX*:*:*)
1121
	echo bs2000-siemens-sysv
1212
	echo bs2000-siemens-sysv
1122
	exit 0 ;;
1213
	exit ;;
1123
    DS/*:UNIX_System_V:*:*)
1214
    DS/*:UNIX_System_V:*:*)
1124
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1215
	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
1125
	exit 0 ;;
1216
	exit ;;
1126
    *:Plan9:*:*)
1217
    *:Plan9:*:*)
1127
	# "uname -m" is not consistent, so use $cputype instead. 386
1218
	# "uname -m" is not consistent, so use $cputype instead. 386
1128
	# is converted to i386 for consistency with other x86
1219
	# is converted to i386 for consistency with other x86
Lines 1133-1168 Link Here
1133
	    UNAME_MACHINE="$cputype"
1224
	    UNAME_MACHINE="$cputype"
1134
	fi
1225
	fi
1135
	echo ${UNAME_MACHINE}-unknown-plan9
1226
	echo ${UNAME_MACHINE}-unknown-plan9
1136
	exit 0 ;;
1227
	exit ;;
1137
    i*86:OS/2:*:*)
1138
	# If we were able to find `uname', then EMX Unix compatibility
1139
	# is probably installed.
1140
	echo ${UNAME_MACHINE}-pc-os2-emx
1141
	exit 0 ;;
1142
    *:TOPS-10:*:*)
1228
    *:TOPS-10:*:*)
1143
	echo pdp10-unknown-tops10
1229
	echo pdp10-unknown-tops10
1144
	exit 0 ;;
1230
	exit ;;
1145
    *:TENEX:*:*)
1231
    *:TENEX:*:*)
1146
	echo pdp10-unknown-tenex
1232
	echo pdp10-unknown-tenex
1147
	exit 0 ;;
1233
	exit ;;
1148
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1234
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
1149
	echo pdp10-dec-tops20
1235
	echo pdp10-dec-tops20
1150
	exit 0 ;;
1236
	exit ;;
1151
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1237
    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
1152
	echo pdp10-xkl-tops20
1238
	echo pdp10-xkl-tops20
1153
	exit 0 ;;
1239
	exit ;;
1154
    *:TOPS-20:*:*)
1240
    *:TOPS-20:*:*)
1155
	echo pdp10-unknown-tops20
1241
	echo pdp10-unknown-tops20
1156
	exit 0 ;;
1242
	exit ;;
1157
    *:ITS:*:*)
1243
    *:ITS:*:*)
1158
	echo pdp10-unknown-its
1244
	echo pdp10-unknown-its
1159
	exit 0 ;;
1245
	exit ;;
1160
    i*86:XTS-300:*:STOP)
1246
    SEI:*:*:SEIUX)
1161
	echo ${UNAME_MACHINE}-unknown-stop
1247
        echo mips-sei-seiux${UNAME_RELEASE}
1162
	exit 0 ;;
1248
	exit ;;
1163
    i*86:atheos:*:*)
1249
    *:DragonFly:*:*)
1164
	echo ${UNAME_MACHINE}-unknown-atheos
1250
	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1165
	exit 0 ;;
1251
	exit ;;
1252
    *:*VMS:*:*)
1253
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1254
	case "${UNAME_MACHINE}" in
1255
	    A*) echo alpha-dec-vms ; exit ;;
1256
	    I*) echo ia64-dec-vms ; exit ;;
1257
	    V*) echo vax-dec-vms ; exit ;;
1258
	esac ;;
1259
    *:XENIX:*:SysV)
1260
	echo i386-pc-xenix
1261
	exit ;;
1262
    i*86:skyos:*:*)
1263
	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1264
	exit ;;
1166
esac
1265
esac
1167
1266
1168
#echo '(No uname command or uname output not recognized.)' 1>&2
1267
#echo '(No uname command or uname output not recognized.)' 1>&2
Lines 1194-1200 Link Here
1194
#endif
1293
#endif
1195
1294
1196
#if defined (__arm) && defined (__acorn) && defined (__unix)
1295
#if defined (__arm) && defined (__acorn) && defined (__unix)
1197
  printf ("arm-acorn-riscix"); exit (0);
1296
  printf ("arm-acorn-riscix\n"); exit (0);
1198
#endif
1297
#endif
1199
1298
1200
#if defined (hp300) && !defined (hpux)
1299
#if defined (hp300) && !defined (hpux)
Lines 1283-1294 Link Here
1283
}
1382
}
1284
EOF
1383
EOF
1285
1384
1286
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
1385
$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1287
rm -f $dummy.c $dummy && rmdir $tmpdir
1386
	{ echo "$SYSTEM_NAME"; exit; }
1288
1387
1289
# Apollos put the system type in the environment.
1388
# Apollos put the system type in the environment.
1290
1389
1291
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
1390
test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1292
1391
1293
# Convex versions that predate uname can use getsysinfo(1)
1392
# Convex versions that predate uname can use getsysinfo(1)
1294
1393
Lines 1297-1318 Link Here
1297
    case `getsysinfo -f cpu_type` in
1396
    case `getsysinfo -f cpu_type` in
1298
    c1*)
1397
    c1*)
1299
	echo c1-convex-bsd
1398
	echo c1-convex-bsd
1300
	exit 0 ;;
1399
	exit ;;
1301
    c2*)
1400
    c2*)
1302
	if getsysinfo -f scalar_acc
1401
	if getsysinfo -f scalar_acc
1303
	then echo c32-convex-bsd
1402
	then echo c32-convex-bsd
1304
	else echo c2-convex-bsd
1403
	else echo c2-convex-bsd
1305
	fi
1404
	fi
1306
	exit 0 ;;
1405
	exit ;;
1307
    c34*)
1406
    c34*)
1308
	echo c34-convex-bsd
1407
	echo c34-convex-bsd
1309
	exit 0 ;;
1408
	exit ;;
1310
    c38*)
1409
    c38*)
1311
	echo c38-convex-bsd
1410
	echo c38-convex-bsd
1312
	exit 0 ;;
1411
	exit ;;
1313
    c4*)
1412
    c4*)
1314
	echo c4-convex-bsd
1413
	echo c4-convex-bsd
1315
	exit 0 ;;
1414
	exit ;;
1316
    esac
1415
    esac
1317
fi
1416
fi
1318
1417
Lines 1323-1329 Link Here
1323
the operating system you are using. It is advised that you
1422
the operating system you are using. It is advised that you
1324
download the most up to date version of the config scripts from
1423
download the most up to date version of the config scripts from
1325
1424
1326
    ftp://ftp.gnu.org/pub/gnu/config/
1425
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
1426
and
1427
  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
1327
1428
1328
If the version you run ($0) is already up to date, please
1429
If the version you run ($0) is already up to date, please
1329
send the following data and any information you think might be
1430
send the following data and any information you think might be
(-)eventwatcher-0.4.3-orig/admin/config.pl (-5 / +7 lines)
Lines 25-32 Link Here
25
25
26
#   You should have received a copy of the GNU Library General Public License
26
#   You should have received a copy of the GNU Library General Public License
27
#   along with this library; see the file COPYING.LIB.  If not, write to
27
#   along with this library; see the file COPYING.LIB.  If not, write to
28
#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
28
#   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
29
#   Boston, MA 02111-1307, USA.
29
#   Boston, MA 02110-1301, USA.
30
30
31
use strict;
31
use strict;
32
32
Lines 53-58 Link Here
53
53
54
open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
54
open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
55
my @subs = <CF>;
55
my @subs = <CF>;
56
my $pat;
56
close(CF);
57
close(CF);
57
chomp @subs;
58
chomp @subs;
58
@comp_match=();
59
@comp_match=();
Lines 60-66 Link Here
60
61
61
if ($bad_perl) {
62
if ($bad_perl) {
62
    print "Using perl older than version 5.005\n";
63
    print "Using perl older than version 5.005\n";
63
    foreach my $pat (@subs) {
64
    foreach $pat (@subs) {
64
	if (  ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
65
	if (  ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
65
	   || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
66
	   || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
66
           || ($pat =~ m/s,([^,]*),(.*),;t/)
67
           || ($pat =~ m/s,([^,]*),(.*),;t/)
Lines 85-91 Link Here
85
	}
86
	}
86
    }
87
    }
87
} else {
88
} else {
88
    foreach my $pat (@subs) {
89
    foreach $pat (@subs) {
89
       if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
90
       if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
90
            ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
91
            ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
91
            ($pat =~ /s,([^,]*),(.*),;t/) ) {
92
            ($pat =~ /s,([^,]*),(.*),;t/) ) {
Lines 192-199 Link Here
192
    my $filedata;
193
    my $filedata;
193
    my @infiles=split(' ', $infiles);
194
    my @infiles=split(' ', $infiles);
194
    my $i=0;
195
    my $i=0;
196
    my $name;
195
197
196
    foreach my $name (@infiles) {
198
    foreach $name (@infiles) {
197
	if (open(CF, "< $name")) {
199
	if (open(CF, "< $name")) {
198
	    while (<CF>) {
200
	    while (<CF>) {
199
		$filedata .= $_;
201
		$filedata .= $_;
(-)eventwatcher-0.4.3-orig/admin/config.sub (-64 / +169 lines)
Lines 1-9 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# Configuration validation subroutine script.
2
# Configuration validation subroutine script.
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3
#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
#   2000, 2001, 2002 Free Software Foundation, Inc.
4
#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
5
5
6
timestamp='2002-09-05'
6
timestamp='2005-07-01'
7
7
8
# This file is (in principle) common to ALL GNU software.
8
# This file is (in principle) common to ALL GNU software.
9
# The presence of a machine in this file suggests that SOME GNU software
9
# The presence of a machine in this file suggests that SOME GNU software
Lines 21-34 Link Here
21
#
21
#
22
# You should have received a copy of the GNU General Public License
22
# You should have received a copy of the GNU General Public License
23
# along with this program; if not, write to the Free Software
23
# along with this program; if not, write to the Free Software
24
# Foundation, Inc., 59 Temple Place - Suite 330,
24
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25
# Boston, MA 02111-1307, USA.
25
# 02110-1301, USA.
26
26
#
27
# As a special exception to the GNU General Public License, if you
27
# As a special exception to the GNU General Public License, if you
28
# distribute this file as part of a program that contains a
28
# distribute this file as part of a program that contains a
29
# configuration script generated by Autoconf, you may include it under
29
# configuration script generated by Autoconf, you may include it under
30
# the same distribution terms that you use for the rest of that program.
30
# the same distribution terms that you use for the rest of that program.
31
31
32
32
# Please send patches to <config-patches@gnu.org>.  Submit a context
33
# Please send patches to <config-patches@gnu.org>.  Submit a context
33
# diff and a properly formatted ChangeLog entry.
34
# diff and a properly formatted ChangeLog entry.
34
#
35
#
Lines 70-76 Link Here
70
version="\
71
version="\
71
GNU config.sub ($timestamp)
72
GNU config.sub ($timestamp)
72
73
73
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
74
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
74
Free Software Foundation, Inc.
75
Free Software Foundation, Inc.
75
76
76
This is free software; see the source for copying conditions.  There is NO
77
This is free software; see the source for copying conditions.  There is NO
Lines 83-93 Link Here
83
while test $# -gt 0 ; do
84
while test $# -gt 0 ; do
84
  case $1 in
85
  case $1 in
85
    --time-stamp | --time* | -t )
86
    --time-stamp | --time* | -t )
86
       echo "$timestamp" ; exit 0 ;;
87
       echo "$timestamp" ; exit ;;
87
    --version | -v )
88
    --version | -v )
88
       echo "$version" ; exit 0 ;;
89
       echo "$version" ; exit ;;
89
    --help | --h* | -h )
90
    --help | --h* | -h )
90
       echo "$usage"; exit 0 ;;
91
       echo "$usage"; exit ;;
91
    -- )     # Stop option processing
92
    -- )     # Stop option processing
92
       shift; break ;;
93
       shift; break ;;
93
    - )	# Use stdin as input.
94
    - )	# Use stdin as input.
Lines 99-105 Link Here
99
    *local*)
100
    *local*)
100
       # First pass through any local machine types.
101
       # First pass through any local machine types.
101
       echo $1
102
       echo $1
102
       exit 0;;
103
       exit ;;
103
104
104
    * )
105
    * )
105
       break ;;
106
       break ;;
Lines 118-124 Link Here
118
# Here we must recognize all the valid KERNEL-OS combinations.
119
# Here we must recognize all the valid KERNEL-OS combinations.
119
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
120
case $maybe_os in
121
case $maybe_os in
121
  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
122
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
123
  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
122
    os=-$maybe_os
124
    os=-$maybe_os
123
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
125
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
124
    ;;
126
    ;;
Lines 144-150 Link Here
144
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
146
	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
145
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
147
	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
146
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
148
	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
147
	-apple | -axis)
149
	-apple | -axis | -knuth | -cray)
148
		os=
150
		os=
149
		basic_machine=$1
151
		basic_machine=$1
150
		;;
152
		;;
Lines 228-241 Link Here
228
	| a29k \
230
	| a29k \
229
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
231
	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
230
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
232
	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
233
	| am33_2.0 \
231
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
234
	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
232
	| clipper \
235
	| bfin \
236
	| c4x | clipper \
233
	| d10v | d30v | dlx | dsp16xx \
237
	| d10v | d30v | dlx | dsp16xx \
234
	| fr30 | frv \
238
	| fr30 | frv \
235
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
239
	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
236
	| i370 | i860 | i960 | ia64 \
240
	| i370 | i860 | i960 | ia64 \
237
	| ip2k \
241
	| ip2k | iq2000 \
238
	| m32r | m68000 | m68k | m88k | mcore \
242
	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
239
	| mips | mipsbe | mipseb | mipsel | mipsle \
243
	| mips | mipsbe | mipseb | mipsel | mipsle \
240
	| mips16 \
244
	| mips16 \
241
	| mips64 | mips64el \
245
	| mips64 | mips64el \
Lines 244-271 Link Here
244
	| mips64vr4100 | mips64vr4100el \
248
	| mips64vr4100 | mips64vr4100el \
245
	| mips64vr4300 | mips64vr4300el \
249
	| mips64vr4300 | mips64vr4300el \
246
	| mips64vr5000 | mips64vr5000el \
250
	| mips64vr5000 | mips64vr5000el \
251
	| mips64vr5900 | mips64vr5900el \
247
	| mipsisa32 | mipsisa32el \
252
	| mipsisa32 | mipsisa32el \
253
	| mipsisa32r2 | mipsisa32r2el \
248
	| mipsisa64 | mipsisa64el \
254
	| mipsisa64 | mipsisa64el \
255
	| mipsisa64r2 | mipsisa64r2el \
249
	| mipsisa64sb1 | mipsisa64sb1el \
256
	| mipsisa64sb1 | mipsisa64sb1el \
250
	| mipsisa64sr71k | mipsisa64sr71kel \
257
	| mipsisa64sr71k | mipsisa64sr71kel \
251
	| mipstx39 | mipstx39el \
258
	| mipstx39 | mipstx39el \
252
	| mn10200 | mn10300 \
259
	| mn10200 | mn10300 \
260
	| ms1 \
261
	| msp430 \
253
	| ns16k | ns32k \
262
	| ns16k | ns32k \
254
	| openrisc | or32 \
263
	| or32 \
255
	| pdp10 | pdp11 | pj | pjl \
264
	| pdp10 | pdp11 | pj | pjl \
256
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
265
	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
257
	| pyramid \
266
	| pyramid \
258
	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
267
	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
259
	| sh64 | sh64le \
268
	| sh64 | sh64le \
260
	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
269
	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
270
	| sparcv8 | sparcv9 | sparcv9b \
261
	| strongarm \
271
	| strongarm \
262
	| tahoe | thumb | tic80 | tron \
272
	| tahoe | thumb | tic4x | tic80 | tron \
263
	| v850 | v850e \
273
	| v850 | v850e \
264
	| we32k \
274
	| we32k \
265
	| x86 | xscale | xstormy16 | xtensa \
275
	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
266
	| z8k)
276
	| z8k)
267
		basic_machine=$basic_machine-unknown
277
		basic_machine=$basic_machine-unknown
268
		;;
278
		;;
279
	m32c)
280
		basic_machine=$basic_machine-unknown
281
		;;
269
	m6811 | m68hc11 | m6812 | m68hc12)
282
	m6811 | m68hc11 | m6812 | m68hc12)
270
		# Motorola 68HC11/12.
283
		# Motorola 68HC11/12.
271
		basic_machine=$basic_machine-unknown
284
		basic_machine=$basic_machine-unknown
Lines 293-311 Link Here
293
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
306
	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
294
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
307
	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
295
	| avr-* \
308
	| avr-* \
296
	| bs2000-* \
309
	| bfin-* | bs2000-* \
297
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
310
	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
298
	| clipper-* | cydra-* \
311
	| clipper-* | craynv-* | cydra-* \
299
	| d10v-* | d30v-* | dlx-* \
312
	| d10v-* | d30v-* | dlx-* \
300
	| elxsi-* \
313
	| elxsi-* \
301
	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
314
	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
302
	| h8300-* | h8500-* \
315
	| h8300-* | h8500-* \
303
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
316
	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
304
	| i*86-* | i860-* | i960-* | ia64-* \
317
	| i*86-* | i860-* | i960-* | ia64-* \
305
	| ip2k-* \
318
	| ip2k-* | iq2000-* \
306
	| m32r-* \
319
	| m32r-* | m32rle-* \
307
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
320
	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
308
	| m88110-* | m88k-* | mcore-* \
321
	| m88110-* | m88k-* | maxq-* | mcore-* \
309
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
322
	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
310
	| mips16-* \
323
	| mips16-* \
311
	| mips64-* | mips64el-* \
324
	| mips64-* | mips64el-* \
Lines 314-342 Link Here
314
	| mips64vr4100-* | mips64vr4100el-* \
327
	| mips64vr4100-* | mips64vr4100el-* \
315
	| mips64vr4300-* | mips64vr4300el-* \
328
	| mips64vr4300-* | mips64vr4300el-* \
316
	| mips64vr5000-* | mips64vr5000el-* \
329
	| mips64vr5000-* | mips64vr5000el-* \
330
	| mips64vr5900-* | mips64vr5900el-* \
317
	| mipsisa32-* | mipsisa32el-* \
331
	| mipsisa32-* | mipsisa32el-* \
332
	| mipsisa32r2-* | mipsisa32r2el-* \
318
	| mipsisa64-* | mipsisa64el-* \
333
	| mipsisa64-* | mipsisa64el-* \
334
	| mipsisa64r2-* | mipsisa64r2el-* \
319
	| mipsisa64sb1-* | mipsisa64sb1el-* \
335
	| mipsisa64sb1-* | mipsisa64sb1el-* \
320
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
336
	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
321
	| mipstx39 | mipstx39el \
337
	| mipstx39-* | mipstx39el-* \
338
	| mmix-* \
339
	| ms1-* \
340
	| msp430-* \
322
	| none-* | np1-* | ns16k-* | ns32k-* \
341
	| none-* | np1-* | ns16k-* | ns32k-* \
323
	| orion-* \
342
	| orion-* \
324
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
343
	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
325
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
344
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
326
	| pyramid-* \
345
	| pyramid-* \
327
	| romp-* | rs6000-* \
346
	| romp-* | rs6000-* \
328
	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
347
	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
329
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
348
	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
330
	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
349
	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
331
	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
350
	| sparclite-* \
332
	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
351
	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
352
	| tahoe-* | thumb-* \
353
	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
354
	| tron-* \
333
	| v850-* | v850e-* | vax-* \
355
	| v850-* | v850e-* | vax-* \
334
	| we32k-* \
356
	| we32k-* \
335
	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
357
	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
336
	| xtensa-* \
358
	| xstormy16-* | xtensa-* \
337
	| ymp-* \
359
	| ymp-* \
338
	| z8k-*)
360
	| z8k-*)
339
		;;
361
		;;
362
	m32c-*)
363
		;;
340
	# Recognize the various machine names and aliases which stand
364
	# Recognize the various machine names and aliases which stand
341
	# for a CPU type and a company and sometimes even an OS.
365
	# for a CPU type and a company and sometimes even an OS.
342
	386bsd)
366
	386bsd)
Lines 353-358 Link Here
353
		basic_machine=a29k-amd
377
		basic_machine=a29k-amd
354
		os=-udi
378
		os=-udi
355
		;;
379
		;;
380
    	abacus)
381
		basic_machine=abacus-unknown
382
		;;
356
	adobe68k)
383
	adobe68k)
357
		basic_machine=m68010-adobe
384
		basic_machine=m68010-adobe
358
		os=-scout
385
		os=-scout
Lines 367-372 Link Here
367
		basic_machine=a29k-none
394
		basic_machine=a29k-none
368
		os=-bsd
395
		os=-bsd
369
		;;
396
		;;
397
	amd64)
398
		basic_machine=x86_64-pc
399
		;;
400
	amd64-*)
401
		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
402
		;;
370
	amdahl)
403
	amdahl)
371
		basic_machine=580-amdahl
404
		basic_machine=580-amdahl
372
		os=-sysv
405
		os=-sysv
Lines 426-437 Link Here
426
		basic_machine=j90-cray
459
		basic_machine=j90-cray
427
		os=-unicos
460
		os=-unicos
428
		;;
461
		;;
462
	craynv)
463
		basic_machine=craynv-cray
464
		os=-unicosmp
465
		;;
466
	cr16c)
467
		basic_machine=cr16c-unknown
468
		os=-elf
469
		;;
429
	crds | unos)
470
	crds | unos)
430
		basic_machine=m68k-crds
471
		basic_machine=m68k-crds
431
		;;
472
		;;
473
	crisv32 | crisv32-* | etraxfs*)
474
		basic_machine=crisv32-axis
475
		;;
432
	cris | cris-* | etrax*)
476
	cris | cris-* | etrax*)
433
		basic_machine=cris-axis
477
		basic_machine=cris-axis
434
		;;
478
		;;
479
	crx)
480
		basic_machine=crx-unknown
481
		os=-elf
482
		;;
435
	da30 | da30-*)
483
	da30 | da30-*)
436
		basic_machine=m68k-da30
484
		basic_machine=m68k-da30
437
		;;
485
		;;
Lines 454-459 Link Here
454
		basic_machine=m88k-motorola
502
		basic_machine=m88k-motorola
455
		os=-sysv3
503
		os=-sysv3
456
		;;
504
		;;
505
	djgpp)
506
		basic_machine=i586-pc
507
		os=-msdosdjgpp
508
		;;
457
	dpx20 | dpx20-*)
509
	dpx20 | dpx20-*)
458
		basic_machine=rs6000-bull
510
		basic_machine=rs6000-bull
459
		os=-bosx
511
		os=-bosx
Lines 632-641 Link Here
632
	mips3*)
684
	mips3*)
633
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
685
		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
634
		;;
686
		;;
635
	mmix*)
636
		basic_machine=mmix-knuth
637
		os=-mmixware
638
		;;
639
	monitor)
687
	monitor)
640
		basic_machine=m68k-rom68k
688
		basic_machine=m68k-rom68k
641
		os=-coff
689
		os=-coff
Lines 723-731 Link Here
723
		basic_machine=hppa1.1-oki
771
		basic_machine=hppa1.1-oki
724
		os=-proelf
772
		os=-proelf
725
		;;
773
		;;
726
	or32 | or32-*)
774
	openrisc | openrisc-*)
727
		basic_machine=or32-unknown
775
		basic_machine=or32-unknown
728
		os=-coff
776
		;;
777
	os400)
778
		basic_machine=powerpc-ibm
779
		os=-os400
729
		;;
780
		;;
730
	OSE68000 | ose68000)
781
	OSE68000 | ose68000)
731
		basic_machine=m68000-ericsson
782
		basic_machine=m68000-ericsson
Lines 758-775 Link Here
758
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
809
	pentiumpro | p6 | 6x86 | athlon | athlon_*)
759
		basic_machine=i686-pc
810
		basic_machine=i686-pc
760
		;;
811
		;;
761
	pentiumii | pentium2)
812
	pentiumii | pentium2 | pentiumiii | pentium3)
762
		basic_machine=i686-pc
813
		basic_machine=i686-pc
763
		;;
814
		;;
815
	pentium4)
816
		basic_machine=i786-pc
817
		;;
764
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
818
	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
765
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
819
		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
766
		;;
820
		;;
767
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
821
	pentiumpro-* | p6-* | 6x86-* | athlon-*)
768
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
822
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
769
		;;
823
		;;
770
	pentiumii-* | pentium2-*)
824
	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
771
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
825
		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
772
		;;
826
		;;
827
	pentium4-*)
828
		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
829
		;;
773
	pn)
830
	pn)
774
		basic_machine=pn-gould
831
		basic_machine=pn-gould
775
		;;
832
		;;
Lines 828-833 Link Here
828
	sb1el)
885
	sb1el)
829
		basic_machine=mipsisa64sb1el-unknown
886
		basic_machine=mipsisa64sb1el-unknown
830
		;;
887
		;;
888
	sei)
889
		basic_machine=mips-sei
890
		os=-seiux
891
		;;
831
	sequent)
892
	sequent)
832
		basic_machine=i386-sequent
893
		basic_machine=i386-sequent
833
		;;
894
		;;
Lines 835-840 Link Here
835
		basic_machine=sh-hitachi
896
		basic_machine=sh-hitachi
836
		os=-hms
897
		os=-hms
837
		;;
898
		;;
899
	sh64)
900
		basic_machine=sh64-unknown
901
		;;
838
	sparclite-wrs | simso-wrs)
902
	sparclite-wrs | simso-wrs)
839
		basic_machine=sparclite-wrs
903
		basic_machine=sparclite-wrs
840
		os=-vxworks
904
		os=-vxworks
Lines 901-910 Link Here
901
		basic_machine=i386-sequent
965
		basic_machine=i386-sequent
902
		os=-dynix
966
		os=-dynix
903
		;;
967
		;;
904
	t3d)
905
		basic_machine=alpha-cray
906
		os=-unicos
907
		;;
908
	t3e)
968
	t3e)
909
		basic_machine=alphaev5-cray
969
		basic_machine=alphaev5-cray
910
		os=-unicos
970
		os=-unicos
Lines 913-926 Link Here
913
		basic_machine=t90-cray
973
		basic_machine=t90-cray
914
		os=-unicos
974
		os=-unicos
915
		;;
975
		;;
916
        tic4x | c4x*)
917
		basic_machine=tic4x-unknown
918
		os=-coff
919
		;;
920
	tic54x | c54x*)
976
	tic54x | c54x*)
921
		basic_machine=tic54x-unknown
977
		basic_machine=tic54x-unknown
922
		os=-coff
978
		os=-coff
923
		;;
979
		;;
980
	tic55x | c55x*)
981
		basic_machine=tic55x-unknown
982
		os=-coff
983
		;;
984
	tic6x | c6x*)
985
		basic_machine=tic6x-unknown
986
		os=-coff
987
		;;
924
	tx39)
988
	tx39)
925
		basic_machine=mipstx39-unknown
989
		basic_machine=mipstx39-unknown
926
		;;
990
		;;
Lines 934-939 Link Here
934
	tower | tower-32)
998
	tower | tower-32)
935
		basic_machine=m68k-ncr
999
		basic_machine=m68k-ncr
936
		;;
1000
		;;
1001
	tpf)
1002
		basic_machine=s390x-ibm
1003
		os=-tpf
1004
		;;
937
	udi29k)
1005
	udi29k)
938
		basic_machine=a29k-amd
1006
		basic_machine=a29k-amd
939
		os=-udi
1007
		os=-udi
Lines 977-985 Link Here
977
		basic_machine=hppa1.1-winbond
1045
		basic_machine=hppa1.1-winbond
978
		os=-proelf
1046
		os=-proelf
979
		;;
1047
		;;
980
	windows32)
1048
	xbox)
981
		basic_machine=i386-pc
1049
		basic_machine=i686-pc
982
		os=-windows32-msvcrt
1050
		os=-mingw32
983
		;;
1051
		;;
984
	xps | xps100)
1052
	xps | xps100)
985
		basic_machine=xps100-honeywell
1053
		basic_machine=xps100-honeywell
Lines 1011-1016 Link Here
1011
	romp)
1079
	romp)
1012
		basic_machine=romp-ibm
1080
		basic_machine=romp-ibm
1013
		;;
1081
		;;
1082
	mmix)
1083
		basic_machine=mmix-knuth
1084
		;;
1014
	rs6000)
1085
	rs6000)
1015
		basic_machine=rs6000-ibm
1086
		basic_machine=rs6000-ibm
1016
		;;
1087
		;;
Lines 1027-1039 Link Here
1027
	we32k)
1098
	we32k)
1028
		basic_machine=we32k-att
1099
		basic_machine=we32k-att
1029
		;;
1100
		;;
1030
	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
1101
	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
1031
		basic_machine=sh-unknown
1102
		basic_machine=sh-unknown
1032
		;;
1103
		;;
1033
	sh64)
1104
	sparc | sparcv8 | sparcv9 | sparcv9b)
1034
		basic_machine=sh64-unknown
1035
		;;
1036
	sparc | sparcv9 | sparcv9b)
1037
		basic_machine=sparc-sun
1105
		basic_machine=sparc-sun
1038
		;;
1106
		;;
1039
	cydra)
1107
	cydra)
Lines 1106-1123 Link Here
1106
	      | -aos* \
1174
	      | -aos* \
1107
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1175
	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1108
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1176
	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1109
	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
1177
	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1110
	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1178
	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1179
	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1111
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1180
	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1112
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1181
	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1113
	      | -chorusos* | -chorusrdb* \
1182
	      | -chorusos* | -chorusrdb* \
1114
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1183
	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1115
	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1184
	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1116
	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
1185
	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1117
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1186
	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1118
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1187
	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1119
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1188
	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1120
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
1189
	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1190
	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
1121
	# Remember, each alternative MUST END IN *, to match a version number.
1191
	# Remember, each alternative MUST END IN *, to match a version number.
1122
		;;
1192
		;;
1123
	-qnx*)
1193
	-qnx*)
Lines 1129-1136 Link Here
1129
			;;
1199
			;;
1130
		esac
1200
		esac
1131
		;;
1201
		;;
1202
	-nto-qnx*)
1203
		;;
1132
	-nto*)
1204
	-nto*)
1133
		os=-nto-qnx
1205
		os=`echo $os | sed -e 's|nto|nto-qnx|'`
1134
		;;
1206
		;;
1135
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1207
	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1136
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
1208
	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
Lines 1139-1144 Link Here
1139
	-mac*)
1211
	-mac*)
1140
		os=`echo $os | sed -e 's|mac|macos|'`
1212
		os=`echo $os | sed -e 's|mac|macos|'`
1141
		;;
1213
		;;
1214
	-linux-dietlibc)
1215
		os=-linux-dietlibc
1216
		;;
1142
	-linux*)
1217
	-linux*)
1143
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1218
		os=`echo $os | sed -e 's|linux|linux-gnu|'`
1144
		;;
1219
		;;
Lines 1151-1156 Link Here
1151
	-opened*)
1226
	-opened*)
1152
		os=-openedition
1227
		os=-openedition
1153
		;;
1228
		;;
1229
        -os400*)
1230
		os=-os400
1231
		;;
1154
	-wince*)
1232
	-wince*)
1155
		os=-wince
1233
		os=-wince
1156
		;;
1234
		;;
Lines 1172-1177 Link Here
1172
	-atheos*)
1250
	-atheos*)
1173
		os=-atheos
1251
		os=-atheos
1174
		;;
1252
		;;
1253
	-syllable*)
1254
		os=-syllable
1255
		;;
1175
	-386bsd)
1256
	-386bsd)
1176
		os=-bsd
1257
		os=-bsd
1177
		;;
1258
		;;
Lines 1194-1199 Link Here
1194
	-sinix*)
1275
	-sinix*)
1195
		os=-sysv4
1276
		os=-sysv4
1196
		;;
1277
		;;
1278
        -tpf*)
1279
		os=-tpf
1280
		;;
1197
	-triton*)
1281
	-triton*)
1198
		os=-sysv3
1282
		os=-sysv3
1199
		;;
1283
		;;
Lines 1224-1229 Link Here
1224
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1308
	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
1225
		os=-mint
1309
		os=-mint
1226
		;;
1310
		;;
1311
	-aros*)
1312
		os=-aros
1313
		;;
1314
	-kaos*)
1315
		os=-kaos
1316
		;;
1317
	-zvmoe)
1318
		os=-zvmoe
1319
		;;
1227
	-none)
1320
	-none)
1228
		;;
1321
		;;
1229
	*)
1322
	*)
Lines 1255-1260 Link Here
1255
	arm*-semi)
1348
	arm*-semi)
1256
		os=-aout
1349
		os=-aout
1257
		;;
1350
		;;
1351
    c4x-* | tic4x-*)
1352
        os=-coff
1353
        ;;
1258
	# This must come before the *-dec entry.
1354
	# This must come before the *-dec entry.
1259
	pdp10-*)
1355
	pdp10-*)
1260
		os=-tops20
1356
		os=-tops20
Lines 1301-1306 Link Here
1301
	*-ibm)
1397
	*-ibm)
1302
		os=-aix
1398
		os=-aix
1303
		;;
1399
		;;
1400
    	*-knuth)
1401
		os=-mmixware
1402
		;;
1304
	*-wec)
1403
	*-wec)
1305
		os=-proelf
1404
		os=-proelf
1306
		;;
1405
		;;
Lines 1433-1441 Link Here
1433
			-mvs* | -opened*)
1532
			-mvs* | -opened*)
1434
				vendor=ibm
1533
				vendor=ibm
1435
				;;
1534
				;;
1535
			-os400*)
1536
				vendor=ibm
1537
				;;
1436
			-ptx*)
1538
			-ptx*)
1437
				vendor=sequent
1539
				vendor=sequent
1438
				;;
1540
				;;
1541
			-tpf*)
1542
				vendor=ibm
1543
				;;
1439
			-vxsim* | -vxworks* | -windiss*)
1544
			-vxsim* | -vxworks* | -windiss*)
1440
				vendor=wrs
1545
				vendor=wrs
1441
				;;
1546
				;;
Lines 1460-1466 Link Here
1460
esac
1565
esac
1461
1566
1462
echo $basic_machine$os
1567
echo $basic_machine$os
1463
exit 0
1568
exit
1464
1569
1465
# Local variables:
1570
# Local variables:
1466
# eval: (add-hook 'write-file-hooks 'time-stamp)
1571
# eval: (add-hook 'write-file-hooks 'time-stamp)
(-)eventwatcher-0.4.3-orig/admin/configure.in.bot.end (+15 lines)
Lines 16-21 Link Here
16
  fi
16
  fi
17
fi
17
fi
18
18
19
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
20
  echo ""
21
  echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
22
  echo "was not included. Therefore, GCC symbol visibility support remains disabled."
23
  echo ""
24
  echo "For better performance, consider including the Qt visibility supporting patch"
25
  echo "located at:"
26
  echo ""
27
  echo "http://bugs.kde.org/show_bug.cgi?id=109386"
28
  echo ""
29
  echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
30
  echo "everything will continue to work just fine without it."
31
  echo ""
32
fi
33
19
if test "$all_tests" = "bad"; then
34
if test "$all_tests" = "bad"; then
20
  if test ! "$cache_file" = "/dev/null"; then
35
  if test ! "$cache_file" = "/dev/null"; then
21
    echo ""
36
    echo ""
(-)eventwatcher-0.4.3-orig/admin/configure.in.min (-2 / +2 lines)
Lines 13-20 Link Here
13
 
13
 
14
dnl    You should have received a copy of the GNU Library General Public License
14
dnl    You should have received a copy of the GNU Library General Public License
15
dnl    along with this library; see the file COPYING.LIB.  If not, write to
15
dnl    along with this library; see the file COPYING.LIB.  If not, write to
16
dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
16
dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17
dnl    Boston, MA 02111-1307, USA.
17
dnl    Boston, MA 02110-1301, USA.
18
18
19
# Original Author was Kalle@kde.org
19
# Original Author was Kalle@kde.org
20
# I lifted it in some mater. (Stephan Kulow)
20
# I lifted it in some mater. (Stephan Kulow)
(-)eventwatcher-0.4.3-orig/admin/cvs-clean.pl (-87 lines)
Lines 1-87 Link Here
1
#! /usr/bin/perl
2
3
#
4
# This script recursively (beginning with the current directory)
5
# wipes out everything not registered in CVS.
6
#
7
# written by Oswald Buddenhagen <ossi@kde.org>
8
#  inspired by the "old" cvs-clean target from Makefile.common
9
#
10
# This file is free software in terms of the BSD license. That means
11
# that you can do anything with it except removing this license or
12
# the above copyright notice. There is NO WARRANTY of any kind.
13
#
14
15
sub rmrf()
16
{
17
  my $fn = shift;
18
  lstat ($fn);
19
  if (-d _) {
20
    if (opendir (DIR, $fn)) {
21
      for my $efn (grep (!/^\.\.?$/, readdir (DIR))) {
22
	&rmrf ($fn."/".$efn);
23
      }
24
      closedir (DIR);
25
      rmdir ($fn);
26
    }
27
  } else {
28
    unlink ($fn);
29
  }
30
}
31
32
sub newfiles()
33
{
34
  my ($indir, $incvs) = @_;
35
  for my $n (keys (%$incvs)) { delete $$indir{$n} }
36
  return sort (keys (%$indir));
37
}
38
39
sub cvsclean()
40
{
41
  my $dir = shift;
42
  my (%dirsdir, %filesdir, %dirscvs, %filescvs);
43
  my $dnam = $dir ? $dir : ".";
44
  if (!opendir (DIR, $dnam)) {
45
    print STDERR "Cannot enter \"".$dnam."\".\n";
46
    return;
47
  }
48
  for my $fn (grep (!/^\.\.?$/, readdir (DIR))) {
49
    if (-d $dir.$fn) {
50
      $fn eq "CVS" or $dirsdir{$fn} = 1;
51
    } else {
52
      $filesdir{$fn} = 1;
53
    }
54
  }
55
  closedir (DIR);
56
  if (!open (FILE, "<".$dir."CVS/Entries")) {
57
    print STDERR "No CVS information in \"".$dnam."\".\n";
58
    return;
59
  }
60
  while (<FILE>) {
61
    m%^D/([^/]+)/.*$% and $dirscvs{$1} = 1;
62
    m%^/([^/]+)/.*$% and $filescvs{$1} = 1;
63
  }
64
  close (FILE);
65
  if (open (FILE, "<".$dir."CVS/Entries.Log")) {
66
    while (<FILE>) {
67
      m%^A D/([^/]+)/.*$% and $dirscvs{$1} = 1;
68
      m%^A /([^/]+)/.*$% and $filescvs{$1} = 1;
69
      m%^R D/([^/]+)/.*$% and delete $dirscvs{$1};
70
      m%^R /([^/]+)/.*$% and delete $filescvs{$1};
71
    }
72
    close (FILE);
73
  }
74
  for my $fn (&newfiles (\%filesdir, \%filescvs)) {
75
    print ("F ".$dir.$fn."\n");
76
    &rmrf ($dir.$fn);
77
  }
78
  for my $fn (&newfiles (\%dirsdir, \%dirscvs)) {
79
    print ("D ".$dir.$fn."\n");
80
    &rmrf ($dir.$fn);
81
  }
82
  for my $fn (sort (keys (%dirscvs))) {
83
    &cvsclean ($dir.$fn."/");
84
  }
85
}
86
87
&cvsclean ("");
(-)eventwatcher-0.4.3-orig/admin/cvs.sh (-82 / +75 lines)
Lines 6-11 Link Here
6
# It defines a shell function for each known target
6
# It defines a shell function for each known target
7
# and then does a case to call the correct function.
7
# and then does a case to call the correct function.
8
8
9
unset MAKEFLAGS
10
9
call_and_fix_autoconf()
11
call_and_fix_autoconf()
10
{
12
{
11
  $AUTOCONF || exit 1
13
  $AUTOCONF || exit 1
Lines 30-36 Link Here
30
required_autoconf_version="2.53 or newer"
32
required_autoconf_version="2.53 or newer"
31
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
33
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
32
case $AUTOCONF_VERSION in
34
case $AUTOCONF_VERSION in
33
  Autoconf*2.5* | autoconf*2.5* ) : ;;
35
  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
34
  "" )
36
  "" )
35
    echo "*** AUTOCONF NOT FOUND!."
37
    echo "*** AUTOCONF NOT FOUND!."
36
    echo "*** KDE requires autoconf $required_autoconf_version"
38
    echo "*** KDE requires autoconf $required_autoconf_version"
Lines 42-51 Link Here
42
    exit 1
44
    exit 1
43
    ;;
45
    ;;
44
esac
46
esac
45
 
47
46
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
48
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
47
case $AUTOHEADER_VERSION in
49
case $AUTOHEADER_VERSION in
48
  Autoconf*2.5* | autoheader*2.5* ) : ;;
50
  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
49
  "" )
51
  "" )
50
    echo "*** AUTOHEADER NOT FOUND!."
52
    echo "*** AUTOHEADER NOT FOUND!."
51
    echo "*** KDE requires autoheader $required_autoconf_version"
53
    echo "*** KDE requires autoheader $required_autoconf_version"
Lines 66-80 Link Here
66
    echo "*** KDE requires automake $required_automake_version"
68
    echo "*** KDE requires automake $required_automake_version"
67
    exit 1
69
    exit 1
68
    ;;
70
    ;;
69
  automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
71
  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
72
    echo "*** $AUTOMAKE_STRING found."
73
    UNSERMAKE=no
74
    ;;
70
  "" )
75
  "" )
71
    echo "*** AUTOMAKE NOT FOUND!."
76
    echo "*** AUTOMAKE NOT FOUND!."
72
    echo "*** KDE requires automake $required_automake_version"
77
    echo "*** KDE requires automake $required_automake_version"
73
    exit 1
78
    exit 1
74
    ;;
79
    ;;
75
  unsermake* ) :
80
  *unsermake* ) :
76
    echo "*** YOU'RE USING UNSERMAKE."
81
    echo "*** YOU'RE USING UNSERMAKE."
77
    echo "*** GOOD LUCK!! :)"
82
    echo "*** GOOD LUCK!! :)"
83
    UNSERMAKE=unsermake
78
    ;;
84
    ;;
79
  * )
85
  * )
80
    echo "*** YOU'RE USING $AUTOMAKE_STRING."
86
    echo "*** YOU'RE USING $AUTOMAKE_STRING."
Lines 125-135 Link Here
125
if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
131
if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
126
  echo "*** Creating config.h template"
132
  echo "*** Creating config.h template"
127
  $AUTOHEADER || exit 1
133
  $AUTOHEADER || exit 1
134
  touch config.h.in
128
fi
135
fi
129
136
130
echo "*** Creating Makefile templates"
137
echo "*** Creating Makefile templates"
131
$AUTOMAKE || exit 1
138
$AUTOMAKE || exit 1
132
if test -z "$UNSERMAKE"; then
139
140
if test "$UNSERMAKE" = no; then
133
  echo "*** Postprocessing Makefile templates"
141
  echo "*** Postprocessing Makefile templates"
134
  perl -w admin/am_edit || exit 1
142
  perl -w admin/am_edit || exit 1
135
fi
143
fi
Lines 179-187 Link Here
179
if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
187
if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
180
  echo "*** Creating config.h template"
188
  echo "*** Creating config.h template"
181
  $AUTOHEADER || exit 1
189
  $AUTOHEADER || exit 1
190
  touch config.h.in
191
fi
192
$AUTOMAKE --foreign || exit 1
193
if test "$UNSERMAKE" = no; then
194
  echo "*** Postprocessing Makefile templates"
195
  perl -w admin/am_edit || exit 1
182
fi
196
fi
183
$AUTOMAKE --foreign
184
perl -w admin/am_edit
185
call_and_fix_autoconf
197
call_and_fix_autoconf
186
touch stamp-h.in
198
touch stamp-h.in
187
if grep "^cvs-local:" $makefile_am >/dev/null; then
199
if grep "^cvs-local:" $makefile_am >/dev/null; then
Lines 209-216 Link Here
209
{
221
{
210
$ACLOCAL $ACLOCALFLAGS
222
$ACLOCAL $ACLOCALFLAGS
211
$AUTOHEADER
223
$AUTOHEADER
224
touch config.h.in
212
$AUTOMAKE
225
$AUTOMAKE
213
perl -w ../admin/am_edit --path=../admin
226
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
227
case $AUTOMAKE_STRING in
228
  *unsermake* ) :
229
    ;;
230
  *)
231
     perl -w ../admin/am_edit --path=../admin
232
esac
214
call_and_fix_autoconf
233
call_and_fix_autoconf
215
touch stamp-h.in
234
touch stamp-h.in
216
}
235
}
Lines 244-253 Link Here
244
fi
263
fi
245
264
246
echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
265
echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
247
if test -n "$UNSERMAKE"; then
248
  echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
249
  echo "AC_CONFIG_FILES([ Makefile.calls ])" >> configure.in.new
250
fi
251
266
252
if test -f inst-apps; then
267
if test -f inst-apps; then
253
    topleveldirs=`cat inst-apps`
268
    topleveldirs=`cat inst-apps`
Lines 268-281 Link Here
268
	continue
283
	continue
269
  fi
284
  fi
270
285
271
  mfs=`find $topleveldir -name Makefile.am -print | fgrep -v "/." | \
286
  mfs=`find $topleveldir -follow -name Makefile.am -print | fgrep -v "/." | \
272
       sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
287
       sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
273
  for i in $mfs; do
288
  for i in $mfs; do
274
     echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
289
     echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
275
     if test -n "$UNSERMAKE"; then
276
        echo "AC_CONFIG_FILES([ $i.rules ])" >> configure.in.new
277
	echo "AC_CONFIG_FILES([ $i.calls ])" >> configure.in.new
278
     fi
279
  done
290
  done
280
done
291
done
281
292
Lines 285-294 Link Here
285
    echo "AC_CONFIG_FILES([ $file ])" >>  configure.in.new
296
    echo "AC_CONFIG_FILES([ $file ])" >>  configure.in.new
286
done
297
done
287
298
288
if test -n "$UNSERMAKE"; then
289
  echo "AC_CONFIG_FILES([ MakeVars ])" >> configure.in.new
290
fi
291
292
midfiles=`cat configure.files | fgrep "configure.in.mid"`
299
midfiles=`cat configure.files | fgrep "configure.in.mid"`
293
test -n "$midfiles" && cat $midfiles >> configure.in.new
300
test -n "$midfiles" && cat $midfiles >> configure.in.new
294
301
Lines 309-315 Link Here
309
   fi
316
   fi
310
fi
317
fi
311
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
318
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
312
     VERSION="\"3.2.90\""
319
     VERSION="\"3.5.10\""
313
fi
320
fi
314
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
321
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
315
   modulename=`pwd`; 
322
   modulename=`pwd`; 
Lines 348-358 Link Here
348
   inst=`cat inst-apps`
355
   inst=`cat inst-apps`
349
   list=""
356
   list=""
350
   for i in $inst; do
357
   for i in $inst; do
351
      list="$list `find $i/ -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
358
      list="$list `find $i/ -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
352
		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
359
		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
353
   done
360
   done
354
else
361
else
355
   list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
362
   list=`find . -follow -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
356
		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
363
		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
357
fi
364
fi
358
for i in $list; do if test -f $i && test `dirname $i` != "." ; then
365
for i in $list; do if test -f $i && test `dirname $i` != "." ; then
Lines 472-494 Link Here
472
    cat Makefile.am.in > Makefile.am.in.adds
479
    cat Makefile.am.in > Makefile.am.in.adds
473
  fi
480
  fi
474
481
475
  if test -n "$UNSERMAKE"; then
482
  cat Makefile.am.in.adds | \
476
    cat Makefile.am.in.adds > Makefile.am
483
      sed -e 's,^\s*\(COMPILE_BEFORE.*\),# \1,' | \
477
    topsubdirs=
484
      sed -e 's,^\s*\(COMPILE_AFTER.*\),# \1,' > Makefile.am
478
    for i in $compilefirst $dirs $compilelast; do
479
       vari=`echo $i | sed -e "s,[-+],_,g"`
480
       echo "if $vari""_SUBDIR_included" >> Makefile.am
481
       echo "$vari""_SUBDIR=$i" >> Makefile.am
482
       echo "endif" >> Makefile.am
483
       topsubdirs="$topsubdirs \$($vari""_SUBDIR)"
484
    done
485
    echo "SUBDIRS=$topsubdirs" >> Makefile.am
486
  else
487
    cat Makefile.am.in.adds | \
488
        sed -e 's,^\s*\(COMPILE_BEFORE.*\),# \1,' | \
489
        sed -e 's,^\s*\(COMPILE_AFTER.*\),# \1,' > Makefile.am
490
    echo "SUBDIRS="'$(TOPSUBDIRS)' >> Makefile.am
485
    echo "SUBDIRS="'$(TOPSUBDIRS)' >> Makefile.am
491
  fi
492
  rm Makefile.am.in.adds
486
  rm Makefile.am.in.adds
493
fi
487
fi
494
}
488
}
Lines 511-531 Link Here
511
  fi
505
  fi
512
  # if it wasn't created up to now, then we do it better
506
  # if it wasn't created up to now, then we do it better
513
  if test ! -f acinclude.m4; then
507
  if test ! -f acinclude.m4; then
514
     cat admin/acinclude.m4.in admin/libtool.m4.in $adds > acinclude.m4
508
     cat admin/acinclude.m4.in admin/libtool.m4.in admin/pkg.m4.in $adds > acinclude.m4
515
  fi
509
  fi
516
}
510
}
517
511
518
cvs_clean()
519
{
520
if test -d CVS; then :; else
521
  echo "You don't have a toplevel CVS directory."
522
  echo "You most certainly didn't use cvs to get these sources."
523
  echo "But this function depends on cvs's information."
524
  exit 1
525
fi
526
perl $admindir/cvs-clean.pl
527
}
528
529
package_merge()
512
package_merge()
530
{
513
{
531
catalogs=$POFILES
514
catalogs=$POFILES
Lines 544-561 Link Here
544
done
527
done
545
}
528
}
546
529
547
package_messages()
530
extract_messages()
548
{
531
{
549
rm -rf po.backup
550
mkdir po.backup
551
552
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
553
  egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
554
  cat po/$i > po.backup/backup_$i
555
  touch -r po/$i po.backup/backup_$i
556
  rm po/$i
557
done
558
559
podir=${podir:-$PWD/po}
532
podir=${podir:-$PWD/po}
560
files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
533
files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
561
dirs=`for i in $files; do echo \`dirname $i\`; done`
534
dirs=`for i in $files; do echo \`dirname $i\`; done`
Lines 575-589 Link Here
575
	    echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
548
	    echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
576
	fi
549
	fi
577
   fi
550
   fi
578
   if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then
551
   if find . -name \*.c\* -o -name \*.h\* | fgrep -v ".svn" | xargs fgrep -s -q KAboutData ; then
579
	echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
552
	echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
580
   else echo " " > _translatorinfo.cpp
553
   else echo " " > _translatorinfo.cpp
581
   fi
554
   fi
582
   perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
555
   perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
583
556
584
   $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
557
   kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
585
	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
558
   if ! test -f $kdepotpath; then
586
	messages 
559
	kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
560
   fi
561
562
   $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
563
	XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
587
   exit_code=$?
564
   exit_code=$?
588
   if test "$exit_code" != 0; then
565
   if test "$exit_code" != 0; then
589
       echo "make exit code: $exit_code"
566
       echo "make exit code: $exit_code"
Lines 595-612 Link Here
595
   rm -f $subdir/_transMakefile
572
   rm -f $subdir/_transMakefile
596
done
573
done
597
rm -f $tmpname
574
rm -f $tmpname
575
}
576
577
package_messages()
578
{
579
rm -rf po.backup
580
mkdir po.backup
581
582
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
583
  egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
584
  cat po/$i > po.backup/backup_$i
585
  touch -r po/$i po.backup/backup_$i
586
  rm po/$i
587
done
588
589
extract_messages
590
598
for i in `ls -1 po.backup/*.pot 2>/dev/null | sed -e "s#po.backup/##" | egrep -v '^backup_'`; do
591
for i in `ls -1 po.backup/*.pot 2>/dev/null | sed -e "s#po.backup/##" | egrep -v '^backup_'`; do
599
  test -f po/$i || echo "disappeared: $i"
592
  test -f po/$i || echo "disappeared: $i"
600
done
593
done
601
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
594
for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
602
   sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
595
  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
603
   msgmerge -q -o po/$i po/$i po/$i
596
  #msgmerge -q -o po/$i po/$i po/$i
604
   egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
597
  egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
605
  if test -f po.backup/$i && test -n "`diff temp.pot po.backup/$i`"; then
598
  if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then
606
	echo "will update $i"
599
    echo "will update $i"
607
        sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po.backup/$backup_$i > po/$i.new && mv po/$i.new po.backup/backup_$i
608
	msgmerge -q po.backup/backup_$i po/$i > temp.pot
609
	mv temp.pot po/$i
610
  else
600
  else
611
    if test -f po.backup/backup_$i; then
601
    if test -f po.backup/backup_$i; then
612
      test -z "$VERBOSE" || echo "I'm restoring $i"
602
      test -z "$VERBOSE" || echo "I'm restoring $i"
Lines 621-627 Link Here
621
rm -rf po.backup
611
rm -rf po.backup
622
}
612
}
623
613
624
unset LC_ALL || :
614
# Make sure that sorting is always done the same way
615
LC_ALL=C
616
export LC_ALL
625
unset LANG || :
617
unset LANG || :
626
unset LC_CTYPE || :
618
unset LC_CTYPE || :
627
unset LANGUAGE || :
619
unset LANGUAGE || :
Lines 639-659 Link Here
639
  rm -f $makefile_wo
631
  rm -f $makefile_wo
640
fi
632
fi
641
633
642
# Suck in the AUTOCONF detection code
634
# Call script to find autoconf and friends.  Uses eval since the script outputs
643
. $admindir/detect-autoconf.sh
635
# sh-compatible code.
636
eval `$admindir/detect-autoconf.pl`
644
637
645
###
638
###
646
### Main
639
### Main
647
###
640
###
648
641
649
arg=`echo $1 | tr '\-.' __`
642
arg=`echo $1 | tr .- __`
650
case $arg in
643
case $arg in
651
  cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
644
  cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
652
  cvs_clean | package_merge | package_messages | Makefile_am | acinclude_m4 ) $arg ;;
645
  cvs_clean | package_merge | package_messages | Makefile_am | acinclude_m4 | extract_messages ) $arg ;;
653
  configure ) call_and_fix_autoconf ;;
646
  configure ) call_and_fix_autoconf ;;
654
  * ) echo "Usage: cvs.sh <target>"
647
  * ) echo "Usage: cvs.sh <target>"
655
      echo "Target can be one of:"
648
      echo "Target can be one of:"
656
      echo "    cvs cvs-clean dist"
649
      echo "    cvs svn dist"
657
      echo "    configure.in configure.files"
650
      echo "    configure.in configure.files"
658
      echo "    package-merge package-messages"
651
      echo "    package-merge package-messages"
659
      echo ""
652
      echo ""
(-)eventwatcher-0.4.3-orig/admin/depcomp (-135 / +224 lines)
Lines 1-7 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
3
# depcomp - compile a program generating dependencies as side-effects
2
# depcomp - compile a program generating dependencies as side-effects
4
# Copyright 1999, 2000 Free Software Foundation, Inc.
3
4
scriptversion=2005-07-09.11
5
6
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
5
7
6
# This program is free software; you can redistribute it and/or modify
8
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
9
# it under the terms of the GNU General Public License as published by
Lines 15-22 Link Here
15
17
16
# You should have received a copy of the GNU General Public License
18
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
19
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
20
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02111-1307, USA.
21
# 02110-1301, USA.
20
22
21
# As a special exception to the GNU General Public License, if you
23
# As a special exception to the GNU General Public License, if you
22
# distribute this file as part of a program that contains a
24
# distribute this file as part of a program that contains a
Lines 25-37 Link Here
25
27
26
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
28
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
27
29
30
case $1 in
31
  '')
32
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
33
     exit 1;
34
     ;;
35
  -h | --h*)
36
    cat <<\EOF
37
Usage: depcomp [--help] [--version] PROGRAM [ARGS]
38
39
Run PROGRAMS ARGS to compile a file, generating dependencies
40
as side-effects.
41
42
Environment variables:
43
  depmode     Dependency tracking mode.
44
  source      Source file read by `PROGRAMS ARGS'.
45
  object      Object file output by `PROGRAMS ARGS'.
46
  DEPDIR      directory where to store dependencies.
47
  depfile     Dependency file to output.
48
  tmpdepfile  Temporary file to use when outputing dependencies.
49
  libtool     Whether libtool is used (yes/no).
50
51
Report bugs to <bug-automake@gnu.org>.
52
EOF
53
    exit $?
54
    ;;
55
  -v | --v*)
56
    echo "depcomp $scriptversion"
57
    exit $?
58
    ;;
59
esac
60
28
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
61
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
29
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
62
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
30
  exit 1
63
  exit 1
31
fi
64
fi
32
# `libtool' can also be set to `yes' or `no'.
33
65
34
depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
66
# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
67
depfile=${depfile-`echo "$object" |
68
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
35
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
69
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
36
70
37
rm -f "$tmpdepfile"
71
rm -f "$tmpdepfile"
Lines 163-181 Link Here
163
197
164
aix)
198
aix)
165
  # The C for AIX Compiler uses -M and outputs the dependencies
199
  # The C for AIX Compiler uses -M and outputs the dependencies
166
  # in a .u file.  This file always lives in the current directory.
200
  # in a .u file.  In older versions, this file always lives in the
167
  # Also, the AIX compiler puts `$object:' at the start of each line;
201
  # current directory.  Also, the AIX compiler puts `$object:' at the
168
  # $object doesn't have directory information.
202
  # start of each line; $object doesn't have directory information.
169
  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
203
  # Version 6 uses the directory in both cases.
204
  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
170
  tmpdepfile="$stripped.u"
205
  tmpdepfile="$stripped.u"
171
  outname="$stripped.o"
172
  if test "$libtool" = yes; then
206
  if test "$libtool" = yes; then
173
    "$@" -Wc,-M
207
    "$@" -Wc,-M
174
  else
208
  else
175
    "$@" -M
209
    "$@" -M
176
  fi
210
  fi
177
178
  stat=$?
211
  stat=$?
212
213
  if test -f "$tmpdepfile"; then :
214
  else
215
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
216
    tmpdepfile="$stripped.u"
217
  fi
218
179
  if test $stat -eq 0; then :
219
  if test $stat -eq 0; then :
180
  else
220
  else
181
    rm -f "$tmpdepfile"
221
    rm -f "$tmpdepfile"
Lines 183-188 Link Here
183
  fi
223
  fi
184
224
185
  if test -f "$tmpdepfile"; then
225
  if test -f "$tmpdepfile"; then
226
    outname="$stripped.o"
186
    # Each line is of the form `foo.o: dependent.h'.
227
    # Each line is of the form `foo.o: dependent.h'.
187
    # Do two passes, one to just change these to
228
    # Do two passes, one to just change these to
188
    # `$object: dependent.h' and one to simply `dependent.h:'.
229
    # `$object: dependent.h' and one to simply `dependent.h:'.
Lines 198-208 Link Here
198
  ;;
239
  ;;
199
240
200
icc)
241
icc)
201
  # Must come before tru64.
242
  # Intel's C compiler understands `-MD -MF file'.  However on
202
203
  # Intel's C compiler understands `-MD -MF file'.  However
204
  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
243
  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
205
  # will fill foo.d with something like
244
  # ICC 7.0 will fill foo.d with something like
206
  #    foo.o: sub/foo.c
245
  #    foo.o: sub/foo.c
207
  #    foo.o: sub/foo.h
246
  #    foo.o: sub/foo.h
208
  # which is wrong.  We want:
247
  # which is wrong.  We want:
Lines 210-215 Link Here
210
  #    sub/foo.o: sub/foo.h
249
  #    sub/foo.o: sub/foo.h
211
  #    sub/foo.c:
250
  #    sub/foo.c:
212
  #    sub/foo.h:
251
  #    sub/foo.h:
252
  # ICC 7.1 will output
253
  #    foo.o: sub/foo.c sub/foo.h
254
  # and will wrap long lines using \ :
255
  #    foo.o: sub/foo.c ... \
256
  #     sub/foo.h ... \
257
  #     ...
213
258
214
  "$@" -MD -MF "$tmpdepfile"
259
  "$@" -MD -MF "$tmpdepfile"
215
  stat=$?
260
  stat=$?
Lines 219-263 Link Here
219
    exit $stat
264
    exit $stat
220
  fi
265
  fi
221
  rm -f "$depfile"
266
  rm -f "$depfile"
222
  # Each line is of the form `foo.o: dependent.h'.
267
  # Each line is of the form `foo.o: dependent.h',
268
  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
223
  # Do two passes, one to just change these to
269
  # Do two passes, one to just change these to
224
  # `$object: dependent.h' and one to simply `dependent.h:'.
270
  # `$object: dependent.h' and one to simply `dependent.h:'.
225
  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
271
  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
226
  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
272
  # Some versions of the HPUX 10.20 sed can't process this invocation
273
  # correctly.  Breaking it into two sed invocations is a workaround.
274
  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
275
    sed -e 's/$/ :/' >> "$depfile"
227
  rm -f "$tmpdepfile"
276
  rm -f "$tmpdepfile"
228
  ;;
277
  ;;
229
278
230
tru64)
279
tru64)
231
   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
280
   # The Tru64 compiler uses -MD to generate dependencies as a side
232
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
281
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
233
   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
282
   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
234
   # dependencies in `foo.d' instead, so we check for that too.
283
   # dependencies in `foo.d' instead, so we check for that too.
235
   # Subdirectories are respected.
284
   # Subdirectories are respected.
285
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
286
   test "x$dir" = "x$object" && dir=
287
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
236
288
237
   tmpdepfile1="$object.d"
238
   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
239
   if test "$libtool" = yes; then
289
   if test "$libtool" = yes; then
290
      # With Tru64 cc, shared objects can also be used to make a
291
      # static library.  This mecanism is used in libtool 1.4 series to
292
      # handle both shared and static libraries in a single compilation.
293
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
294
      #
295
      # With libtool 1.5 this exception was removed, and libtool now
296
      # generates 2 separate objects for the 2 libraries.  These two
297
      # compilations output dependencies in in $dir.libs/$base.o.d and
298
      # in $dir$base.o.d.  We have to check for both files, because
299
      # one of the two compilations can be disabled.  We should prefer
300
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
301
      # automatically cleaned when .libs/ is deleted, while ignoring
302
      # the former would cause a distcleancheck panic.
303
      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
304
      tmpdepfile2=$dir$base.o.d          # libtool 1.5
305
      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
306
      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
240
      "$@" -Wc,-MD
307
      "$@" -Wc,-MD
241
   else
308
   else
309
      tmpdepfile1=$dir$base.o.d
310
      tmpdepfile2=$dir$base.d
311
      tmpdepfile3=$dir$base.d
312
      tmpdepfile4=$dir$base.d
242
      "$@" -MD
313
      "$@" -MD
243
   fi
314
   fi
244
315
245
   stat=$?
316
   stat=$?
246
   if test $stat -eq 0; then :
317
   if test $stat -eq 0; then :
247
   else
318
   else
248
      rm -f "$tmpdepfile1" "$tmpdepfile2"
319
      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
249
      exit $stat
320
      exit $stat
250
   fi
321
   fi
251
322
252
   if test -f "$tmpdepfile1"; then
323
   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
253
      tmpdepfile="$tmpdepfile1"
324
   do
254
   else
325
     test -f "$tmpdepfile" && break
255
      tmpdepfile="$tmpdepfile2"
326
   done
256
   fi
257
   if test -f "$tmpdepfile"; then
327
   if test -f "$tmpdepfile"; then
258
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
328
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
259
      # That's a space and a tab in the [].
329
      # That's a tab and a space in the [].
260
      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
330
      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
261
   else
331
   else
262
      echo "#dummy" > "$depfile"
332
      echo "#dummy" > "$depfile"
263
   fi
333
   fi
Lines 270-303 Link Here
270
340
271
dashmstdout)
341
dashmstdout)
272
  # Important note: in order to support this mode, a compiler *must*
342
  # Important note: in order to support this mode, a compiler *must*
273
  # always write the proprocessed file to stdout, regardless of -o,
343
  # always write the preprocessed file to stdout, regardless of -o.
274
  # because we must use -o when running libtool.
344
  "$@" || exit $?
275
  test -z "$dashmflag" && dashmflag=-M
345
276
  ( IFS=" "
346
  # Remove the call to Libtool.
277
    case " $* " in
347
  if test "$libtool" = yes; then
278
    *" --mode=compile "*) # this is libtool, let us make it quiet
348
    while test $1 != '--mode=compile'; do
279
      for arg
349
      shift
280
      do # cycle over the arguments
350
    done
281
        case "$arg" in
351
    shift
282
	"--mode=compile")
352
  fi
283
	  # insert --quiet before "--mode=compile"
353
284
	  set fnord "$@" --quiet
354
  # Remove `-o $object'.
285
	  shift # fnord
355
  IFS=" "
286
	  ;;
356
  for arg
287
	esac
357
  do
288
	set fnord "$@" "$arg"
358
    case $arg in
289
	shift # fnord
359
    -o)
290
	shift # "$arg"
360
      shift
291
      done
361
      ;;
362
    $object)
363
      shift
364
      ;;
365
    *)
366
      set fnord "$@" "$arg"
367
      shift # fnord
368
      shift # $arg
292
      ;;
369
      ;;
293
    esac
370
    esac
294
    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
371
  done
295
  ) &
372
296
  proc=$!
373
  test -z "$dashmflag" && dashmflag=-M
297
  "$@"
374
  # Require at least two characters before searching for `:'
298
  stat=$?
375
  # in the target name.  This is to cope with DOS-style filenames:
299
  wait "$proc"
376
  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
300
  if test "$stat" != 0; then exit $stat; fi
377
  "$@" $dashmflag |
378
    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
301
  rm -f "$depfile"
379
  rm -f "$depfile"
302
  cat < "$tmpdepfile" > "$depfile"
380
  cat < "$tmpdepfile" > "$depfile"
303
  tr ' ' '
381
  tr ' ' '
Lines 315-350 Link Here
315
  ;;
393
  ;;
316
394
317
makedepend)
395
makedepend)
318
  # X makedepend
396
  "$@" || exit $?
319
  (
397
  # Remove any Libtool call
320
    shift
398
  if test "$libtool" = yes; then
321
    cleared=no
399
    while test $1 != '--mode=compile'; do
322
    for arg in "$@"; do
400
      shift
323
      case $cleared in no)
324
        set ""; shift
325
	cleared=yes
326
      esac
327
      case "$arg" in
328
        -D*|-I*)
329
	  set fnord "$@" "$arg"; shift;;
330
	-*)
331
	  ;;
332
	*)
333
	  set fnord "$@" "$arg"; shift;;
334
      esac
335
    done
401
    done
336
    obj_suffix="`echo $object | sed 's/^.*\././'`"
402
    shift
337
    touch "$tmpdepfile"
403
  fi
338
    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
404
  # X makedepend
339
  ) &
405
  shift
340
  proc=$!
406
  cleared=no
341
  "$@"
407
  for arg in "$@"; do
342
  stat=$?
408
    case $cleared in
343
  wait "$proc"
409
    no)
344
  if test "$stat" != 0; then exit $stat; fi
410
      set ""; shift
411
      cleared=yes ;;
412
    esac
413
    case "$arg" in
414
    -D*|-I*)
415
      set fnord "$@" "$arg"; shift ;;
416
    # Strip any option that makedepend may not understand.  Remove
417
    # the object too, otherwise makedepend will parse it as a source file.
418
    -*|$object)
419
      ;;
420
    *)
421
      set fnord "$@" "$arg"; shift ;;
422
    esac
423
  done
424
  obj_suffix="`echo $object | sed 's/^.*\././'`"
425
  touch "$tmpdepfile"
426
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
345
  rm -f "$depfile"
427
  rm -f "$depfile"
346
  cat < "$tmpdepfile" > "$depfile"
428
  cat < "$tmpdepfile" > "$depfile"
347
  tail +3 "$tmpdepfile" | tr ' ' '
429
  sed '1,2d' "$tmpdepfile" | tr ' ' '
348
' | \
430
' | \
349
## Some versions of the HPUX 10.20 sed can't process this invocation
431
## Some versions of the HPUX 10.20 sed can't process this invocation
350
## correctly.  Breaking it into two sed invocations is a workaround.
432
## correctly.  Breaking it into two sed invocations is a workaround.
Lines 354-388 Link Here
354
436
355
cpp)
437
cpp)
356
  # Important note: in order to support this mode, a compiler *must*
438
  # Important note: in order to support this mode, a compiler *must*
357
  # always write the proprocessed file to stdout, regardless of -o,
439
  # always write the preprocessed file to stdout.
358
  # because we must use -o when running libtool.
440
  "$@" || exit $?
359
  ( IFS=" "
441
360
    case " $* " in
442
  # Remove the call to Libtool.
361
    *" --mode=compile "*)
443
  if test "$libtool" = yes; then
362
      for arg
444
    while test $1 != '--mode=compile'; do
363
      do # cycle over the arguments
445
      shift
364
        case $arg in
446
    done
365
	"--mode=compile")
447
    shift
366
	  # insert --quiet before "--mode=compile"
448
  fi
367
	  set fnord "$@" --quiet
449
368
	  shift # fnord
450
  # Remove `-o $object'.
369
	  ;;
451
  IFS=" "
370
	esac
452
  for arg
371
	set fnord "$@" "$arg"
453
  do
372
	shift # fnord
454
    case $arg in
373
	shift # "$arg"
455
    -o)
374
      done
456
      shift
457
      ;;
458
    $object)
459
      shift
460
      ;;
461
    *)
462
      set fnord "$@" "$arg"
463
      shift # fnord
464
      shift # $arg
375
      ;;
465
      ;;
376
    esac
466
    esac
377
    "$@" -E |
467
  done
378
    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
468
469
  "$@" -E |
470
    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
471
       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
379
    sed '$ s: \\$::' > "$tmpdepfile"
472
    sed '$ s: \\$::' > "$tmpdepfile"
380
  ) &
381
  proc=$!
382
  "$@"
383
  stat=$?
384
  wait "$proc"
385
  if test "$stat" != 0; then exit $stat; fi
386
  rm -f "$depfile"
473
  rm -f "$depfile"
387
  echo "$object : \\" > "$depfile"
474
  echo "$object : \\" > "$depfile"
388
  cat < "$tmpdepfile" >> "$depfile"
475
  cat < "$tmpdepfile" >> "$depfile"
Lines 392-425 Link Here
392
479
393
msvisualcpp)
480
msvisualcpp)
394
  # Important note: in order to support this mode, a compiler *must*
481
  # Important note: in order to support this mode, a compiler *must*
395
  # always write the proprocessed file to stdout, regardless of -o,
482
  # always write the preprocessed file to stdout, regardless of -o,
396
  # because we must use -o when running libtool.
483
  # because we must use -o when running libtool.
397
  ( IFS=" "
484
  "$@" || exit $?
398
    case " $* " in
485
  IFS=" "
399
    *" --mode=compile "*)
486
  for arg
400
      for arg
487
  do
401
      do # cycle over the arguments
488
    case "$arg" in
402
        case $arg in
489
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
403
	"--mode=compile")
490
	set fnord "$@"
404
	  # insert --quiet before "--mode=compile"
491
	shift
405
	  set fnord "$@" --quiet
492
	shift
406
	  shift # fnord
493
	;;
407
	  ;;
494
    *)
408
	esac
409
	set fnord "$@" "$arg"
495
	set fnord "$@" "$arg"
410
	shift # fnord
496
	shift
411
	shift # "$arg"
497
	shift
412
      done
498
	;;
413
      ;;
414
    esac
499
    esac
415
    "$@" -E |
500
  done
416
    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
501
  "$@" -E |
417
  ) &
502
  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
418
  proc=$!
419
  "$@"
420
  stat=$?
421
  wait "$proc"
422
  if test "$stat" != 0; then exit $stat; fi
423
  rm -f "$depfile"
503
  rm -f "$depfile"
424
  echo "$object : \\" > "$depfile"
504
  echo "$object : \\" > "$depfile"
425
  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
505
  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
Lines 439-441 Link Here
439
esac
519
esac
440
520
441
exit 0
521
exit 0
522
523
# Local Variables:
524
# mode: shell-script
525
# sh-indentation: 2
526
# eval: (add-hook 'write-file-hooks 'time-stamp)
527
# time-stamp-start: "scriptversion="
528
# time-stamp-format: "%:y-%02m-%02d.%02H"
529
# time-stamp-end: "$"
530
# End:
(-)eventwatcher-0.4.3-orig/admin/deps.am (-1 / +1 lines)
Lines 1-4 Link Here
1
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh
1
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
2
	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
2
	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
3
3
4
$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
4
$(top_srcdir)/configure.in: $(top_srcdir)/subdirs $(top_srcdir)/configure.files $(top_srcdir)/admin/cvs.sh
(-)eventwatcher-0.4.3-orig/admin/detect-autoconf.pl (+256 lines)
Line 0 Link Here
1
#!/usr/bin/env perl
2
3
# Try to locate best version of auto*
4
# By Michael Pyne <michael.pyne@kdemail.net>
5
#
6
# Copyright (c) 2005.
7
# This code is public domain.  You may use it however you like (including
8
# relicensing).
9
10
# Emulate the 'which' program.
11
sub which
12
{
13
    my $prog = shift;
14
    my @paths = split(/:/, $ENV{'PATH'});
15
16
    for $path (@paths)
17
    {
18
	return "$path/$prog" if -x "$path/$prog";
19
    }
20
21
    return "";
22
}
23
24
# Subroutine to lexicographically compare two version strings, a and b.
25
# If a > b, 1 is returned.
26
# If a == b, 0 is returned.
27
# If a < b, -1 is returned.
28
#
29
# If the strings are of uneven number length then the shorter string is
30
# prepended by enough zeroes to make the two string lengths equal in order to
31
# allow an accurate comparison.  Note that the zero-padding only occurs in
32
# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10).
33
# Parts of the version ending in -foo (or any other text) are not considered
34
# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs.
35
# 2.053)
36
sub compareVersions
37
{
38
    my ($a, $b) = @_;
39
40
    # Split the strings up by '.' (version separator) and start comparing digit
41
    # length.
42
43
    my @aParts = split(/\./, $a);
44
    my @bParts = split(/\./, $b);
45
46
    # Make the arrays equal in length by adding missing zeroes to the end of the
47
    # version.
48
    push @aParts, '0' while scalar @aParts < scalar @bParts;
49
    push @bParts, '0' while scalar @bParts < scalar @aParts;
50
51
    # Now compare each individual portion.
52
    for (my $i = 0; $i < scalar @aParts; ++$i)
53
    {
54
	# Make sure that any portion that has numbers is contiguous.  I'm sure
55
	# there's a technique for saving stuff like 2.52a2 but I don't feel
56
	# like implementing it.
57
	if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or
58
	    $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/)
59
	{
60
	    die "Not able to compare $a to $b!\n";
61
	}
62
63
	my ($aDigits) = ($aParts[$i] =~ /(\d+)/);
64
	my ($bDigits) = ($bParts[$i] =~ /(\d+)/);
65
66
	# Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in
67
	# the delta calculation below.
68
	my $delta = (length $aDigits) - (length $bDigits);
69
	if ($delta < 0) # b is longer
70
	{
71
	    my $replacement = ('0' x (-$delta)) . $aDigits;
72
	    $aParts[$i] =~ s/$aDigits/$replacement/;
73
	}
74
	elsif ($delta > 0) # a is longer
75
	{
76
	    my $replacement = ('0' x $delta) . $bDigits;
77
	    $bParts[$i] =~ s/$bDigits/$replacement/;
78
	}
79
    }
80
81
    # Arrays now have standardized version components, let's re-merge them
82
    # to strings to do the compare.
83
    my $newA = join('.', @aParts);
84
    my $newB = join('.', @bParts);
85
86
    return 1 if ($newA gt $newB);
87
    return -1 if ($newA lt $newB);
88
    return 0;
89
}
90
91
# Subroutine to determine the highest installed version of the given program,
92
# searching from the given paths.
93
sub findBest
94
{
95
    my ($program, @paths) = @_;
96
    my $best_version_found = '0'; # Deliberately a string.
97
    my %versions;
98
    my %minimumVersions = (
99
	'autoconf' => '2.5',
100
	'automake' => '1.6',
101
    );
102
    my $sgn; # Used for compareVersions results.
103
104
    # Allow user to use environment variable to override search.
105
    return $ENV{uc $program} if $ENV{uc $program};
106
107
    for $prefix (@paths)
108
    {
109
	@files = glob "$prefix/$program*";
110
	for $file (@files)
111
	{
112
	    # Don't check non-executable scripts.
113
	    next unless -x $file;
114
115
	    ($version) = $file =~ /$prefix\/$program-?(.*)$/;
116
117
	    # Don't check the -wrapper ones (or any other non program one).
118
	    # The real deal should start with a version number, or have no
119
	    # suffix at all.
120
	    next if $version =~ /^[^\d]/;
121
122
	    # Special case some programs to make sure it has a minimum version.
123
	    if (not $version and exists $minimumVersions{$program})
124
	    {
125
		my $min_version = $minimumVersions{$program};
126
		my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
127
128
		# If we can't run the script to get the version it likely won't work later.
129
		next unless $versionOutput;
130
131
		# Use number.number for version (we don't need the excess in general).
132
		($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/);
133
134
		# compareVersions returns -1 if the left argument is less than
135
		# the right argument.  It can also die for invalid input so
136
		# wrap with eval.
137
		eval {
138
		    $sgn = compareVersions($versionOutput, $min_version);
139
		};
140
141
		# $@ would be set if an error was encountered.
142
		if ($@ or not $versionOutput or $sgn == -1) {
143
		    next;
144
		}
145
	    }
146
147
	    # If no version suffix then use it in favor of a versioned autotool
148
	    # since the ever-popular WANT_AUTOFOO should then work (in theory).
149
	    return $file unless $version;
150
151
	    # Emulate 'which', and abort if we've already seen this version.
152
	    next if exists $versions{$version};
153
154
	    # Save filename of program.
155
	    $versions{$version} = $file;
156
157
	    # Use string comparison so that e.g. 253a will be > 253 but < 254.
158
	    # See above about the need for eval.
159
	    eval {
160
		$sgn = compareVersions($version, $best_version_found);
161
	    };
162
163
	    if (not $@ and $sgn == 1)
164
	    {
165
		$best_version_found = $version;
166
	    }
167
	}
168
    }
169
170
    return $versions{$best_version_found};
171
}
172
173
# Find an appropriate "which" program for later use by the shell script calling
174
# us.
175
sub findWhich
176
{
177
    for $candidate ('type -p', 'which', 'type')
178
    {
179
	$test = `$candidate sh 2>/dev/null`;
180
	chomp $test;
181
182
	return $candidate if -x $test;
183
    }
184
}
185
186
# Uses which() to find a program unless the user provided its path in the
187
# environment (the upper case program name is searched).
188
sub findProgram
189
{
190
    $suffix = ""; # For use if @_ has only one param.
191
    my ($program, $suffix) = @_;
192
193
    return $ENV{uc $program} if $ENV{uc $program};
194
    return which("$program$suffix");
195
}
196
197
# SCRIPT STARTS.
198
199
# Search in path.
200
@paths = split(/:/, $ENV{'PATH'});
201
202
# Make sure at least /usr/bin and /usr/local/bin are in this search.
203
unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths;
204
unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths;
205
206
$autoconf = findBest('autoconf', @paths);
207
($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/;
208
209
# Find matching autoconf companions.
210
$autoheader = findProgram('autoheader', $autoconf_suffix);
211
$autom4te = findProgram('autom4te', $autoconf_suffix);
212
213
# Get best automake, and look for unsermake to possibly override it.
214
$automake = findBest('automake', @paths);
215
$unsermake = "";
216
# backward compatible: if $UNSERMAKE points to a path, use it
217
$unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
218
# new compatible: if it says 'yes', use the one from path
219
$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
220
221
($automake_suffix) = $automake =~ /.*automake(.*)$/;
222
223
# Find matching automake companions.
224
$aclocal = findProgram('aclocal', $automake_suffix);
225
226
# Use unsermake if we found it.
227
$automake = "$unsermake -c" if ($unsermake and $aclocal);
228
229
$which = findWhich();
230
231
# Make sure we have all of the needed programs.
232
for $i (qw'autoconf autoheader autom4te automake aclocal')
233
{
234
    unless(${$i})
235
    {
236
	print STDERR "# Unable to find $i!!\n";
237
    }
238
}
239
240
# Print results in eval-able form.
241
print <<EOF;
242
AUTOCONF="$autoconf"
243
AUTOHEADER="$autoheader"
244
AUTOM4TE="$autom4te"
245
246
AUTOMAKE="$automake"
247
ACLOCAL="$aclocal"
248
249
WHICH="$which"
250
251
export AUTOCONF AUTOHEADER AUTOM4TE AUTOMAKE ACLOCAL WHICH
252
EOF
253
254
exit 0;
255
256
# vim: set noet ts=8 sw=4:
(-)eventwatcher-0.4.3-orig/admin/detect-autoconf.sh (-103 lines)
Lines 1-103 Link Here
1
#! /bin/sh
2
3
# Global variables...
4
AUTOCONF="autoconf"
5
AUTOHEADER="autoheader"
6
AUTOM4TE="autom4te"
7
AUTOMAKE="automake"
8
ACLOCAL="aclocal"
9
10
11
# We don't use variable here for remembering the type ... strings.
12
# local variables are not that portable, but we fear namespace issues with
13
# our includer.  The repeated type calls are not that expensive.
14
checkAutoconf()
15
{
16
  if test -x "`$WHICH autoconf-2.5x 2>/dev/null`" ; then	
17
    AUTOCONF="`$WHICH autoconf-2.5x`"
18
  elif test -x "`$WHICH autoconf-2.57 2>/dev/null`" ; then
19
    AUTOCONF="`$WHICH autoconf-2.57`"
20
  elif test -x "`$WHICH autoconf257 2>/dev/null`" ; then
21
    AUTOCONF="`$WHICH autoconf257`"
22
  elif test -x "`$WHICH autoconf-2.56 2>/dev/null`" ; then
23
    AUTOCONF="`$WHICH autoconf-2.56`"
24
  elif test -x "`$WHICH autoconf-2.55 2>/dev/null`" ; then
25
    AUTOCONF="`$WHICH autoconf-2.55`"
26
  elif test -x "`$WHICH autoconf-2.54 2>/dev/null`" ; then
27
    AUTOCONF="`$WHICH autoconf-2.54`"
28
  elif test -x "`$WHICH autoconf-2.53 2>/dev/null`" ; then
29
    AUTOCONF="`$WHICH autoconf-2.53`"
30
  elif test -x "`$WHICH autoconf-2.53a 2>/dev/null`" ; then
31
    AUTOCONF="`$WHICH autoconf-2.53a`"
32
  elif test -x "`$WHICH autoconf-2.52 2>/dev/null`" ; then
33
    AUTOCONF="`$WHICH autoconf-2.52`"
34
  elif test -x "`$WHICH autoconf2.50 2>/dev/null`" ; then
35
    AUTOCONF="`$WHICH autoconf2.50`"
36
  fi
37
}
38
39
checkAutoheader()
40
{
41
  if test -x "`$WHICH autoheader-2.5x 2>/dev/null`" ; then
42
    AUTOHEADER="`$WHICH autoheader-2.5x`"
43
    AUTOM4TE="`$WHICH autom4te-2.5x`"
44
  elif test -x "`$WHICH autoheader-2.57 2>/dev/null`" ; then
45
    AUTOHEADER="`$WHICH autoheader-2.57`"
46
    AUTOM4TE="`$WHICH autom4te-2.57`"
47
  elif test -x "`$WHICH autoheader257 2>/dev/null`" ; then
48
    AUTOHEADER="`$WHICH autoheader257`"
49
    AUTOM4TE="`$WHICH autom4te257`"
50
  elif test -x "`$WHICH autoheader-2.56 2>/dev/null`" ; then
51
    AUTOHEADER="`$WHICH autoheader-2.56`"
52
    AUTOM4TE="`$WHICH autom4te-2.56`"
53
  elif test -x "`$WHICH autoheader-2.55 2>/dev/null`" ; then
54
    AUTOHEADER="`$WHICH autoheader-2.55`"
55
    AUTOM4TE="`$WHICH autom4te-2.55`"
56
  elif test -x "`$WHICH autoheader-2.54 2>/dev/null`" ; then
57
    AUTOHEADER="`$WHICH autoheader-2.54`"
58
    AUTOM4TE="`$WHICH autom4te-2.54`"
59
  elif test -x "`$WHICH autoheader-2.53 2>/dev/null`" ; then
60
    AUTOHEADER="`$WHICH autoheader-2.53`"
61
    AUTOM4TE="`$WHICH autom4te-2.53`"
62
  elif test -x "`$WHICH autoheader-2.53a 2>/dev/null`" ; then
63
    AUTOHEADER="`$WHICH autoheader-2.53a`"
64
    AUTOM4TE="`$WHICH autom4te-2.53a`"
65
  elif test -x "`$WHICH autoheader-2.52 2>/dev/null`" ; then
66
    AUTOHEADER="`$WHICH autoheader-2.52`"
67
  elif test -x "`$WHICH autoheader2.50 2>/dev/null`" ; then
68
    AUTOHEADER="`$WHICH autoheader2.50`"
69
  fi
70
}
71
72
checkAutomakeAclocal ()
73
{
74
 if test -x "`$WHICH automake-1.6 2>/dev/null`" ; then
75
    AUTOMAKE="`$WHICH automake-1.6`"
76
    ACLOCAL="`$WHICH aclocal-1.6`"
77
  elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then
78
    AUTOMAKE="`$WHICH automake-1.7`"
79
    ACLOCAL="`$WHICH aclocal-1.7`"
80
  elif test -x "`$WHICH automake17 2>/dev/null`" ; then
81
    AUTOMAKE="`$WHICH automake17`"
82
    ACLOCAL="`$WHICH aclocal17`"
83
  fi
84
  if test -n "$UNSERMAKE"; then 
85
     AUTOMAKE="$UNSERMAKE"
86
  fi
87
}
88
89
checkWhich ()
90
{
91
  WHICH=""
92
  for i in "type -p" "which" "type" ; do
93
    T=`$i sh 2> /dev/null`
94
    test -x "$T" && WHICH="$i" && break
95
  done
96
}
97
98
checkWhich
99
checkAutoconf
100
checkAutoheader
101
checkAutomakeAclocal
102
103
export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
(-)eventwatcher-0.4.3-orig/admin/Doxyfile.am (-120 / +43 lines)
Lines 1-70 Link Here
1
## generate API documentation with doxygen
1
## generate API documentation with doxygen
2
apidox-am-yes:
2
apidox-am-yes:
3
	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$DOXDATA" ; then \
4
		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
5
	fi ; \
6
	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
7
	test -d $(top_builddir)/apidocs || \
8
		( cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
9
		--no-modulename --installdir=$(kde_libs_htmldir)/en \
10
		--no-recurse $(abs_top_srcdir) . ) ; \
11
	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
12
		--recurse --no-modulename --installdir=$(kde_libs_htmldir)/en \
13
		$$abs_top_srcdir $(subdir)
14
15
apidox-am-toplevel-yes:
16
	@if test \! -d "$(top_srcdir)/doc/common/" && test -z "$$ADMIN" ; then \
17
		export DOXDATA=$(kde_libs_htmldir)/en/common ; \
18
	fi ; \
19
	abs_top_srcdir=`cd $(top_srcdir) && pwd` ;\
20
	cd $(top_builddir) && sh $$abs_top_srcdir/admin/doxygen.sh \
21
		--no-modulename --installdir=$(kde_libs_htmldir)/en \
22
		$$abs_top_srcdir
23
24
## Don't generate API documentation without doxygen
25
apidox-am-no:
26
27
apidox-am-toplevel-no:
28
29
30
apidox:
3
	@if test "$(subdir)" != "."; then \
31
	@if test "$(subdir)" != "."; then \
4
		$(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\
32
		$(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\
5
		if test ! -x $(top_builddir)/apidocs/common; then \
33
	else \
6
			if test -d $(top_srcdir)/doc/common; then \
34
		$(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\
7
			   common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
8
			else \
9
	   		   common_dir=$(kde_libs_htmldir)/en/common ;\
10
			fi ;\
11
			$(LN_S) $$common_dir $(top_builddir)/apidocs/common; \
12
		fi ;\
13
		cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
14
		echo "PROJECT_NAME           = \"$(subdir) Library\"" >> Doxyfile; \
15
		echo "PROJECT_NUMBER         = \"Version $(VERSION)\"" >> Doxyfile; \
16
		echo "INPUT                  = $(srcdir)" >> Doxyfile; \
17
		echo "IMAGE_PATH             = $(top_srcdir)/doc/api" >> Doxyfile ;\
18
		echo "OUTPUT_DIRECTORY       = $(top_builddir)/apidocs" >> Doxyfile; \
19
		echo "HTML_OUTPUT            = $(subdir)/html" >> Doxyfile; \
20
		echo "HTML_HEADER            = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\
21
		echo "HTML_FOOTER            = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\
22
		echo "HTML_STYLESHEET        = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\
23
		echo "LATEX_OUTPUT           = $(subdir)/latex" >> Doxyfile; \
24
		echo "RTF_OUTPUT             = $(subdir)/rtf" >> Doxyfile; \
25
		echo "MAN_OUTPUT             = $(subdir)/man" >> Doxyfile; \
26
		echo "GENERATE_HTML          = $(GENERATE_FLAG)" >> Doxyfile ;\
27
		echo "GENERATE_MAN          = $(GENERATE_FLAG)" >> Doxyfile ;\
28
		echo "GENERATE_LATEX          = $(GENERATE_FLAG)" >> Doxyfile ;\
29
		if test -n "$(DOXYGEN_EXCLUDE)"; then \
30
			patterns= ;\
31
			dirs= ;\
32
			for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \
33
				if test -d "$(srcdir)/$$item"; then \
34
					dirs="$$dirs $(srcdir)/$$item/" ;\
35
			    	else \
36
			        	patterns="$$patterns $$item" ;\
37
				fi ;\
38
			done ;\
39
			echo "EXCLUDE_PATTERNS      += $$patterns" >> Doxyfile; \
40
		    	echo "EXCLUDE               += $$dirs" >> Doxyfile ;\
41
		fi ;\
42
		echo "TAGFILES = \\" >> Doxyfile; \
43
		tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \
44
			tagpath= ;\
45
			path="../../$$tag" ;\
46
			if test -f $(top_builddir)/apidocs/$$tag/$$tag.tag; then \
47
				tagpath="$(top_builddir)/apidocs/$$tag/$$tag.tag" ;\
48
			else \
49
				tagpath=`ls -1 $(kde_htmldir)/en/*-apidocs/$$tag/$$tag.tag 2> /dev/null` ;\
50
				if test -n "$$tagpath"; then \
51
					path=`echo $$tagpath | sed -e "s,.*/\([^/]*-apidocs\)/$$tag/$$tag.tag,../../../\1/$$tag,"` ;\
52
				fi ;\
53
			fi ;\
54
			if test "$$tag" = qt; then \
55
				echo $$tagpath=$(QTDOCDIR) >> Doxyfile ;\
56
			else if test -n "$$tagpath"; then \
57
				echo "$$tagpath=$$path/html \\" >> Doxyfile ;\
58
			    fi ;\
59
			fi ;\
60
		done ;\
61
		echo "GENERATE_TAGFILE       = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\
62
		echo "IGNORE_PREFIX          = K" >> Doxyfile ;\
63
		echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\
64
		$(DOXYGEN) Doxyfile ;\
65
	fi
35
	fi
66
36
67
apidox-am-no:
37
68
38
69
install-data-local: install-apidox
39
install-data-local: install-apidox
70
40
Lines 83-95 Link Here
83
				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
53
				$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
84
		done; \
54
		done; \
85
		fi; \
55
		fi; \
86
		rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
87
		$(LN_S) $(kde_libs_htmldir)/en/common $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
88
	else\
56
	else\
89
		if test -d $(top_builddir)/apidocs; then \
57
		if test -d $(top_builddir)/apidocs; then \
90
		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
58
		$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
91
		list=`cd $(top_builddir)/apidocs && ls -1`; \
59
		list=`cd $(top_builddir)/apidocs && ls -1`; \
92
		echo "installing $(top_builddir)/apidocs/$$file" ;\
60
		echo "installing $(top_builddir)/apidocs/$$file" ;\
61
		echo "target directory $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs" ; \
93
		for file in $$list; do \
62
		for file in $$list; do \
94
			if test -f $(top_builddir)/apidocs/$$file; then \
63
			if test -f $(top_builddir)/apidocs/$$file; then \
95
				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
64
				$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
Lines 103-175 Link Here
103
uninstall-apidox:
72
uninstall-apidox:
104
	@if test "$(subdir)" != "."; then \
73
	@if test "$(subdir)" != "."; then \
105
		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
74
		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \
106
			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
75
			rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \
107
		fi\
76
		fi \
108
	else\
77
	else \
109
		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
78
		if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \
110
			rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
79
			rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
111
		fi\
80
		fi \
112
	fi
81
	fi
113
82
114
apidox:
83
install-apidox-recurse: install-apidox
115
	@if test "$(subdir)" != "."; then \
116
		$(MAKE) apidox-am-@KDE_HAS_DOXYGEN@ ;\
117
	else \
118
		$(MAKE) apidox-am-toplevel-@KDE_HAS_DOXYGEN@ ;\
119
	fi
120
	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
84
	@set fnord $(MAKEFLAGS); amf=$$2; if test -n '$(SUBDIRS)'; then \
121
	    list='$(SUBDIRS)'; \
85
	    list='$(SUBDIRS)'; \
122
	    for subdir in $$list; do \
86
	    for subdir in $$list; do \
123
		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
87
		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am > /dev/null ; then \
124
		echo "Making apidox in $$subdir"; \
88
		echo "Installing apidox from $$subdir"; \
125
		if test "$$subdir" != "."; then \
126
			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no apidox) || exit 1; \
127
		fi ; fi ;\
128
	    done; \
129
	    for subdir in $$list; do \
130
		if grep '^include .*Doxyfile.am' $(srcdir)/$$subdir/Makefile.am; then \
131
		echo "Making apidox in $$subdir"; \
132
		if test "$$subdir" != "."; then \
89
		if test "$$subdir" != "."; then \
133
			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=yes apidox) || exit 1; \
90
			(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) GENERATE_FLAG=no install-apidox-recurse) || exit 1; \
134
		fi ; fi ;\
91
		fi ; fi ;\
135
	    done; \
92
	    done; \
136
	fi
93
	fi
137
94
138
apidox-am-toplevel-no:
95
139
apidox-am-toplevel-yes:
140
	@echo "*** Creating API documentation main page"; \
141
	cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
142
	echo "PROJECT_NAME           = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \
143
	echo "PROJECT_NUMBER         = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \
144
	echo "INPUT                  = $(top_srcdir)" >> Doxyfile ; \
145
	echo "OUTPUT_DIRECTORY       = $(top_builddir)/apidocs" >> Doxyfile ; \
146
	echo "FILE_PATTERNS          = *.dox" >> Doxyfile ; \
147
	echo "RECURSIVE              = NO" >> Doxyfile ; \
148
	echo "SOURCE_BROWSER         = NO" >> Doxyfile ; \
149
	echo "ALPHABETICAL_INDEX     = NO" >> Doxyfile ; \
150
	echo "HTML_OUTPUT            = ." >> Doxyfile ; \
151
	echo "HTML_HEADER            = apidocs/common/mainheader.html" >> Doxyfile ; \
152
	echo "HTML_FOOTER            = apidocs/common/mainfooter.html" >> Doxyfile ; \
153
	echo "HTML_STYLESHEET        = apidocs/common/doxygen.css" >> Doxyfile ; \
154
	echo "GENERATE_LATEX         = NO" >> Doxyfile ; \
155
	echo "GENERATE_RTF           = NO" >> Doxyfile ; \
156
	echo "GENERATE_MAN           = NO" >> Doxyfile ; \
157
	echo "GENERATE_XML           = NO" >> Doxyfile ; \
158
	echo "GENERATE_AUTOGEN_DEF   = NO" >> Doxyfile ; \
159
	echo "ENABLE_PREPROCESSING   = NO" >> Doxyfile ; \
160
	echo "CLASS_DIAGRAMS         = NO" >> Doxyfile ; \
161
	echo "HAVE_DOT               = NO" >> Doxyfile ; \
162
	echo "GENERATE_HTML          = YES" >> Doxyfile ;\
163
	$(mkinstalldirs) $(top_builddir)/apidocs ; \
164
	rm -f $(top_builddir)/apidocs/common ; \
165
	if test -d $(top_srcdir)/doc/common; then \
166
	   common_dir=`cd $(top_srcdir)/doc/common && pwd` ;\
167
	else \
168
	   common_dir=$(kde_libs_htmldir)/en/common ;\
169
	fi ;\
170
	$(LN_S) $$common_dir $(top_builddir)/apidocs/common ;\
171
	doxygen Doxyfile; \
172
	rm -f Doxyfile
173
96
174
.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
97
.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
175
98
(-)eventwatcher-0.4.3-orig/admin/Doxyfile.global (-972 / +32 lines)
Lines 1-405 Link Here
1
# Doxyfile 1.3.6
2
3
# This file describes the settings to be used by the documentation system
4
# doxygen (www.doxygen.org) for a project
5
#
6
# All text after a hash (#) is considered a comment and will be ignored
7
# The format is:
8
#       TAG = value [value, ...]
9
# For lists items can also be appended using:
10
#       TAG += value [value, ...]
11
# Values that contain spaces should be placed between quotes (" ")
12
13
#---------------------------------------------------------------------------
14
# Project related configuration options
15
#---------------------------------------------------------------------------
16
17
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
18
# by quotes) that should identify the project.
19
20
PROJECT_NAME           = 
21
22
# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
23
# This could be handy for archiving the generated documentation or 
24
# if some version control system is used.
25
26
PROJECT_NUMBER         = 
27
28
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
29
# base path where the generated documentation will be put. 
30
# If a relative path is entered, it will be relative to the location 
31
# where doxygen was started. If left blank the current directory will be used.
32
33
OUTPUT_DIRECTORY       = ../apidocs/
34
35
# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
36
# documentation generated by doxygen is written. Doxygen will use this 
37
# information to generate all constant output in the proper language. 
38
# The default language is English, other supported languages are: 
39
# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
40
# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
41
# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
42
# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
43
44
OUTPUT_LANGUAGE        = English
1
OUTPUT_LANGUAGE        = English
45
46
# This tag can be used to specify the encoding used in the generated output. 
47
# The encoding is not always determined by the language that is chosen, 
48
# but also whether or not the output is meant for Windows or non-Windows users. 
49
# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
50
# forces the Windows encoding (this is the default for the Windows binary), 
51
# whereas setting the tag to NO uses a Unix-style encoding (the default for 
52
# all platforms other than Windows).
53
54
USE_WINDOWS_ENCODING   = NO
2
USE_WINDOWS_ENCODING   = NO
55
56
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
57
# include brief member descriptions after the members that are listed in 
58
# the file and class documentation (similar to JavaDoc). 
59
# Set to NO to disable this.
60
61
BRIEF_MEMBER_DESC      = NO
3
BRIEF_MEMBER_DESC      = NO
62
63
# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
64
# the brief description of a member or function before the detailed description. 
65
# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
66
# brief descriptions will be completely suppressed.
67
68
REPEAT_BRIEF           = YES
4
REPEAT_BRIEF           = YES
69
70
# This tag implements a quasi-intelligent brief description abbreviator 
71
# that is used to form the text in various listings. Each string 
72
# in this list, if found as the leading text of the brief description, will be 
73
# stripped from the text and the result after processing the whole list, is used 
74
# as the annotated text. Otherwise, the brief description is used as-is. If left 
75
# blank, the following values are used ("$name" is automatically replaced with the 
76
# name of the entity): "The $name class" "The $name widget" "The $name file" 
77
# "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
78
79
ABBREVIATE_BRIEF       = 
5
ABBREVIATE_BRIEF       = 
80
81
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
82
# Doxygen will generate a detailed section even if there is only a brief 
83
# description.
84
85
ALWAYS_DETAILED_SEC    = YES
6
ALWAYS_DETAILED_SEC    = YES
86
87
# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
88
# members of a class in the documentation of that class as if those members were 
89
# ordinary class members. Constructors, destructors and assignment operators of 
90
# the base classes will not be shown.
91
92
INLINE_INHERITED_MEMB  = NO
7
INLINE_INHERITED_MEMB  = NO
93
94
# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
95
# path before files name in the file list and in the header files. If set 
96
# to NO the shortest path that makes the file name unique will be used.
97
98
FULL_PATH_NAMES        = NO
8
FULL_PATH_NAMES        = NO
99
100
# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
101
# can be used to strip a user-defined part of the path. Stripping is 
102
# only done if one of the specified strings matches the left-hand part of 
103
# the path. It is allowed to use relative paths in the argument list. 
104
# If left blank the directory from which doxygen is run is used as the 
105
# path to strip.
106
107
STRIP_FROM_PATH        = 
9
STRIP_FROM_PATH        = 
108
109
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
110
# (but less readable) file names. This can be useful is your file systems 
111
# doesn't support long names like on DOS, Mac, or CD-ROM.
112
113
SHORT_NAMES            = NO
10
SHORT_NAMES            = NO
114
115
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
116
# will interpret the first line (until the first dot) of a JavaDoc-style 
117
# comment as the brief description. If set to NO, the JavaDoc 
118
# comments will behave just like the Qt-style comments (thus requiring an 
119
# explicit @brief command for a brief description.
120
121
JAVADOC_AUTOBRIEF      = YES
11
JAVADOC_AUTOBRIEF      = YES
122
123
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
124
# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
125
# comments) as a brief description. This used to be the default behaviour. 
126
# The new default is to treat a multi-line C++ comment block as a detailed 
127
# description. Set this tag to YES if you prefer the old behaviour instead.
128
129
MULTILINE_CPP_IS_BRIEF = NO
12
MULTILINE_CPP_IS_BRIEF = NO
130
131
# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
132
# will output the detailed description near the top, like JavaDoc.
133
# If set to NO, the detailed description appears after the member 
134
# documentation.
135
136
DETAILS_AT_TOP         = NO
137
138
# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
139
# member inherits the documentation from any documented member that it 
140
# re-implements.
141
142
INHERIT_DOCS           = YES
13
INHERIT_DOCS           = YES
143
144
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
145
# tag is set to YES, then doxygen will reuse the documentation of the first 
146
# member in the group (if any) for the other members of the group. By default 
147
# all members of a group must be documented explicitly.
148
149
DISTRIBUTE_GROUP_DOC   = NO
14
DISTRIBUTE_GROUP_DOC   = NO
150
151
# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
152
# Doxygen uses this value to replace tabs by spaces in code fragments.
153
154
TAB_SIZE               = 4
15
TAB_SIZE               = 4
155
156
# This tag can be used to specify a number of aliases that acts 
157
# as commands in the documentation. An alias has the form "name=value". 
158
# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
159
# put the command \sideeffect (or @sideeffect) in the documentation, which 
160
# will result in a user-defined paragraph with heading "Side Effects:". 
161
# You can put \n's in the value part of an alias to insert newlines.
162
163
ALIASES                = obsolete=@deprecated
164
165
# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
166
# only. Doxygen will then generate output that is more tailored for C. 
167
# For instance, some of the names that are used will be different. The list 
168
# of all members will be omitted, etc.
169
170
OPTIMIZE_OUTPUT_FOR_C  = NO
16
OPTIMIZE_OUTPUT_FOR_C  = NO
171
172
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
173
# only. Doxygen will then generate output that is more tailored for Java. 
174
# For instance, namespaces will be presented as packages, qualified scopes 
175
# will look different, etc.
176
177
OPTIMIZE_OUTPUT_JAVA   = NO
17
OPTIMIZE_OUTPUT_JAVA   = NO
178
179
# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
180
# the same type (for instance a group of public functions) to be put as a 
181
# subgroup of that type (e.g. under the Public Functions section). Set it to 
182
# NO to prevent subgrouping. Alternatively, this can be done per class using 
183
# the \nosubgrouping command.
184
185
SUBGROUPING            = YES
18
SUBGROUPING            = YES
186
187
#---------------------------------------------------------------------------
188
# Build related configuration options
189
#---------------------------------------------------------------------------
190
191
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
192
# documentation are documented, even if no documentation was available. 
193
# Private class members and static file members will be hidden unless 
194
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
195
196
EXTRACT_ALL            = NO
19
EXTRACT_ALL            = NO
197
198
# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
199
# will be included in the documentation.
200
201
EXTRACT_PRIVATE        = NO
20
EXTRACT_PRIVATE        = NO
202
203
# If the EXTRACT_STATIC tag is set to YES all static members of a file 
204
# will be included in the documentation.
205
206
EXTRACT_STATIC         = YES
21
EXTRACT_STATIC         = YES
207
208
# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
209
# defined locally in source files will be included in the documentation. 
210
# If set to NO only classes defined in header files are included.
211
212
EXTRACT_LOCAL_CLASSES  = NO
22
EXTRACT_LOCAL_CLASSES  = NO
213
214
# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
215
# undocumented members of documented classes, files or namespaces. 
216
# If set to NO (the default) these members will be included in the 
217
# various overviews, but no documentation section is generated. 
218
# This option has no effect if EXTRACT_ALL is enabled.
219
220
HIDE_UNDOC_MEMBERS     = NO
23
HIDE_UNDOC_MEMBERS     = NO
221
222
# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
223
# undocumented classes that are normally visible in the class hierarchy. 
224
# If set to NO (the default) these classes will be included in the various 
225
# overviews. This option has no effect if EXTRACT_ALL is enabled.
226
227
HIDE_UNDOC_CLASSES     = YES
24
HIDE_UNDOC_CLASSES     = YES
228
229
# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
230
# friend (class|struct|union) declarations. 
231
# If set to NO (the default) these declarations will be included in the 
232
# documentation.
233
234
HIDE_FRIEND_COMPOUNDS  = NO
25
HIDE_FRIEND_COMPOUNDS  = NO
235
236
# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
237
# documentation blocks found inside the body of a function. 
238
# If set to NO (the default) these blocks will be appended to the 
239
# function's detailed documentation block.
240
241
HIDE_IN_BODY_DOCS      = NO
26
HIDE_IN_BODY_DOCS      = NO
242
243
# The INTERNAL_DOCS tag determines if documentation 
244
# that is typed after a \internal command is included. If the tag is set 
245
# to NO (the default) then the documentation will be excluded. 
246
# Set it to YES to include the internal documentation.
247
248
INTERNAL_DOCS          = NO
27
INTERNAL_DOCS          = NO
249
250
# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
251
# file names in lower-case letters. If set to YES upper-case letters are also 
252
# allowed. This is useful if you have classes or files whose names only differ 
253
# in case and if your file system supports case sensitive file names. Windows 
254
# users are advised to set this option to NO.
255
256
CASE_SENSE_NAMES       = YES
28
CASE_SENSE_NAMES       = YES
257
258
# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
259
# will show members with their full class and namespace scopes in the 
260
# documentation. If set to YES the scope will be hidden.
261
262
HIDE_SCOPE_NAMES       = NO
29
HIDE_SCOPE_NAMES       = NO
263
264
# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
265
# will put a list of the files that are included by a file in the documentation 
266
# of that file.
267
268
SHOW_INCLUDE_FILES     = YES
30
SHOW_INCLUDE_FILES     = YES
269
270
# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
271
# is inserted in the documentation for inline members.
272
273
INLINE_INFO            = YES
31
INLINE_INFO            = YES
274
275
# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
276
# will sort the (detailed) documentation of file and class members 
277
# alphabetically by member name. If set to NO the members will appear in 
278
# declaration order.
279
280
SORT_MEMBER_DOCS       = NO
281
282
# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
283
# brief documentation of file, namespace and class members alphabetically 
284
# by member name. If set to NO (the default) the members will appear in 
285
# declaration order.
286
287
SORT_BRIEF_DOCS        = NO
32
SORT_BRIEF_DOCS        = NO
288
289
# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
290
# sorted by fully-qualified names, including namespaces. If set to 
291
# NO (the default), the class list will be sorted only by class name, 
292
# not including the namespace part. 
293
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
294
# Note: This option applies only to the class list, not to the 
295
# alphabetical list.
296
297
SORT_BY_SCOPE_NAME     = NO
33
SORT_BY_SCOPE_NAME     = NO
298
299
# The GENERATE_TODOLIST tag can be used to enable (YES) or 
300
# disable (NO) the todo list. This list is created by putting \todo 
301
# commands in the documentation.
302
303
GENERATE_TODOLIST      = NO
304
305
# The GENERATE_TESTLIST tag can be used to enable (YES) or 
306
# disable (NO) the test list. This list is created by putting \test 
307
# commands in the documentation.
308
309
GENERATE_TESTLIST      = NO
34
GENERATE_TESTLIST      = NO
310
311
# The GENERATE_BUGLIST tag can be used to enable (YES) or 
312
# disable (NO) the bug list. This list is created by putting \bug 
313
# commands in the documentation.
314
315
GENERATE_BUGLIST       = YES
35
GENERATE_BUGLIST       = YES
316
317
# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
318
# disable (NO) the deprecated list. This list is created by putting 
319
# \deprecated commands in the documentation.
320
321
GENERATE_DEPRECATEDLIST= YES
36
GENERATE_DEPRECATEDLIST= YES
322
323
# The ENABLED_SECTIONS tag can be used to enable conditional 
324
# documentation sections, marked by \if sectionname ... \endif.
325
326
ENABLED_SECTIONS       = 
37
ENABLED_SECTIONS       = 
327
328
# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
329
# the initial value of a variable or define consists of for it to appear in 
330
# the documentation. If the initializer consists of more lines than specified 
331
# here it will be hidden. Use a value of 0 to hide initializers completely. 
332
# The appearance of the initializer of individual variables and defines in the 
333
# documentation can be controlled using \showinitializer or \hideinitializer 
334
# command in the documentation regardless of this setting.
335
336
MAX_INITIALIZER_LINES  = 30
38
MAX_INITIALIZER_LINES  = 30
337
338
# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
339
# at the bottom of the documentation of classes and structs. If set to YES the 
340
# list will mention the files that were used to generate the documentation.
341
342
SHOW_USED_FILES        = YES
39
SHOW_USED_FILES        = YES
343
344
#---------------------------------------------------------------------------
345
# configuration options related to warning and progress messages
346
#---------------------------------------------------------------------------
347
348
# The QUIET tag can be used to turn on/off the messages that are generated 
349
# by doxygen. Possible values are YES and NO. If left blank NO is used.
350
351
QUIET                  = YES
40
QUIET                  = YES
352
353
# The WARNINGS tag can be used to turn on/off the warning messages that are 
354
# generated by doxygen. Possible values are YES and NO. If left blank 
355
# NO is used.
356
357
WARNINGS               = NO
41
WARNINGS               = NO
358
359
# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
360
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
361
# automatically be disabled.
362
363
WARN_IF_UNDOCUMENTED   = NO
42
WARN_IF_UNDOCUMENTED   = NO
364
365
# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
366
# potential errors in the documentation, such as not documenting some 
367
# parameters in a documented function, or documenting parameters that 
368
# don't exist or using markup commands wrongly.
369
370
WARN_IF_DOC_ERROR      = YES
43
WARN_IF_DOC_ERROR      = YES
371
372
# The WARN_FORMAT tag determines the format of the warning messages that 
373
# doxygen can produce. The string should contain the $file, $line, and $text 
374
# tags, which will be replaced by the file and line number from which the 
375
# warning originated and the warning text.
376
377
WARN_FORMAT            = 
44
WARN_FORMAT            = 
378
379
# The WARN_LOGFILE tag can be used to specify a file to which warning 
380
# and error messages should be written. If left blank the output is written 
381
# to stderr.
382
383
WARN_LOGFILE           = 
45
WARN_LOGFILE           = 
384
385
#---------------------------------------------------------------------------
386
# configuration options related to the input files
387
#---------------------------------------------------------------------------
388
389
# The INPUT tag can be used to specify the files and/or directories that contain 
390
# documented source files. You may enter file names like "myfile.cpp" or 
391
# directories like "/usr/src/myproject". Separate the files or directories 
392
# with spaces.
393
394
INPUT                  = 
46
INPUT                  = 
395
396
# If the value of the INPUT tag contains directories, you can use the 
397
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
398
# and *.h) to filter out the source-files in the directories. If left 
399
# blank the following patterns are tested: 
400
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
401
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
402
403
FILE_PATTERNS          = *.h \
47
FILE_PATTERNS          = *.h \
404
                         *.cpp \
48
                         *.cpp \
405
                         *.cc \
49
                         *.cc \
Lines 409-1132 Link Here
409
                         *.cxx \
53
                         *.cxx \
410
                         *.h++ \
54
                         *.h++ \
411
                         *.hh
55
                         *.hh
412
413
# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
414
# should be searched for input files as well. Possible values are YES and NO. 
415
# If left blank NO is used.
416
417
RECURSIVE              = YES
56
RECURSIVE              = YES
418
419
# The EXCLUDE tag can be used to specify files and/or directories that should 
420
# excluded from the INPUT source files. This way you can easily exclude a 
421
# subdirectory from a directory tree whose root is specified with the INPUT tag.
422
423
EXCLUDE                = 
57
EXCLUDE                = 
424
425
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
426
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
427
428
EXCLUDE_SYMLINKS       = NO
58
EXCLUDE_SYMLINKS       = NO
429
430
# If the value of the INPUT tag contains directories, you can use the 
431
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
432
# certain files from those directories.
433
434
EXCLUDE_PATTERNS       = *.moc.* \
59
EXCLUDE_PATTERNS       = *.moc.* \
435
                         moc* \
60
                         moc* \
436
                         *.all_cpp.* \
61
                         *.all_cpp.* \
437
                         *unload.* \
62
                         *unload.* \
438
                         */test/* \
63
                         */test/* \
439
                         */tests/*
64
                         */tests/* \
440
65
                         *_p.h 
441
# The EXAMPLE_PATH tag can be used to specify one or more files or 
442
# directories that contain example code fragments that are included (see 
443
# the \include command).
444
445
EXAMPLE_PATH           = 
66
EXAMPLE_PATH           = 
446
447
# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
448
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
449
# and *.h) to filter out the source-files in the directories. If left 
450
# blank all files are included.
451
452
EXAMPLE_PATTERNS       = 
67
EXAMPLE_PATTERNS       = 
453
454
# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
455
# searched for input files to be used with the \include or \dontinclude 
456
# commands irrespective of the value of the RECURSIVE tag. 
457
# Possible values are YES and NO. If left blank NO is used.
458
459
EXAMPLE_RECURSIVE      = NO
68
EXAMPLE_RECURSIVE      = NO
460
461
# The IMAGE_PATH tag can be used to specify one or more files or 
462
# directories that contain image that are included in the documentation (see 
463
# the \image command).
464
465
IMAGE_PATH             = 
69
IMAGE_PATH             = 
466
467
# The INPUT_FILTER tag can be used to specify a program that doxygen should 
468
# invoke to filter for each input file. Doxygen will invoke the filter program 
469
# by executing (via popen()) the command <filter> <input-file>, where <filter> 
470
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
471
# input file. Doxygen will then use the output that the filter program writes 
472
# to standard output.
473
474
INPUT_FILTER           = 
70
INPUT_FILTER           = 
475
476
# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
477
# INPUT_FILTER) will be used to filter the input files when producing source 
478
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
479
480
FILTER_SOURCE_FILES    = NO
71
FILTER_SOURCE_FILES    = NO
481
482
#---------------------------------------------------------------------------
483
# configuration options related to source browsing
484
#---------------------------------------------------------------------------
485
486
# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
487
# be generated. Documented entities will be cross-referenced with these sources. 
488
# Note: To get rid of all source code in the generated output, make sure also 
489
# VERBATIM_HEADERS is set to NO.
490
491
SOURCE_BROWSER         = YES
72
SOURCE_BROWSER         = YES
492
493
# Setting the INLINE_SOURCES tag to YES will include the body 
494
# of functions and classes directly in the documentation.
495
496
INLINE_SOURCES         = NO
73
INLINE_SOURCES         = NO
497
498
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
499
# doxygen to hide any special comment blocks from generated source code 
500
# fragments. Normal C and C++ comments will always remain visible.
501
502
STRIP_CODE_COMMENTS    = YES
74
STRIP_CODE_COMMENTS    = YES
503
504
# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
505
# then for each documented function all documented 
506
# functions referencing it will be listed.
507
508
REFERENCED_BY_RELATION = YES
75
REFERENCED_BY_RELATION = YES
509
510
# If the REFERENCES_RELATION tag is set to YES (the default) 
511
# then for each documented function all documented entities 
512
# called/used by that function will be listed.
513
514
REFERENCES_RELATION    = YES
76
REFERENCES_RELATION    = YES
515
516
# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
517
# will generate a verbatim copy of the header file for each class for 
518
# which an include is specified. Set to NO to disable this.
519
520
VERBATIM_HEADERS       = YES
77
VERBATIM_HEADERS       = YES
521
522
#---------------------------------------------------------------------------
523
# configuration options related to the alphabetical class index
524
#---------------------------------------------------------------------------
525
526
# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
527
# of all compounds will be generated. Enable this if the project 
528
# contains a lot of classes, structs, unions or interfaces.
529
530
ALPHABETICAL_INDEX     = YES
78
ALPHABETICAL_INDEX     = YES
531
532
# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
533
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
534
# in which this list will be split (can be a number in the range [1..20])
535
536
COLS_IN_ALPHA_INDEX    = 3
79
COLS_IN_ALPHA_INDEX    = 3
537
538
# In case all classes in a project start with a common prefix, all 
539
# classes will be put under the same header in the alphabetical index. 
540
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
541
# should be ignored while generating the index headers.
542
543
IGNORE_PREFIX          = K
544
545
#---------------------------------------------------------------------------
546
# configuration options related to the HTML output
547
#---------------------------------------------------------------------------
548
549
# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
550
# generate HTML output.
551
552
GENERATE_HTML          = NO
553
554
# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
555
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
556
# put in front of it. If left blank `html' will be used as the default path.
557
558
HTML_OUTPUT            = 
80
HTML_OUTPUT            = 
559
560
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
561
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
562
# doxygen will generate files with .html extension.
563
564
HTML_FILE_EXTENSION    = .html
81
HTML_FILE_EXTENSION    = .html
565
566
# The HTML_HEADER tag can be used to specify a personal HTML header for 
567
# each generated HTML page. If it is left blank doxygen will generate a 
568
# standard header.
569
570
HTML_HEADER            = ../apidocs/common/header.html
82
HTML_HEADER            = ../apidocs/common/header.html
571
572
# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
573
# each generated HTML page. If it is left blank doxygen will generate a 
574
# standard footer.
575
576
HTML_FOOTER            = ../apidocs/common/footer.html
83
HTML_FOOTER            = ../apidocs/common/footer.html
577
578
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
579
# style sheet that is used by each HTML page. It can be used to 
580
# fine-tune the look of the HTML output. If the tag is left blank doxygen 
581
# will generate a default style sheet. Note that doxygen will try to copy 
582
# the style sheet file to the HTML output directory, so don't put your own 
583
# stylesheet in the HTML output directory as well, or it will be erased!
584
585
HTML_STYLESHEET        = ../apidocs/common/doxygen.css
84
HTML_STYLESHEET        = ../apidocs/common/doxygen.css
586
587
# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
588
# files or namespaces will be aligned in HTML using tables. If set to 
589
# NO a bullet list will be used.
590
591
HTML_ALIGN_MEMBERS     = YES
85
HTML_ALIGN_MEMBERS     = YES
592
593
# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
594
# will be generated that can be used as input for tools like the 
595
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
596
# of the generated HTML documentation.
597
598
GENERATE_HTMLHELP      = NO
86
GENERATE_HTMLHELP      = NO
599
600
# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
601
# be used to specify the file name of the resulting .chm file. You 
602
# can add a path in front of the file if the result should not be 
603
# written to the html output directory.
604
605
CHM_FILE               = 
87
CHM_FILE               = 
606
607
# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
608
# be used to specify the location (absolute path including file name) of 
609
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
610
# the HTML help compiler on the generated index.hhp.
611
612
HHC_LOCATION           = 
88
HHC_LOCATION           = 
613
614
# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
615
# controls if a separate .chi index file is generated (YES) or that 
616
# it should be included in the master .chm file (NO).
617
618
GENERATE_CHI           = NO
89
GENERATE_CHI           = NO
619
620
# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
621
# controls whether a binary table of contents is generated (YES) or a 
622
# normal table of contents (NO) in the .chm file.
623
624
BINARY_TOC             = NO
90
BINARY_TOC             = NO
625
626
# The TOC_EXPAND flag can be set to YES to add extra items for group members 
627
# to the contents of the HTML help documentation and to the tree view.
628
629
TOC_EXPAND             = NO
91
TOC_EXPAND             = NO
630
631
# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
632
# top of each HTML page. The value NO (the default) enables the index and 
633
# the value YES disables it.
634
635
DISABLE_INDEX          = YES
92
DISABLE_INDEX          = YES
636
637
# This tag can be used to set the number of enum values (range [1..20]) 
638
# that doxygen will group on one line in the generated HTML documentation.
639
640
ENUM_VALUES_PER_LINE   = 4
93
ENUM_VALUES_PER_LINE   = 4
641
642
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
643
# generated containing a tree-like index structure (just like the one that 
644
# is generated for HTML Help). For this to work a browser that supports 
645
# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
646
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
647
# probably better off using the HTML help feature.
648
649
GENERATE_TREEVIEW      = NO
94
GENERATE_TREEVIEW      = NO
650
651
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
652
# used to set the initial width (in pixels) of the frame in which the tree 
653
# is shown.
654
655
TREEVIEW_WIDTH         = 250
95
TREEVIEW_WIDTH         = 250
656
657
#---------------------------------------------------------------------------
658
# configuration options related to the LaTeX output
659
#---------------------------------------------------------------------------
660
661
# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
662
# generate Latex output.
663
664
GENERATE_LATEX         = NO
96
GENERATE_LATEX         = NO
665
666
# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
667
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
668
# put in front of it. If left blank `latex' will be used as the default path.
669
670
LATEX_OUTPUT           = 
97
LATEX_OUTPUT           = 
671
672
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
673
# invoked. If left blank `latex' will be used as the default command name.
674
675
LATEX_CMD_NAME         = latex
98
LATEX_CMD_NAME         = latex
676
677
# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
678
# generate index for LaTeX. If left blank `makeindex' will be used as the 
679
# default command name.
680
681
MAKEINDEX_CMD_NAME     = makeindex
99
MAKEINDEX_CMD_NAME     = makeindex
682
683
# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
684
# LaTeX documents. This may be useful for small projects and may help to 
685
# save some trees in general.
686
687
COMPACT_LATEX          = NO
100
COMPACT_LATEX          = NO
688
689
# The PAPER_TYPE tag can be used to set the paper type that is used 
690
# by the printer. Possible values are: a4, a4wide, letter, legal and 
691
# executive. If left blank a4wide will be used.
692
693
PAPER_TYPE             = a4wide
101
PAPER_TYPE             = a4wide
694
695
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
696
# packages that should be included in the LaTeX output.
697
698
EXTRA_PACKAGES         = 
102
EXTRA_PACKAGES         = 
699
700
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
701
# the generated latex document. The header should contain everything until 
702
# the first chapter. If it is left blank doxygen will generate a 
703
# standard header. Notice: only use this tag if you know what you are doing!
704
705
LATEX_HEADER           = 
103
LATEX_HEADER           = 
706
707
# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
708
# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
709
# contain links (just like the HTML output) instead of page references 
710
# This makes the output suitable for online browsing using a pdf viewer.
711
712
PDF_HYPERLINKS         = NO
104
PDF_HYPERLINKS         = NO
713
714
# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
715
# plain latex in the generated Makefile. Set this option to YES to get a 
716
# higher quality PDF documentation.
717
718
USE_PDFLATEX           = NO
105
USE_PDFLATEX           = NO
719
720
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
721
# command to the generated LaTeX files. This will instruct LaTeX to keep 
722
# running if errors occur, instead of asking the user for help. 
723
# This option is also used when generating formulas in HTML.
724
725
LATEX_BATCHMODE        = NO
106
LATEX_BATCHMODE        = NO
726
727
# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
728
# include the index chapters (such as File Index, Compound Index, etc.) 
729
# in the output.
730
731
LATEX_HIDE_INDICES     = NO
107
LATEX_HIDE_INDICES     = NO
732
733
#---------------------------------------------------------------------------
734
# configuration options related to the RTF output
735
#---------------------------------------------------------------------------
736
737
# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
738
# The RTF output is optimized for Word 97 and may not look very pretty with 
739
# other RTF readers or editors.
740
741
GENERATE_RTF           = NO
108
GENERATE_RTF           = NO
742
743
# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
744
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
745
# put in front of it. If left blank `rtf' will be used as the default path.
746
747
RTF_OUTPUT             = 
109
RTF_OUTPUT             = 
748
749
# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
750
# RTF documents. This may be useful for small projects and may help to 
751
# save some trees in general.
752
753
COMPACT_RTF            = NO
110
COMPACT_RTF            = NO
754
755
# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
756
# will contain hyperlink fields. The RTF file will 
757
# contain links (just like the HTML output) instead of page references. 
758
# This makes the output suitable for online browsing using WORD or other 
759
# programs which support those fields. 
760
# Note: wordpad (write) and others do not support links.
761
762
RTF_HYPERLINKS         = NO
111
RTF_HYPERLINKS         = NO
763
764
# Load stylesheet definitions from file. Syntax is similar to doxygen's 
765
# config file, i.e. a series of assignments. You only have to provide 
766
# replacements, missing definitions are set to their default value.
767
768
RTF_STYLESHEET_FILE    = 
112
RTF_STYLESHEET_FILE    = 
769
770
# Set optional variables used in the generation of an rtf document. 
771
# Syntax is similar to doxygen's config file.
772
773
RTF_EXTENSIONS_FILE    = 
113
RTF_EXTENSIONS_FILE    = 
774
775
#---------------------------------------------------------------------------
776
# configuration options related to the man page output
777
#---------------------------------------------------------------------------
778
779
# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
780
# generate man pages
781
782
GENERATE_MAN           = NO
114
GENERATE_MAN           = NO
783
784
# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
785
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
786
# put in front of it. If left blank `man' will be used as the default path.
787
788
MAN_OUTPUT             = 
115
MAN_OUTPUT             = 
789
790
# The MAN_EXTENSION tag determines the extension that is added to 
791
# the generated man pages (default is the subroutine's section .3)
792
793
MAN_EXTENSION          = .kde3
116
MAN_EXTENSION          = .kde3
794
795
# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
796
# then it will generate one additional man file for each entity 
797
# documented in the real man page(s). These additional files 
798
# only source the real man page, but without them the man command 
799
# would be unable to find the correct page. The default is NO.
800
801
MAN_LINKS              = YES
117
MAN_LINKS              = YES
802
803
#---------------------------------------------------------------------------
804
# configuration options related to the XML output
805
#---------------------------------------------------------------------------
806
807
# If the GENERATE_XML tag is set to YES Doxygen will 
808
# generate an XML file that captures the structure of 
809
# the code including all documentation.
810
811
GENERATE_XML           = NO
118
GENERATE_XML           = NO
812
813
# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
814
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
815
# put in front of it. If left blank `xml' will be used as the default path.
816
817
XML_OUTPUT             = xml
119
XML_OUTPUT             = xml
818
819
# The XML_SCHEMA tag can be used to specify an XML schema, 
820
# which can be used by a validating XML parser to check the 
821
# syntax of the XML files.
822
823
XML_SCHEMA             = 
120
XML_SCHEMA             = 
824
825
# The XML_DTD tag can be used to specify an XML DTD, 
826
# which can be used by a validating XML parser to check the 
827
# syntax of the XML files.
828
829
XML_DTD                = 
121
XML_DTD                = 
830
831
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
832
# dump the program listings (including syntax highlighting 
833
# and cross-referencing information) to the XML output. Note that 
834
# enabling this will significantly increase the size of the XML output.
835
836
XML_PROGRAMLISTING     = NO
122
XML_PROGRAMLISTING     = NO
837
838
#---------------------------------------------------------------------------
839
# configuration options for the AutoGen Definitions output
840
#---------------------------------------------------------------------------
841
842
# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
843
# generate an AutoGen Definitions (see autogen.sf.net) file 
844
# that captures the structure of the code including all 
845
# documentation. Note that this feature is still experimental 
846
# and incomplete at the moment.
847
848
GENERATE_AUTOGEN_DEF   = NO
123
GENERATE_AUTOGEN_DEF   = NO
849
850
#---------------------------------------------------------------------------
851
# configuration options related to the Perl module output
852
#---------------------------------------------------------------------------
853
854
# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
855
# generate a Perl module file that captures the structure of 
856
# the code including all documentation. Note that this 
857
# feature is still experimental and incomplete at the 
858
# moment.
859
860
GENERATE_PERLMOD       = NO
124
GENERATE_PERLMOD       = NO
861
862
# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
863
# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
864
# to generate PDF and DVI output from the Perl module output.
865
866
PERLMOD_LATEX          = NO
125
PERLMOD_LATEX          = NO
867
868
# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
869
# nicely formatted so it can be parsed by a human reader.  This is useful 
870
# if you want to understand what is going on.  On the other hand, if this 
871
# tag is set to NO the size of the Perl module output will be much smaller 
872
# and Perl will parse it just the same.
873
874
PERLMOD_PRETTY         = YES
126
PERLMOD_PRETTY         = YES
875
876
# The names of the make variables in the generated doxyrules.make file 
877
# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
878
# This is useful so different doxyrules.make files included by the same 
879
# Makefile don't overwrite each other's variables.
880
881
PERLMOD_MAKEVAR_PREFIX = 
127
PERLMOD_MAKEVAR_PREFIX = 
882
883
#---------------------------------------------------------------------------
884
# Configuration options related to the preprocessor   
885
#---------------------------------------------------------------------------
886
887
# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
888
# evaluate all C-preprocessor directives found in the sources and include 
889
# files.
890
891
ENABLE_PREPROCESSING   = YES
128
ENABLE_PREPROCESSING   = YES
892
893
# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
894
# names in the source code. If set to NO (the default) only conditional 
895
# compilation will be performed. Macro expansion can be done in a controlled 
896
# way by setting EXPAND_ONLY_PREDEF to YES.
897
898
MACRO_EXPANSION        = NO
899
900
# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
901
# then the macro expansion is limited to the macros specified with the 
902
# PREDEFINED and EXPAND_AS_PREDEFINED tags.
903
904
EXPAND_ONLY_PREDEF     = NO
905
906
# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
907
# in the INCLUDE_PATH (see below) will be search if a #include is found.
908
909
SEARCH_INCLUDES        = YES
129
SEARCH_INCLUDES        = YES
910
911
# The INCLUDE_PATH tag can be used to specify one or more directories that 
912
# contain include files that are not input files but should be processed by 
913
# the preprocessor.
914
915
INCLUDE_PATH           = 
130
INCLUDE_PATH           = 
916
917
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
918
# patterns (like *.h and *.hpp) to filter out the header-files in the 
919
# directories. If left blank, the patterns specified with FILE_PATTERNS will 
920
# be used.
921
922
INCLUDE_FILE_PATTERNS  = 
131
INCLUDE_FILE_PATTERNS  = 
923
924
# The PREDEFINED tag can be used to specify one or more macro names that 
925
# are defined before the preprocessor is started (similar to the -D option of 
926
# gcc). The argument of the tag is a list of macros of the form: name 
927
# or name=definition (no spaces). If the definition and the = are 
928
# omitted =1 is assumed.
929
930
PREDEFINED             = QT_VERSION=320 \
132
PREDEFINED             = QT_VERSION=320 \
931
                         __cplusplus \
133
                         __cplusplus \
932
                         Q_WS_X11
134
                         Q_WS_X11
933
934
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
935
# this tag can be used to specify a list of macro names that should be expanded. 
936
# The macro definition that is found in the sources will be used. 
937
# Use the PREDEFINED tag if you want to use a different macro definition.
938
939
EXPAND_AS_DEFINED      = 
135
EXPAND_AS_DEFINED      = 
940
941
# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
942
# doxygen's preprocessor will remove all function-like macros that are alone 
943
# on a line, have an all uppercase name, and do not end with a semicolon. Such 
944
# function macros are typically used for boiler-plate code, and will confuse the 
945
# parser if not removed.
946
947
SKIP_FUNCTION_MACROS   = YES
136
SKIP_FUNCTION_MACROS   = YES
948
949
#---------------------------------------------------------------------------
950
# Configuration::additions related to external references   
951
#---------------------------------------------------------------------------
952
953
# The TAGFILES option can be used to specify one or more tagfiles. 
954
# Optionally an initial location of the external documentation 
955
# can be added for each tagfile. The format of a tag file without 
956
# this location is as follows: 
957
#   TAGFILES = file1 file2 ... 
958
# Adding location for the tag files is done as follows: 
959
#   TAGFILES = file1=loc1 "file2 = loc2" ... 
960
# where "loc1" and "loc2" can be relative or absolute paths or 
961
# URLs. If a location is present for each tag, the installdox tool 
962
# does not have to be run to correct the links.
963
# Note that each tag file must have a unique name
964
# (where the name does NOT include the path)
965
# If a tag file is not located in the directory in which doxygen 
966
# is run, you must also specify the path to the tagfile here.
967
968
TAGFILES               = 
137
TAGFILES               = 
969
970
# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
971
# a tag file that is based on the input files it reads.
972
973
GENERATE_TAGFILE       = 
138
GENERATE_TAGFILE       = 
974
975
# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
976
# in the class index. If set to NO only the inherited external classes 
977
# will be listed.
978
979
ALLEXTERNALS           = NO
139
ALLEXTERNALS           = NO
980
981
# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
982
# in the modules index. If set to NO, only the current project's groups will 
983
# be listed.
984
985
EXTERNAL_GROUPS        = NO
140
EXTERNAL_GROUPS        = NO
986
987
# The PERL_PATH should be the absolute path and name of the perl script 
988
# interpreter (i.e. the result of `which perl').
989
990
PERL_PATH              = 
141
PERL_PATH              = 
991
992
#---------------------------------------------------------------------------
993
# Configuration options related to the dot tool   
994
#---------------------------------------------------------------------------
995
996
# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
997
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
998
# super classes. Setting the tag to NO turns the diagrams off. Note that this 
999
# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
1000
# recommended to install and use dot, since it yields more powerful graphs.
1001
1002
CLASS_DIAGRAMS         = YES
142
CLASS_DIAGRAMS         = YES
1003
1004
# If set to YES, the inheritance and collaboration graphs will hide 
1005
# inheritance and usage relations if the target is undocumented 
1006
# or is not a class.
1007
1008
HIDE_UNDOC_RELATIONS   = NO
143
HIDE_UNDOC_RELATIONS   = NO
1009
1010
# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
1011
# available from the path. This tool is part of Graphviz, a graph visualization 
1012
# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
1013
# have no effect if this option is set to NO (the default)
1014
1015
HAVE_DOT               = NO
144
HAVE_DOT               = NO
1016
1017
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
1018
# will generate a graph for each documented class showing the direct and 
1019
# indirect inheritance relations. Setting this tag to YES will force the 
1020
# the CLASS_DIAGRAMS tag to NO.
1021
1022
CLASS_GRAPH            = YES
1023
1024
# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
1025
# will generate a graph for each documented class showing the direct and 
1026
# indirect implementation dependencies (inheritance, containment, and 
1027
# class references variables) of the class with other documented classes.
1028
1029
COLLABORATION_GRAPH    = YES
1030
1031
# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
1032
# collaboration diagrams in a style similar to the OMG's Unified Modeling 
1033
# Language.
1034
1035
UML_LOOK               = NO
145
UML_LOOK               = NO
1036
1037
# If set to YES, the inheritance and collaboration graphs will show the 
1038
# relations between templates and their instances.
1039
1040
TEMPLATE_RELATIONS     = YES
146
TEMPLATE_RELATIONS     = YES
1041
1042
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
1043
# tags are set to YES then doxygen will generate a graph for each documented 
1044
# file showing the direct and indirect include dependencies of the file with 
1045
# other documented files.
1046
1047
INCLUDE_GRAPH          = YES
147
INCLUDE_GRAPH          = YES
1048
1049
# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
1050
# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
1051
# documented header file showing the documented files that directly or 
1052
# indirectly include this file.
1053
1054
INCLUDED_BY_GRAPH      = YES
148
INCLUDED_BY_GRAPH      = YES
1055
1056
# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
1057
# generate a call dependency graph for every global function or class method. 
1058
# Note that enabling this option will significantly increase the time of a run. 
1059
# So in most cases it will be better to enable call graphs for selected 
1060
# functions only using the \callgraph command.
1061
1062
CALL_GRAPH             = NO
149
CALL_GRAPH             = NO
1063
1064
# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
1065
# will graphical hierarchy of all classes instead of a textual one.
1066
1067
GRAPHICAL_HIERARCHY    = YES
150
GRAPHICAL_HIERARCHY    = YES
1068
1069
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
1070
# generated by dot. Possible values are png, jpg, or gif
1071
# If left blank png will be used.
1072
1073
DOT_IMAGE_FORMAT       = png
151
DOT_IMAGE_FORMAT       = png
1074
1075
# The tag DOT_PATH can be used to specify the path where the dot tool can be 
1076
# found. If left blank, it is assumed the dot tool can be found on the path.
1077
1078
DOT_PATH               = 
152
DOT_PATH               = 
1079
1080
# The DOTFILE_DIRS tag can be used to specify one or more directories that 
1081
# contain dot files that are included in the documentation (see the 
1082
# \dotfile command).
1083
1084
DOTFILE_DIRS           = 
153
DOTFILE_DIRS           = 
1085
1086
# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
1087
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
1088
# this value, doxygen will try to truncate the graph, so that it fits within 
1089
# the specified constraint. Beware that most browsers cannot cope with very 
1090
# large images.
1091
1092
MAX_DOT_GRAPH_WIDTH    = 800
154
MAX_DOT_GRAPH_WIDTH    = 800
1093
1094
# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
1095
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
1096
# this value, doxygen will try to truncate the graph, so that it fits within 
1097
# the specified constraint. Beware that most browsers cannot cope with very 
1098
# large images.
1099
1100
MAX_DOT_GRAPH_HEIGHT   = 1024
155
MAX_DOT_GRAPH_HEIGHT   = 1024
1101
1102
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
1103
# graphs generated by dot. A depth value of 3 means that only nodes reachable 
1104
# from the root by following a path via at most 3 edges will be shown. Nodes that 
1105
# lay further from the root node will be omitted. Note that setting this option to 
1106
# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
1107
# note that a graph may be further truncated if the graph's image dimensions are 
1108
# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
1109
# If 0 is used for the depth value (the default), the graph is not depth-constrained.
1110
1111
MAX_DOT_GRAPH_DEPTH    = 0
156
MAX_DOT_GRAPH_DEPTH    = 0
1112
1113
# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
1114
# generate a legend page explaining the meaning of the various boxes and 
1115
# arrows in the dot generated graphs.
1116
1117
GENERATE_LEGEND        = YES
157
GENERATE_LEGEND        = YES
158
DOT_CLEANUP            = YES
159
SEARCHENGINE           = NO
1118
160
1119
# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
161
### KDE Settings
1120
# remove the intermediate dot files that are used to generate 
162
ALIASES = \
1121
# the various graphs.
163
	"intern=\par<b>Internal use only.</b>" \
164
	"reimp=\par<b>Reimplemented from superclass.</b>" \
165
	"obsolete=@deprecated" \
166
	"feature=\xrefitem features \"Feature(s)\" \"Features\"" \
167
	"maintainer=\xrefitem maintainers \"Maintainer(s)\" \"Maintainers\"" \
168
	"unmaintained=\xrefitem unmaintained \"Unmaintained\" \"Unmaintained\"" \
169
	"requirement=\xrefitem requirements \"Requirement(s)\" \"Requirements\"" \
170
	"faq=\xrefitem FAQ \"F.A.Q.\" \"F.A.Q.\"" \
171
	"authors=\xrefitem authors \"Author(s)\" \"Authors\"" \
172
	"FIXME=\xrefitem fixme \"Fixme\" \"Fixme\""
1122
173
1123
DOT_CLEANUP            = YES
174
HTML_ALIGN_MEMBERS     = YES
175
REFERENCED_BY_RELATION = NO
176
REFERENCES_RELATION    = NO
177
VERBATIM_HEADERS       = NO
178
GENERATE_HTML          = YES
179
SOURCE_BROWSER         = YES
180
GENERATE_AUTOGEN_DEF   = NO
181
DETAILS_AT_TOP         = YES
182
SORT_MEMBER_DOCS       = YES
183
GENERATE_TODOLIST      = YES
184
IGNORE_PREFIX          = K
185
GENERATE_HTML          = YES
186
CLASS_GRAPH            = YES
187
COLLABORATION_GRAPH    = NO
1124
188
1125
#---------------------------------------------------------------------------
1126
# Configuration::additions related to the search engine   
1127
#---------------------------------------------------------------------------
1128
189
1129
# The SEARCHENGINE tag specifies whether or not a search engine should be 
190
MACRO_EXPANSION = YES
1130
# used. If set to NO the values of all tags below this one will be ignored.
191
EXPAND_ONLY_PREDEF = YES
1131
192
1132
SEARCHENGINE           = NO
(-)eventwatcher-0.4.3-orig/admin/doxygen.sh (+883 lines)
Line 0 Link Here
1
#! /bin/sh
2
#
3
# doxygen.sh Copyright (C) 2005 by Adriaan de Groot
4
#            Based on some code from Doxyfile.am, among other things.
5
# License:   GPL version 2.
6
#            See file COPYING in kdelibs for details.
7
8
echo "*** doxygen.sh"
9
10
# Recurse handling is a little complicated, since normally
11
# subdir (given on the command-line) processing doesn't recurse
12
# but you can force it to do so.
13
recurse=1
14
recurse_given=NO
15
use_modulename=1
16
cleanup=YES
17
18
while test -n "$1" ; do
19
case "x$1" in
20
"x--no-cleanup" )
21
	cleanup=NO
22
	;;
23
"x--no-recurse" )
24
	recurse=0
25
	recurse_given=YES
26
	;;
27
"x--recurse" )
28
	recurse=1
29
	recurse_given=YES
30
	;;
31
"x--no-modulename" )
32
	use_modulename=0
33
	;;
34
"x--modulename" )
35
	use_modulename=1
36
	;;
37
"x--help" )
38
	echo "doxygen.sh usage:"
39
	echo "doxygen.sh [--no-recurse] [--no-modulename] <srcdir> [<subdir>]"
40
	exit 2
41
	;;
42
x--doxdatadir=* )
43
	DOXDATA=`echo $1 | sed -e 's+--doxdatadir=++'`
44
	;;
45
x--installdir=*)
46
	PREFIX=`echo $1 | sed -e 's+--installdir=++'`
47
	;;
48
x--* )
49
	echo "Unknown option: $1"
50
	exit 1
51
	;;
52
* )
53
	top_srcdir="$1"
54
	break
55
	;;
56
esac
57
shift
58
done
59
60
61
### Sanity check the mandatory "top srcdir" argument.
62
if test -z "$top_srcdir" ; then
63
	echo "Usage: doxygen.sh <top_srcdir>"
64
	exit 1
65
fi
66
if test ! -d "$top_srcdir" ; then
67
	echo "top_srcdir ($top_srcdir) is not a directory."
68
	exit 1
69
fi
70
71
### Normalize top_srcdir so it is an absolute path.
72
if expr "x$top_srcdir" : "x/" > /dev/null ; then
73
	# top_srcdir is absolute already
74
	:
75
else
76
	top_srcdir=`cd "$top_srcdir" 2> /dev/null && pwd`
77
	if test ! -d "$top_srcdir" ; then
78
		echo "top_srcdir ($top_srcdir) is not a directory."
79
		exit 1
80
	fi
81
fi
82
83
84
85
### Sanity check and guess QTDOCDIR.
86
if test -z "$QTDOCDIR" ; then
87
	if test -z "$QTDIR" ; then
88
		for i in /usr/X11R6/share/doc/qt/html
89
		do
90
			QTDOCDIR="$i"
91
			test -d "$QTDOCDIR" && break
92
		done
93
	else
94
		for i in share/doc/qt/html doc/html
95
		do
96
			QTDOCDIR="$QTDIR/$i"
97
			test -d "$QTDOCDIR" && break
98
		done
99
	fi
100
fi
101
if test -z "$QTDOCDIR"  || test ! -d "$QTDOCDIR" ; then
102
	if test -z "$QTDOCDIR" ; then
103
		echo "* QTDOCDIR could not be guessed."
104
	else
105
		echo "* QTDOCDIR does not name a directory."
106
	fi
107
	if test -z "$QTDOCTAG" ; then
108
		echo "* QTDOCDIR set to \"\""
109
		QTDOCDIR=""
110
	else
111
		echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
112
	fi
113
fi
114
115
### Get the "top srcdir", also its name, and handle the case that subdir "."
116
### is given (which would be top_srcdir then, so it's equal to none-given
117
### but no recursion either).
118
###
119
# top_srcdir="$1" # Already set by options processing
120
module_name=`basename "$top_srcdir"`
121
subdir="$2"
122
if test "x." = "x$subdir" ; then
123
	subdir=""
124
	if test "x$recurse_given" = "xNO" ; then
125
		recurse=0
126
	fi
127
fi
128
if test "x" != "x$subdir" ; then
129
	# If no recurse option given explicitly, default to
130
	# no recurse when processing subdirs given on the command-line.
131
	if test "x$recurse_given" = "xNO" ; then
132
		recurse=0
133
	fi
134
fi
135
136
if test -z "$DOXDATA" || test ! -d "$DOXDATA" ; then
137
	if test -n "$DOXDATA" ; then
138
		echo "* \$DOXDATA is '$DOXDATA' which does not name a directory"
139
	fi
140
	DOXDATA="$top_srcdir/doc/common"
141
fi
142
143
if test ! -d "$DOXDATA" ; then
144
	echo "* \$DOXDATA does not name a directory ( or is unset ), tried \"$DOXDATA\""
145
	exit 1
146
fi
147
148
if test -n "$PREFIX" && test ! -d "$PREFIX" ; then
149
	echo "* \$PREFIX does not name a directory, tried \"$PREFIX\""
150
	echo "* \$PREFIX is disabled."
151
	PREFIX=""
152
fi
153
154
### We need some values from top-level files, which
155
### are not preserved between invocations of this
156
### script, so factor it out for easy use.
157
create_doxyfile_in() 
158
{
159
	eval `grep 'VERSION="' "$top_srcdir/admin/cvs.sh"`
160
	echo "PROJECT_NUMBER = $VERSION" > Doxyfile.in
161
	grep '^KDE_INIT_DOXYGEN' "$top_srcdir/configure.in.in" | \
162
		sed -e 's+[^[]*\[\([^]]*\)+PROJECT_NAME = "\1"+' \
163
			-e 's+].*++' >> Doxyfile.in
164
}
165
166
apidoxdir="$module_name"-apidocs
167
test "x$use_modulename" = "x0" && apidoxdir="apidocs"
168
169
### If we're making the top subdir, create the structure
170
### for the apidox and initialize it. Otherwise, just use the
171
### structure assumed to be there.
172
if test -z "$subdir" ; then
173
	if test ! -d "$apidoxdir" ; then
174
		mkdir "$apidoxdir" > /dev/null 2>&1
175
	fi
176
	cd "$apidoxdir" > /dev/null 2>&1 || { 
177
		echo "Cannot create and cd into $apidoxdir"
178
		exit 1
179
	}
180
181
	test -f "Doxyfile.in" || create_doxyfile_in
182
183
	# Copy in logos and the like
184
	for i in "favicon.ico" "kde_gear_64.png"
185
	do
186
		cp "$DOXDATA/$i" . > /dev/null 2> /dev/null
187
	done
188
	for i in "$top_srcdir/doc/api/Dox-"*.png
189
	do
190
		T=`basename "$i" | sed -e 's+Dox-++'`
191
		test -f "$i" && cp "$i" "./$T" > /dev/null 2> /dev/null
192
	done
193
194
	top_builddir="."
195
	srcdir="$1"
196
	subdir="."
197
else
198
	cd "$apidoxdir" > /dev/null 2>&1 || {
199
		echo "Cannot cd into $apidoxdir -- maybe you need to"
200
		echo "build the top-level dox first."
201
		exit 1
202
	}
203
204
	if test "x1" = "x$recurse" ; then
205
		# OK, so --recurse was requested
206
		if test ! -f "subdirs.top" ; then
207
			echo "* No subdirs.top available in the $apidoxdir."
208
			echo "* The --recurse option will be ignored."
209
			recurse=0
210
		fi
211
	fi
212
fi
213
214
### Read a single line (TODO: support \ continuations) from the Makefile.am.
215
### Used to extract variable assignments from it.
216
extract_line()
217
{
218
	file="$2" ; test -z "$file" && file="$srcdir/Makefile.am"
219
	pattern=`echo "$1" | tr + .`
220
	grep "^$1" "$file" | \
221
		sed -e "s+$pattern.*=\s*++"
222
}
223
224
### Handle the COMPILE_{FIRST,LAST,BEFORE,AFTER} part of Makefile.am
225
### in the toplevel. Copied from admin/cvs.sh. Licence presumed LGPL).
226
create_subdirs()
227
{
228
echo "* Sorting top-level subdirs"
229
dirs=
230
idirs=
231
if test -f "$top_srcdir/inst-apps"; then
232
   idirs=`cat "$top_srcdir/"inst-apps`
233
else
234
   idirs=`cd "$top_srcdir" && ls -1 | sort`
235
fi
236
237
compilefirst=""
238
compilelast=""
239
if test -f "$top_srcdir/"Makefile.am.in ; then
240
	compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
241
	compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
242
fi
243
for i in $idirs; do
244
    if test -f "$top_srcdir/$i"/Makefile.am; then
245
       case " $compilefirst $compilelast " in
246
         *" $i "*) ;;
247
         *) dirs="$dirs $i"
248
       esac
249
    fi
250
done
251
252
: > ./_SUBDIRS
253
254
for d in $compilefirst; do
255
   echo $d >> ./_SUBDIRS
256
done
257
258
(for d in $dirs; do
259
   list=""
260
   if test -f "$top_srcdir/"Makefile.am.in ; then
261
	   list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
262
   fi
263
   for s in $list; do
264
      echo $s $d
265
   done
266
   list=""
267
   if test -f "$top_srcdir/"Makefile.am.in ; then
268
	   list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
269
   fi
270
   for s in $list; do
271
      echo $d $s
272
   done
273
   echo $d $d
274
done ) | tsort >> ./_SUBDIRS
275
276
for d in $compilelast; do
277
   echo $d >> ./_SUBDIRS
278
done
279
280
test -r _SUBDIRS && mv _SUBDIRS subdirs.top || true
281
}
282
283
284
### Add HTML header, footer, CSS tags to Doxyfile.
285
### Assumes $subdir is set. Argument is a string
286
### to stick in front of the file if needed.
287
apidox_htmlfiles()
288
{
289
	dox_header="$top_srcdir/doc/api/$1header.html"
290
	dox_footer="$top_srcdir/doc/api/$1footer.html"
291
	dox_css="$top_srcdir/doc/api/doxygen.css"
292
	test -f "$dox_header" || dox_header="$DOXDATA/$1header.html"
293
	test -f "$dox_footer" || dox_footer="$DOXDATA/$1footer.html"
294
	test -f "$dox_css" || dox_css="$DOXDATA/doxygen.css"
295
296
	echo "HTML_HEADER            = $dox_header" >> "$subdir/Doxyfile" ; \
297
	echo "HTML_FOOTER            = $dox_footer" >> "$subdir/Doxyfile" ; \
298
	echo "HTML_STYLESHEET        = $dox_css" >> "$subdir/Doxyfile"
299
}
300
301
apidox_specials()
302
{
303
	line=`extract_line DOXYGEN_PROJECTNAME "$1"`
304
	test -n "$line" && echo "PROJECT_NAME = \"$line\"" >> "$2"
305
}
306
307
apidox_local()
308
{
309
	for i in "$top_srcdir/doc/api/Doxyfile.local"
310
	do
311
		if test -f "$i" ; then
312
			cat "$i" >> "$subdir/Doxyfile"
313
			break
314
		fi
315
	done
316
}
317
318
### Post-process HTML files by substituting in the menu files
319
#
320
# In non-top directories, both <!-- menu --> and <!-- gmenu -->
321
# are calculated and replaced. Top directories get an empty <!-- menu -->
322
# if any.
323
doxyndex()
324
{
325
	# Special case top-level to have an empty MENU.
326
	if test "x$subdir" = "x." ; then
327
		MENU=""
328
		htmldir="."
329
		htmltop="$top_builddir" # Just ., presumably
330
		echo "* Post-processing top-level files"
331
	else
332
		MENU="<ul>"
333
		htmldir="$subdir/html"
334
		htmltop="$top_builddir.." # top_builddir ends with /
335
		echo "* Post-processing files in $htmldir"
336
337
		# Build a little PHP file that maps class names to file
338
		# names, for the quick-class-picker functionality.
339
		# (The quick-class-picker is disabled due to styling
340
		# problems in IE & FF).
341
		(
342
		echo "<?php \$map = array(";  \
343
		for htmlfile in `find $htmldir/ -type f -name "class[A-Z]*.html" | grep -v "\-members.html$"`; do
344
			classname=`echo $htmlfile | sed -e "s,.*/class\\(.*\\).html,\1," -e "s,_1_1,::,g" -e "s,_01, ,g" -e "s,_4,>,g" -e "s+_00+,+g" -e "s+_3+<+g" | tr "[A-Z]" "[a-z]"`
345
			echo "  \"$classname\" => \"$htmlfile\","
346
		done | sort ; \
347
		echo ") ?>"
348
		) > "$subdir/classmap.inc"
349
350
		# This is a list of pairs, with / separators so we can use
351
		# basename and dirname (a crude shell hack) to split them
352
		# into parts. For each, if the file part exists (as a html
353
		# file) tack it onto the MENU variable as a <li> with link.
354
		for i in "Main Page/index" \
355
			"Modules/modules" \
356
			"Namespace List/namespaces" \
357
			"Class Hierarchy/hierarchy" \
358
			"Alphabetical List/classes" \
359
			"Class List/annotated" \
360
			"File List/files" \
361
			"Directories/dirs" \
362
			"Namespace Members/namespacemembers" \
363
			"Class Members/functions" \
364
			"Related Pages/pages"
365
		do
366
			NAME=`dirname "$i"`
367
			FILE=`basename "$i"`
368
			test -f "$htmldir/$FILE.html" && MENU="$MENU<li><a href=\"$FILE.html\">$NAME</a></li>"
369
		done
370
371
		MENU="$MENU</ul>"
372
	fi
373
374
375
	# Get the list of global Menu entries.
376
	GMENU=`cat subdirs | tr -d '\n'`
377
378
	PMENU=`grep '<!-- pmenu' "$htmldir/index.html" | sed -e 's+.*pmenu *++' -e 's+ *-->++' | awk '{ c=split($0,a,"/"); for (j=1; j<=c; j++) { printf " / <a href=\""; if (j==c) { printf("."); } for (k=j; k<c; k++) { printf "../"; } if (j<c) { printf("../html/index.html"); } printf "\">%s</a>\n" , a[j]; } }' | tr -d '\n'`
379
380
	# Map the PHP file into HTML options so that
381
	# it can be substituted in for the quick-class-picker.
382
	CMENU=""
383
	# For now, leave the CMENU disabled
384
	CMENUBEGIN="<!--"
385
	CMENUEND="-->"
386
387
	if test "x$subdir" = "x." ; then
388
		# Disable CMENU on toplevel anyway
389
		CMENUBEGIN="<!--"
390
		CMENUEND="-->"
391
	else
392
		test -f "$subdir/classmap.inc" && \
393
		CMENU=`grep '=>' "$subdir/classmap.inc" | sed -e 's+"\([^"]*\)" => "'"$subdir/html/"'\([^"]*\)"+<option value="\2">\1<\/option>+' | tr -d '\n'`
394
395
		if test -f "$subdir/classmap.inc" && grep "=>" "$subdir/classmap.inc" > /dev/null 2>&1 ; then
396
			# Keep the menu, it's useful
397
			:
398
		else
399
			CMENUBEGIN="<!--"
400
			CMENUEND="-->"
401
		fi
402
	fi
403
404
	# Now substitute in the MENU in every file. This depends
405
	# on HTML_HEADER (ie. header.html) containing the
406
	# <!-- menu --> comment.
407
	for i in "$htmldir"/*.html
408
	do
409
		if test -f "$i" ; then
410
			sed -e "s+<!-- menu -->+$MENU+" \
411
				-e "s+<!-- gmenu -->+$GMENU+" \
412
				-e "s+<!-- pmenu.*-->+$PMENU+" \
413
				-e "s+<!-- cmenu.begin -->+$CMENUBEGIN+" \
414
				-e "s+<!-- cmenu.end -->+$CMENUEND+" \
415
				< "$i"  | sed -e "s+@topdir@+$htmltop+g" > "$i.new" && mv "$i.new" "$i"
416
			sed -e "s+<!-- cmenu -->+$CMENU+" < "$i" > "$i.new"
417
			test -s "$i.new" && mv "$i.new" "$i"
418
		fi
419
	done
420
}
421
422
423
424
425
426
427
### Handle the Doxygen processing of a toplevel directory.
428
apidox_toplevel()
429
{
430
	echo ""
431
	echo "*** Creating API documentation main page for $module_name"
432
	echo "*"
433
	rm -f "Doxyfile"
434
	for i in "$top_srcdir/doc/api/Doxyfile.global" \
435
		"$top_srcdir/admin/Doxyfile.global" \
436
		"$DOXDATA/Doxyfile.global"
437
	do
438
		if test -f "$i" ; then
439
			cp "$i" Doxyfile
440
			break
441
		fi
442
	done
443
444
	if test ! -f "Doxyfile" ; then
445
		echo "* Cannot create Doxyfile."
446
		exit 1
447
	fi
448
449
	cat "$top_builddir/Doxyfile.in" >> Doxyfile
450
451
452
	echo "INPUT                  = $top_srcdir" >> Doxyfile
453
	echo "OUTPUT_DIRECTORY       = $top_builddir" >> Doxyfile ; \
454
	echo "FILE_PATTERNS          = *.dox" >> Doxyfile ; \
455
	echo "RECURSIVE              = NO" >> Doxyfile ; \
456
	echo "ALPHABETICAL_INDEX     = NO" >> Doxyfile ; \
457
	echo "HTML_OUTPUT            = ." >> Doxyfile ; \
458
	apidox_htmlfiles "main"
459
460
	# KDevelop has a top-level Makefile.am with settings.
461
	for i in "$top_srcdir/Makefile.am.in" "$top_srcdir/Makefile.am"
462
	do
463
		if test -f "$i" ; then
464
			grep '^DOXYGEN_SET_' "$i" | \
465
				sed -e 's+DOXYGEN_SET_++' -e "s+@topdir@+$top_srcdir+" >> Doxyfile
466
			apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
467
468
			break
469
		fi
470
	done
471
472
	apidox_local
473
474
	doxygen Doxyfile
475
476
	( cd "$top_srcdir" && grep -l '^include.*Doxyfile.am' `find . -name Makefile.am` ) | sed -e 's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
477
	for i in `cat subdirs.in`
478
	do
479
		test "x." = "x$i" && continue;
480
481
		dir=`dirname "$i"`
482
		file=`basename "$i"`
483
		if test "x." = "x$dir" ; then
484
			dir=""
485
		else
486
			dir="$dir/"
487
		fi
488
		indent=`echo "$dir" | sed -e 's+[^/]*/+\&nbsp;\&nbsp;+g' | sed -e 's+&+\\\&+g'`
489
		entryname=`extract_line DOXYGEN_SET_PROJECT_NAME "$top_srcdir/$dir/$file/Makefile.am"`
490
		test -z "$entryname" && entryname="$file"
491
492
		if grep DOXYGEN_EMPTY "$top_srcdir/$dir/$file/Makefile.am" > /dev/null 2>&1 ; then
493
			echo "<li>$indent$file</li>"
494
		else
495
			echo "<li>$indent<a href=\"@topdir@/$dir$file/html/index.html\">$entryname</a></li>"
496
		fi
497
	done > subdirs
498
499
	doxyndex
500
}
501
502
### Handle the Doxygen processing of a non-toplevel directory.
503
apidox_subdir()
504
{
505
	echo ""
506
	echo "*** Creating apidox in $subdir"
507
	echo "*"
508
	rm -f "$subdir/Doxyfile"
509
	if test ! -d "$top_srcdir/$subdir" ; then
510
		echo "* No source (sub)directory $subdir"
511
		return
512
	fi
513
	for i in "$top_srcdir/doc/api/Doxyfile.global" \
514
		"$top_srcdir/admin/Doxyfile.global" \
515
		"$DOXDATA/Doxyfile.global"
516
	do
517
		if test -f "$i" ; then
518
			cp "$i" "$subdir/Doxyfile"
519
			break
520
		fi
521
	done
522
523
524
	test -f "Doxyfile.in" || create_doxyfile_in
525
	cat "Doxyfile.in" >> "$subdir/Doxyfile"
526
527
	echo "PROJECT_NAME           = \"$subdir\"" >> "$subdir/Doxyfile"
528
	echo "INPUT                  = $srcdir" >> "$subdir/Doxyfile"
529
	echo "OUTPUT_DIRECTORY       = ." >> "$subdir/Doxyfile"
530
	if grep -l "$subdir/" subdirs.in > /dev/null 2>&1 ; then
531
		echo "RECURSIVE              = NO" >> "$subdir/Doxyfile"
532
	fi
533
	echo "HTML_OUTPUT            = $subdir/html" >> "$subdir/Doxyfile"
534
	echo "GENERATE_TAGFILE       = $subdir/$subdirname.tag" >> "$subdir/Doxyfile"
535
	test -d "$top_srcdir/doc/api" && \
536
		echo "IMAGE_PATH             = $top_srcdir/doc/api" >> "$subdir/Doxyfile"
537
538
	apidox_htmlfiles ""
539
540
	# Makefile.ams may contain overrides to our settings,
541
	# so copy them in.
542
	grep '^DOXYGEN_SET_' "$srcdir/Makefile.am" | \
543
		sed -e 's+DOXYGEN_SET_++' >> "$subdir/Doxyfile"
544
	apidox_specials "$srcdir/Makefile.am" "$subdir/Doxyfile"
545
546
	excludes=`extract_line DOXYGEN_EXCLUDE`
547
	if test -n "$excludes"; then
548
		patterns=""
549
		dirs=""
550
		for item in `echo "$excludes"`; do
551
			if test -d "$top_srcdir/$subdir/$item"; then
552
				dirs="$dirs $top_srcdir/$subdir/$item/"
553
			else
554
				patterns="$patterns $item"
555
			fi
556
		done
557
		echo "EXCLUDE_PATTERNS      += $patterns" >> "$subdir/Doxyfile"
558
		echo "EXCLUDE               += $dirs" >> "$subdir/Doxyfile"
559
	fi
560
561
	echo "TAGFILES = \\" >> "$subdir/Doxyfile"
562
	## For now, don't support \ continued references lines
563
	tags=`extract_line DOXYGEN_REFERENCES`
564
	for i in $tags qt ; do
565
		tagsubdir=`dirname $i` ; tag=`basename $i`
566
		tagpath=""
567
		not_found=""
568
569
		if test "x$tagsubdir" = "x." ; then
570
			tagsubdir=""
571
		else
572
			tagsubdir="$tagsubdir/"
573
		fi
574
575
		# Find location of tag file
576
		if test -f "$tagsubdir$tag/$tag.tag" ; then
577
			file="$tagsubdir$tag/$tag.tag"
578
			loc="$tagsubdir$tag/html"
579
		else
580
			# This checks for dox built with_out_ --no-modulename
581
			# in the same build dir as this dox run was started in.
582
			file=`ls -1 ../*-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
583
584
			if test -n "$file" ; then
585
				loc=`echo "$file" | sed -e "s/$tag.tag\$/html/"`
586
			else
587
				# If the tag file doesn't exist yet, but should
588
				# because we have the right dirs here, queue
589
				# this directory for re-processing later.
590
				if test -d "$top_srcdir/$tagsubdir$tag" ; then
591
					echo "* Need to re-process $subdir for tag $i"
592
					echo "$subdir" >> "subdirs.later"
593
				else
594
					# Re-check in $PREFIX if needed.
595
					test -n "$PREFIX" && \
596
					file=`cd "$PREFIX" && \
597
					ls -1 *-apidocs/"$tagsubdir$tag/$tag.tag" 2> /dev/null`
598
599
					# If something is found, patch it up. The location must be
600
					# relative to the installed location of the dox and the
601
					# file must be absolute.
602
					if test -n "$file" ; then
603
						loc=`echo "../$file" | sed -e "s/$tag.tag\$/html/"`
604
						file="$PREFIX/$file"
605
						echo "* Tags for $tagsubdir$tag will only work when installed."
606
						not_found="YES"
607
					fi
608
				fi
609
			fi
610
		fi
611
		if test "$tag" = "qt" ; then
612
			if test -z "$QTDOCDIR" ; then
613
				echo "  $file" >> "$subdir/Doxyfile"
614
			else
615
				if test -z "$file" ; then
616
					# Really no Qt tags
617
					echo "" >> "$subdir/Doxyfile"
618
				else
619
					echo "  $file=$QTDOCDIR" >> "$subdir/Doxyfile"
620
				fi
621
			fi
622
		else
623
			if test -n "$file"  ; then
624
				test -z "$not_found" && echo "* Found tag $file"
625
				echo "  $file=../$top_builddir$loc \\" >> "$subdir/Doxyfile"
626
			fi
627
		fi
628
	done
629
630
	apidox_local
631
632
	if grep '^DOXYGEN_EMPTY' "$srcdir/Makefile.am" > /dev/null 2>&1 ; then
633
		# This directory is empty, so don't process it, but
634
		# *do* handle subdirs that might have dox.
635
		:
636
	else
637
		# Regular processing
638
		doxygen "$subdir/Doxyfile"
639
		doxyndex
640
	fi
641
}
642
643
### Run a given subdir by setting up global variables first.
644
do_subdir()
645
{
646
	subdir=`echo "$1" | sed -e 's+/$++'`
647
	srcdir="$top_srcdir/$subdir"
648
	subdirname=`basename "$subdir"`
649
	mkdir -p "$subdir" 2> /dev/null
650
	if test ! -d "$subdir" ; then
651
		echo "Can't create dox subdirectory $subdir"
652
		return
653
	fi
654
	top_builddir=`echo "/$subdir" | sed -e 's+/[^/]*+../+g'`
655
	apidox_subdir
656
}
657
658
659
### Create installdox-slow in the toplevel
660
create_installdox()
661
{
662
# Fix up the installdox script so it accepts empty args
663
#
664
# This code is copied from the installdox generated by Doxygen,
665
# copyright by Dimitri van Heesch and released under the GPL.
666
# This does a _slow_ update of the dox, because it loops
667
# over the given substitutions instead of assuming all the
668
# needed ones are given.
669
#
670
cat <<\EOF
671
#! /usr/bin/env perl
672
673
%subst = () ;
674
$quiet   = 0;
675
676
if (open(F,"search.cfg"))
677
{
678
  $_=<F> ; s/[ \t\n]*$//g ; $subst{"_doc"} = $_;
679
  $_=<F> ; s/[ \t\n]*$//g ; $subst{"_cgi"} = $_;
680
}
681
682
while ( @ARGV ) {
683
  $_ = shift @ARGV;
684
  if ( s/^-// ) {
685
    if ( /^l(.*)/ ) {
686
      $v = ($1 eq "") ? shift @ARGV : $1;
687
      ($v =~ /\/$/) || ($v .= "/");
688
      $_ = $v;
689
      if ( /(.+)\@(.+)/ ) {
690
          $subst{$1} = $2;
691
      } else {
692
        print STDERR "Argument $_ is invalid for option -l\n";
693
        &usage();
694
      }
695
    }
696
    elsif ( /^q/ ) {
697
      $quiet = 1;
698
    }
699
    elsif ( /^\?|^h/ ) {
700
      &usage();
701
    }
702
    else {
703
      print STDERR "Illegal option -$_\n";
704
      &usage();
705
    }
706
  }
707
  else {
708
    push (@files, $_ );
709
  }
710
}
711
712
713
if ( ! @files ) {
714
  if (opendir(D,".")) {
715
    foreach $file ( readdir(D) ) {
716
      $match = ".html";
717
      next if ( $file =~ /^\.\.?$/ );
718
      ($file =~ /$match/) && (push @files, $file);
719
      ($file =~ "tree.js") && (push @files, $file);
720
    }
721
    closedir(D);
722
  }
723
}
724
725
if ( ! @files ) {
726
  print STDERR "Warning: No input files given and none found!\n";
727
}
728
729
foreach $f (@files)
730
{
731
  if ( ! $quiet ) {
732
    print "Editing: $f...\n";
733
  }
734
  $oldf = $f;
735
  $f   .= ".bak";
736
  unless (rename $oldf,$f) {
737
    print STDERR "Error: cannot rename file $oldf\n";
738
    exit 1;
739
  }
740
  if (open(F,"<$f")) {
741
    unless (open(G,">$oldf")) {
742
      print STDERR "Error: opening file $oldf for writing\n";
743
      exit 1;
744
    }
745
    if ($oldf ne "tree.js") {
746
      while (<F>) {
747
	foreach $sub (keys %subst) {
748
          s/doxygen\=\"$sub\:([^ \"\t\>\<]*)\" (href|src)=\"\1/doxygen\=\"$sub:$subst{$sub}\" \2=\"$subst{$sub}/g;
749
          print G "$_";
750
	}
751
      }
752
    }
753
    else {
754
      while (<F>) {
755
	foreach $sub (keys %subst) {
756
          s/\"$sub\:([^ \"\t\>\<]*)\", \"\1/\"$sub:$subst{$sub}\" ,\"$subst{$sub}/g;
757
          print G "$_";
758
	}
759
      }
760
    }
761
  }
762
  else {
763
    print STDERR "Warning file $f does not exist\n";
764
  }
765
  unlink $f;
766
}
767
768
sub usage {
769
  print STDERR "Usage: installdox [options] [html-file [html-file ...]]\n";
770
  print STDERR "Options:\n";
771
  print STDERR "     -l tagfile\@linkName   tag file + URL or directory \n";
772
  print STDERR "     -q                    Quiet mode\n\n";
773
  exit 1;
774
}
775
EOF
776
}
777
778
# Do only the subdirs that match the RE passed in as $1
779
do_subdirs_re()
780
{
781
	RE=`echo "$1" | sed -e 's+/$++'`
782
783
	# Here's a queue of dirs to re-process later when
784
	# all the rest have been done already.
785
	> subdirs.later
786
787
	# subdirs.top lists _all_ subdirs of top in the order they
788
	# should be handled; subdirs.in lists those dirs that contain
789
	# dox. So the intersection of the two is the ordered list
790
	# of top-level subdirs that contain dox.
791
	#
792
	# subdirs.top also doesn't contain ".", so that special
793
	# case can be ignored in the loop.
794
795
796
	(
797
	for i in `grep "^$RE" subdirs.top`
798
	do
799
		if test "x$i" = "x." ; then
800
			continue
801
		fi
802
		# Calculate intersection of this element and the
803
		# set of dox dirs.
804
		if grep "^$i\$" subdirs.in > /dev/null 2>&1 ; then
805
			echo "$i"
806
			mkdir -p "$i" 2> /dev/null
807
808
			# Handle the subdirs of this one
809
			for j in `grep "$i/" subdirs.in`
810
			do
811
				echo "$j"
812
				mkdir -p "$j" 2> /dev/null
813
			done
814
		fi
815
	done
816
817
	# Now we still need to handle whatever is left
818
	for i in `cat subdirs.in`
819
	do
820
		test -d "$i" || echo "$i"
821
		mkdir -p "$i" 2> /dev/null
822
	done
823
	) > subdirs.sort
824
	for i in `cat subdirs.sort`
825
	do
826
		do_subdir "$i"
827
	done
828
829
	if test -s "subdirs.later" ; then
830
		sort subdirs.later | uniq > subdirs.sort
831
		for i in `cat subdirs.sort`
832
		do
833
			: > subdirs.later
834
			echo "*** Reprocessing $i"
835
			do_subdir "$i"
836
			test -s "subdirs.later" && echo "* Some tag files were still not found."
837
		done
838
	fi
839
}
840
841
if test "x." = "x$top_builddir" ; then
842
	apidox_toplevel
843
	create_subdirs
844
	create_installdox > installdox-slow
845
	if test "x$recurse" = "x1" ; then
846
		if test "x$module_name" = "xkdelibs" ; then
847
			if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
848
				test ! -f "qt/qt.tag" ; then
849
				# Special case: create a qt tag file.
850
				echo "*** Creating a tag file for the Qt library:"
851
				mkdir qt
852
				doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
853
			fi
854
		fi
855
		if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
856
			echo "*** Copying tag file for the Qt library:"
857
			mkdir qt
858
			cp "$QTDOCTAG" qt/qt.tag
859
		fi
860
861
		do_subdirs_re "."
862
863
	fi
864
else
865
	if test "x$recurse" = "x1" ; then
866
		do_subdirs_re "$subdir"
867
	else
868
		do_subdir "$subdir"
869
	fi
870
fi
871
872
873
# At the end of a run, clean up stuff.
874
if test "YES" = "$cleanup" ; then
875
	rm -f subdirs.in  subdirs.later subdirs.sort subdirs.top Doxyfile.in
876
	rm -f `find . -name Doxyfile`
877
	rm -f qt/qt.tag
878
	rmdir qt > /dev/null 2>&1
879
fi
880
881
882
exit 0
883
(-)eventwatcher-0.4.3-orig/admin/install-sh (-197 / +322 lines)
Lines 1-19 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
#
3
# install - install a program, script, or datafile
2
# install - install a program, script, or datafile
4
# This comes from X11R5 (mit/util/scripts/install.sh).
3
4
scriptversion=2005-11-07.23
5
6
# This originates from X11R5 (mit/util/scripts/install.sh), which was
7
# later released in X11R6 (xc/config/util/install.sh) with the
8
# following copyright and license.
5
#
9
#
6
# Copyright 1991 by the Massachusetts Institute of Technology
10
# Copyright (C) 1994 X Consortium
7
#
11
#
8
# Permission to use, copy, modify, distribute, and sell this software and its
12
# Permission is hereby granted, free of charge, to any person obtaining a copy
9
# documentation for any purpose is hereby granted without fee, provided that
13
# of this software and associated documentation files (the "Software"), to
10
# the above copyright notice appear in all copies and that both that
14
# deal in the Software without restriction, including without limitation the
11
# copyright notice and this permission notice appear in supporting
15
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12
# documentation, and that the name of M.I.T. not be used in advertising or
16
# sell copies of the Software, and to permit persons to whom the Software is
13
# publicity pertaining to distribution of the software without specific,
17
# furnished to do so, subject to the following conditions:
14
# written prior permission.  M.I.T. makes no representations about the
18
#
15
# suitability of this software for any purpose.  It is provided "as is"
19
# The above copyright notice and this permission notice shall be included in
16
# without express or implied warranty.
20
# all copies or substantial portions of the Software.
21
#
22
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
25
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
26
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
27
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28
#
29
# Except as contained in this notice, the name of the X Consortium shall not
30
# be used in advertising or otherwise to promote the sale, use or other deal-
31
# ings in this Software without prior written authorization from the X Consor-
32
# tium.
33
#
34
#
35
# FSF changes to this file are in the public domain.
17
#
36
#
18
# Calling this script install-sh is preferred over install.sh, to prevent
37
# Calling this script install-sh is preferred over install.sh, to prevent
19
# `make' implicit rules from creating a file called install from it
38
# `make' implicit rules from creating a file called install from it
Lines 23-35 Link Here
23
# from scratch.  It can only install one file at a time, a restriction
42
# from scratch.  It can only install one file at a time, a restriction
24
# shared with many OS's install programs.
43
# shared with many OS's install programs.
25
44
26
27
# set DOITPROG to echo to test this script
45
# set DOITPROG to echo to test this script
28
46
29
# Don't use :- since 4.3BSD and earlier shells don't like it.
47
# Don't use :- since 4.3BSD and earlier shells don't like it.
30
doit="${DOITPROG-}"
48
doit="${DOITPROG-}"
31
49
32
33
# put in absolute paths if you don't have them in your path; or use env. vars.
50
# put in absolute paths if you don't have them in your path; or use env. vars.
34
51
35
mvprog="${MVPROG-mv}"
52
mvprog="${MVPROG-mv}"
Lines 41-276 Link Here
41
rmprog="${RMPROG-rm}"
58
rmprog="${RMPROG-rm}"
42
mkdirprog="${MKDIRPROG-mkdir}"
59
mkdirprog="${MKDIRPROG-mkdir}"
43
60
44
transformbasename=""
61
posix_glob=
45
transform_arg=""
62
posix_mkdir=
46
instcmd="$mvprog"
47
chmodcmd="$chmodprog 0755"
48
chowncmd=""
49
chgrpcmd=""
50
stripcmd=""
51
rmcmd="$rmprog -f"
52
mvcmd="$mvprog"
53
src=""
54
dst=""
55
dir_arg=""
56
63
57
while [ x"$1" != x ]; do
64
# Symbolic mode for testing mkdir with directories.
58
    case $1 in
65
# It is the same as 755, but also tests that "u+" works.
59
	-c) instcmd=$cpprog
66
test_mode=u=rwx,g=rx,o=rx,u+wx
60
	    shift
61
	    continue;;
62
67
63
	-d) dir_arg=true
68
# Desired mode of installed file.
64
	    shift
69
mode=0755
65
	    continue;;
66
70
67
	-m) chmodcmd="$chmodprog $2"
71
# Desired mode of newly created intermediate directories.
68
	    shift
72
# It is empty if not known yet.
69
	    shift
73
intermediate_mode=
70
	    continue;;
71
74
72
	-o) chowncmd="$chownprog $2"
75
chmodcmd=$chmodprog
73
	    shift
76
chowncmd=
74
	    shift
77
chgrpcmd=
75
	    continue;;
78
stripcmd=
79
rmcmd="$rmprog -f"
80
mvcmd="$mvprog"
81
src=
82
dst=
83
dir_arg=
84
dstarg=
85
no_target_directory=
76
86
77
	-g) chgrpcmd="$chgrpprog $2"
87
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
78
	    shift
88
   or: $0 [OPTION]... SRCFILES... DIRECTORY
79
	    shift
89
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
80
	    continue;;
90
   or: $0 [OPTION]... -d DIRECTORIES...
81
91
82
	-s) stripcmd=$stripprog
92
In the 1st form, copy SRCFILE to DSTFILE.
83
	    shift
93
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
84
	    continue;;
94
In the 4th, create DIRECTORIES.
85
95
86
	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
96
Options:
87
	    shift
97
-c         (ignored)
88
	    continue;;
98
-d         create directories instead of installing files.
99
-g GROUP   $chgrpprog installed files to GROUP.
100
-m MODE    $chmodprog installed files to MODE.
101
-o USER    $chownprog installed files to USER.
102
-s         $stripprog installed files.
103
-t DIRECTORY  install into DIRECTORY.
104
-T         report an error if DSTFILE is a directory.
105
--help     display this help and exit.
106
--version  display version info and exit.
89
107
90
	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
108
Environment variables override the default commands:
91
	    shift
109
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
92
	    continue;;
110
"
93
111
94
	*)  if [ x"$src" = x ]
112
while test -n "$1"; do
95
	    then
113
  case $1 in
96
		src=$1
114
    -c) shift
97
	    else
115
        continue;;
98
		# this colon is to work around a 386BSD /bin/sh bug
99
		:
100
		dst=$1
101
	    fi
102
	    shift
103
	    continue;;
104
    esac
105
done
106
116
107
if [ x"$src" = x ]
117
    -d) dir_arg=true
108
then
118
        shift
109
	echo "$0: no input file specified" >&2
119
        continue;;
110
	exit 1
111
else
112
	:
113
fi
114
120
115
if [ x"$dir_arg" != x ]; then
121
    -g) chgrpcmd="$chgrpprog $2"
116
	dst=$src
122
        shift
117
	src=""
123
        shift
124
        continue;;
118
125
119
	if [ -d "$dst" ]; then
126
    --help) echo "$usage"; exit $?;;
120
		instcmd=:
121
		chmodcmd=""
122
	else
123
		instcmd=$mkdirprog
124
	fi
125
else
126
127
127
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
128
    -m) mode=$2
128
# might cause directories to be created, which would be especially bad
129
        shift
129
# if $src (and thus $dsttmp) contains '*'.
130
        shift
131
        continue;;
130
132
131
	if [ -f "$src" ] || [ -d "$src" ]
133
    -o) chowncmd="$chownprog $2"
132
	then
134
        shift
133
		:
135
        shift
134
	else
136
        continue;;
135
		echo "$0: $src does not exist" >&2
136
		exit 1
137
	fi
138
137
139
	if [ x"$dst" = x ]
138
    -s) stripcmd=$stripprog
140
	then
139
        shift
141
		echo "$0: no destination specified" >&2
140
        continue;;
142
		exit 1
143
	else
144
		:
145
	fi
146
141
147
# If destination is a directory, append the input filename; if your system
142
    -t) dstarg=$2
148
# does not like double slashes in filenames, you may need to add some logic
143
	shift
144
	shift
145
	continue;;
149
146
150
	if [ -d "$dst" ]
147
    -T) no_target_directory=true
151
	then
148
	shift
152
		dst=$dst/`basename "$src"`
149
	continue;;
153
	else
154
		:
155
	fi
156
fi
157
150
158
## this sed command emulates the dirname command
151
    --version) echo "$0 $scriptversion"; exit $?;;
159
dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
160
152
161
# Make sure that the destination directory exists.
153
    *)  # When -d is used, all remaining arguments are directories to create.
162
#  this part is taken from Noah Friedman's mkinstalldirs script
154
	# When -t is used, the destination is already specified.
155
	test -n "$dir_arg$dstarg" && break
156
        # Otherwise, the last argument is the destination.  Remove it from $@.
157
	for arg
158
	do
159
          if test -n "$dstarg"; then
160
	    # $@ is not empty: it contains at least $arg.
161
	    set fnord "$@" "$dstarg"
162
	    shift # fnord
163
	  fi
164
	  shift # arg
165
	  dstarg=$arg
166
	done
167
	break;;
168
  esac
169
done
163
170
164
# Skip lots of stat calls in the usual case.
171
if test -z "$1"; then
165
if [ ! -d "$dstdir" ]; then
172
  if test -z "$dir_arg"; then
166
defaultIFS='
173
    echo "$0: no input file specified." >&2
167
	'
174
    exit 1
168
IFS="${IFS-$defaultIFS}"
175
  fi
176
  # It's OK to call `install-sh -d' without argument.
177
  # This can happen when creating conditional directories.
178
  exit 0
179
fi
169
180
170
oIFS=$IFS
181
test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
171
# Some sh's can't handle IFS=/ for some reason.
172
IFS='%'
173
set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
174
IFS=$oIFS
175
182
176
pathcomp=''
183
for src
184
do
185
  # Protect names starting with `-'.
186
  case $src in
187
    -*) src=./$src ;;
188
  esac
177
189
178
while [ $# -ne 0 ] ; do
190
  if test -n "$dir_arg"; then
179
	pathcomp=$pathcomp$1
191
    dst=$src
180
	shift
192
    dstdir=$dst
193
    test -d "$dstdir"
194
    dstdir_status=$?
195
  else
181
196
182
	if [ ! -d "$pathcomp" ] ;
197
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
183
        then
198
    # might cause directories to be created, which would be especially bad
184
		$mkdirprog "$pathcomp"
199
    # if $src (and thus $dsttmp) contains '*'.
185
	else
200
    if test ! -f "$src" && test ! -d "$src"; then
186
		:
201
      echo "$0: $src does not exist." >&2
187
	fi
202
      exit 1
203
    fi
188
204
189
	pathcomp=$pathcomp/
205
    if test -z "$dstarg"; then
190
done
206
      echo "$0: no destination specified." >&2
191
fi
207
      exit 1
208
    fi
192
209
193
if [ x"$dir_arg" != x ]
210
    dst=$dstarg
194
then
211
    # Protect names starting with `-'.
195
	$doit $instcmd "$dst" &&
212
    case $dst in
213
      -*) dst=./$dst ;;
214
    esac
196
215
197
	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
216
    # If destination is a directory, append the input filename; won't work
198
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
217
    # if double slashes aren't ignored.
199
	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
218
    if test -d "$dst"; then
200
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
219
      if test -n "$no_target_directory"; then
201
else
220
	echo "$0: $dstarg: Is a directory" >&2
221
	exit 1
222
      fi
223
      dstdir=$dst
224
      dst=$dstdir/`basename "$src"`
225
      dstdir_status=0
226
    else
227
      # Prefer dirname, but fall back on a substitute if dirname fails.
228
      dstdir=`
229
	(dirname "$dst") 2>/dev/null ||
230
	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
231
	     X"$dst" : 'X\(//\)[^/]' \| \
232
	     X"$dst" : 'X\(//\)$' \| \
233
	     X"$dst" : 'X\(/\)' \| \
234
	     .       : '\(.\)' 2>/dev/null ||
235
	echo X"$dst" |
236
	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
237
		  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
238
		  /^X\(\/\/\)$/{ s//\1/; q; }
239
		  /^X\(\/\).*/{ s//\1/; q; }
240
		  s/.*/./; q'
241
      `
202
242
203
# If we're going to rename the final executable, determine the name now.
243
      test -d "$dstdir"
244
      dstdir_status=$?
245
    fi
246
  fi
204
247
205
	if [ x"$transformarg" = x ]
248
  obsolete_mkdir_used=false
206
	then
249
207
		dstfile=`basename "$dst"`
250
  if test $dstdir_status != 0; then
251
    case $posix_mkdir in
252
      '')
253
	posix_mkdir=false
254
	if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
255
	  posix_mkdir=true
208
	else
256
	else
209
		dstfile=`basename "$dst" $transformbasename |
257
	  # Remove any dirs left behind by ancient mkdir implementations.
210
			sed $transformarg`$transformbasename
258
	  rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
211
	fi
259
	fi ;;
260
    esac
212
261
213
# don't allow the sed command to completely eliminate the filename
262
    if
263
      $posix_mkdir && {
214
264
215
	if [ x"$dstfile" = x ]
265
	# With -d, create the new directory with the user-specified mode.
216
	then
266
	# Otherwise, create it using the same intermediate mode that
217
		dstfile=`basename "$dst"`
267
	# mkdir -p would use when creating intermediate directories.
268
	# POSIX says that this mode is "$(umask -S),u+wx", so use that
269
	# if umask -S works.
270
271
	if test -n "$dir_arg"; then
272
	  mkdir_mode=$mode
218
	else
273
	else
219
		:
274
	  case $intermediate_mode in
275
	    '')
276
	      if umask_S=`(umask -S) 2>/dev/null`; then
277
		intermediate_mode=$umask_S,u+wx
278
	      else
279
		intermediate_mode=$test_mode
280
	      fi ;;
281
	  esac
282
	  mkdir_mode=$intermediate_mode
220
	fi
283
	fi
221
284
222
# Make a couple of temp file names in the proper directory.
285
	$mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
286
      }
287
    then :
288
    else
223
289
224
	dsttmp=$dstdir/#inst.$$#
290
      # mkdir does not conform to POSIX, or it failed possibly due to
225
	rmtmp=$dstdir/#rm.$$#
291
      # a race condition.  Create the directory the slow way, step by
292
      # step, checking for races as we go.
226
293
227
# Trap to clean up temp files at exit.
294
      case $dstdir in
295
	/*) pathcomp=/ ;;
296
	-*) pathcomp=./ ;;
297
	*)  pathcomp= ;;
298
      esac
228
299
229
	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
300
      case $posix_glob in
230
	trap '(exit $?); exit' 1 2 13 15
301
        '')
302
	  if (set -f) 2>/dev/null; then
303
	    posix_glob=true
304
	  else
305
	    posix_glob=false
306
	  fi ;;
307
      esac
231
308
232
# Move or copy the file name to the temp name
309
      oIFS=$IFS
310
      IFS=/
311
      $posix_glob && set -f
312
      set fnord $dstdir
313
      shift
314
      $posix_glob && set +f
315
      IFS=$oIFS
233
316
234
	$doit $instcmd "$src" "$dsttmp" &&
317
      for d
318
      do
319
	test "x$d" = x && continue
235
320
236
# and set any options; do chmod last to preserve setuid bits
321
	pathcomp=$pathcomp$d
322
	if test ! -d "$pathcomp"; then
323
	  $mkdirprog "$pathcomp"
324
	  # Don't fail if two instances are running concurrently.
325
	  test -d "$pathcomp" || exit 1
326
	fi
327
	pathcomp=$pathcomp/
328
      done
329
      obsolete_mkdir_used=true
330
    fi
331
  fi
237
332
238
# If any of these fail, we abort the whole thing.  If we want to
333
  if test -n "$dir_arg"; then
239
# ignore errors from any of these, just make sure not to ignore
334
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
240
# errors from the above "$doit $instcmd $src $dsttmp" command.
335
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
336
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
337
      test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
338
  else
241
339
242
	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
340
    # Make a couple of temp file names in the proper directory.
243
	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
341
    dsttmp=$dstdir/_inst.$$_
244
	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
342
    rmtmp=$dstdir/_rm.$$_
245
	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
246
343
247
# Now remove or move aside any old file at destination location.  We try this
344
    # Trap to clean up those temp files at exit.
248
# two ways since rm can't unlink itself on some systems and the destination
345
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
249
# file might be busy for other reasons.  In this case, the final cleanup
250
# might fail but the new file should still install successfully.
251
346
252
{
347
    # Copy the file name to the temp name.
253
	if [ -f "$dstdir/$dstfile" ]
348
    $doit $cpprog "$src" "$dsttmp" &&
254
	then
255
		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
256
		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
257
		{
258
		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
259
		  (exit 1); exit
260
		}
261
	else
262
		:
263
	fi
264
} &&
265
349
266
# Now rename the file to the real destination.
350
    # and set any options; do chmod last to preserve setuid bits.
351
    #
352
    # If any of these fail, we abort the whole thing.  If we want to
353
    # ignore errors from any of these, just make sure not to ignore
354
    # errors from the above "$doit $cpprog $src $dsttmp" command.
355
    #
356
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
357
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
358
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
359
      && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
267
360
268
	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
361
    # Now rename the file to the real destination.
362
    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
363
      || {
364
	   # The rename failed, perhaps because mv can't rename something else
365
	   # to itself, or perhaps because mv is so ancient that it does not
366
	   # support -f.
269
367
270
fi &&
368
	   # Now remove or move aside any old file at destination location.
369
	   # We try this two ways since rm can't unlink itself on some
370
	   # systems and the destination file might be busy for other
371
	   # reasons.  In this case, the final cleanup might fail but the new
372
	   # file should still install successfully.
373
	   {
374
	     if test -f "$dst"; then
375
	       $doit $rmcmd -f "$dst" 2>/dev/null \
376
	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
377
		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
378
	       || {
379
		 echo "$0: cannot unlink or rename $dst" >&2
380
		 (exit 1); exit 1
381
	       }
382
	     else
383
	       :
384
	     fi
385
	   } &&
271
386
272
# The final little trick to "correctly" pass the exit status to the exit trap.
387
	   # Now rename the file to the real destination.
388
	   $doit $mvcmd "$dsttmp" "$dst"
389
	 }
390
    } || exit 1
273
391
274
{
392
    trap '' 0
275
	(exit 0); exit
393
  fi
276
}
394
done
395
396
# Local variables:
397
# eval: (add-hook 'write-file-hooks 'time-stamp)
398
# time-stamp-start: "scriptversion="
399
# time-stamp-format: "%:y-%02m-%02d.%02H"
400
# time-stamp-end: "$"
401
# End:
(-)eventwatcher-0.4.3-orig/admin/libtool.m4.in (-95 / +128 lines)
Lines 15-21 Link Here
15
##
15
##
16
## You should have received a copy of the GNU General Public License
16
## You should have received a copy of the GNU General Public License
17
## along with this program; if not, write to the Free Software
17
## along with this program; if not, write to the Free Software
18
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19
##
19
##
20
## As a special exception to the GNU General Public License, if you
20
## As a special exception to the GNU General Public License, if you
21
## distribute this file as part of a program that contains a
21
## distribute this file as part of a program that contains a
Lines 1273-1279 Link Here
1273
  dynamic_linker=no
1273
  dynamic_linker=no
1274
  ;;
1274
  ;;
1275
1275
1276
freebsd*-gnu*)
1276
kfreebsd*-gnu*)
1277
  version_type=linux
1277
  version_type=linux
1278
  need_lib_prefix=no
1278
  need_lib_prefix=no
1279
  need_version=no
1279
  need_version=no
Lines 1424-1430 Link Here
1424
  libsuff=
1424
  libsuff=
1425
  if test "x$LINUX_64_MODE" = x64; then
1425
  if test "x$LINUX_64_MODE" = x64; then
1426
    # Some platforms are per default 64-bit, so there's no /lib64
1426
    # Some platforms are per default 64-bit, so there's no /lib64
1427
    if test -d /lib64; then
1427
    if test -d /lib64 -a ! -h /lib64; then
1428
      libsuff=64
1428
      libsuff=64
1429
    fi
1429
    fi
1430
  fi
1430
  fi
Lines 2119-2125 Link Here
2119
  lt_cv_deplibs_check_method=pass_all
2119
  lt_cv_deplibs_check_method=pass_all
2120
  ;;
2120
  ;;
2121
2121
2122
freebsd*)
2122
freebsd* | kfreebsd*-gnu)
2123
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
2123
  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
2124
    case $host_cpu in
2124
    case $host_cpu in
2125
    i*86 )
2125
    i*86 )
Lines 2560-2577 Link Here
2560
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2560
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2561
    case "$host_os" in
2561
    case "$host_os" in
2562
    rhapsody* | darwin1.[[012]])
2562
    rhapsody* | darwin1.[[012]])
2563
      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
2563
      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
2564
      ;;
2564
      ;;
2565
    *) # Darwin 1.3 on
2565
    *) # Darwin 1.3 on
2566
      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2566
      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2567
	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
2568
      else
2569
	case ${MACOSX_DEPLOYMENT_TARGET} in
2570
	  10.[012])
2571
	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
2572
	    ;;
2573
	  10.*)
2574
	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
2575
	    ;;
2576
	esac
2577
      fi
2567
      ;;
2578
      ;;
2568
    esac
2579
    esac
2569
    output_verbose_link_cmd='echo'
2580
    output_verbose_link_cmd='echo'
2570
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
2581
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
2571
    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2582
    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
2572
    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2583
    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2573
    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2584
    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2574
    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2585
    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2575
    _LT_AC_TAGVAR(hardcode_direct, $1)=no
2586
    _LT_AC_TAGVAR(hardcode_direct, $1)=no
2576
    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2587
    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2577
    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2588
    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
Lines 2688-2695 Link Here
2688
  # Check if GNU C++ uses GNU ld as the underlying linker, since the
2699
  # Check if GNU C++ uses GNU ld as the underlying linker, since the
2689
  # archiving commands below assume that GNU ld is being used.
2700
  # archiving commands below assume that GNU ld is being used.
2690
  if test "$with_gnu_ld" = yes; then
2701
  if test "$with_gnu_ld" = yes; then
2691
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
2702
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
2692
    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2703
    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
2693
2704
2694
    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2705
    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
2695
    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
2706
    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
Lines 2715-2721 Link Here
2715
    # linker, instead of GNU ld.  If possible, this setting should
2726
    # linker, instead of GNU ld.  If possible, this setting should
2716
    # overridden to take advantage of the native linker features on
2727
    # overridden to take advantage of the native linker features on
2717
    # the platform it is being used on.
2728
    # the platform it is being used on.
2718
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
2729
    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
2719
  fi
2730
  fi
2720
2731
2721
  # Commands to make compiler produce verbose output that lists
2732
  # Commands to make compiler produce verbose output that lists
Lines 2809-2821 Link Here
2809
      _LT_AC_SYS_LIBPATH_AIX
2820
      _LT_AC_SYS_LIBPATH_AIX
2810
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2821
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
2811
2822
2812
      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
2823
      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
2813
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2824
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
2814
     else
2825
     else
2815
      if test "$host_cpu" = ia64; then
2826
      if test "$host_cpu" = ia64; then
2816
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2827
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
2817
	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
2828
	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
2818
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
2829
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
2819
      else
2830
      else
2820
	# Determine the default libpath from the value encoded in an empty executable.
2831
	# Determine the default libpath from the value encoded in an empty executable.
2821
	_LT_AC_SYS_LIBPATH_AIX
2832
	_LT_AC_SYS_LIBPATH_AIX
Lines 2830-2836 Link Here
2830
	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
2841
	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
2831
	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
2842
	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
2832
	# This is similar to how AIX traditionally builds it's shared libraries.
2843
	# This is similar to how AIX traditionally builds it's shared libraries.
2833
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2844
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
2834
      fi
2845
      fi
2835
    fi
2846
    fi
2836
    ;;
2847
    ;;
Lines 2852-2858 Link Here
2852
    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2863
    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
2853
2864
2854
    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
2865
    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
2855
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2866
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2856
      # If the export-symbols file already is a .def file (1st line
2867
      # If the export-symbols file already is a .def file (1st line
2857
      # is EXPORTS), use it as is; otherwise, prepend...
2868
      # is EXPORTS), use it as is; otherwise, prepend...
2858
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
2869
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
Lines 2861-2867 Link Here
2861
	echo EXPORTS > $output_objdir/$soname.def;
2872
	echo EXPORTS > $output_objdir/$soname.def;
2862
	cat $export_symbols >> $output_objdir/$soname.def;
2873
	cat $export_symbols >> $output_objdir/$soname.def;
2863
      fi~
2874
      fi~
2864
      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2875
      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
2865
    else
2876
    else
2866
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
2877
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
2867
    fi
2878
    fi
Lines 2872-2881 Link Here
2872
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2883
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2873
    case "$host_os" in
2884
    case "$host_os" in
2874
    rhapsody* | darwin1.[[012]])
2885
    rhapsody* | darwin1.[[012]])
2875
      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
2886
      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
2876
      ;;
2887
      ;;
2877
    *) # Darwin 1.3 on
2888
    *) # Darwin 1.3 on
2878
      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
2889
      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
2890
	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
2891
      else
2892
	case ${MACOSX_DEPLOYMENT_TARGET} in
2893
	  10.[012])
2894
	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
2895
	    ;;
2896
	  10.*)
2897
	    _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
2898
	    ;;
2899
	esac
2900
      fi
2879
      ;;
2901
      ;;
2880
    esac
2902
    esac
2881
    lt_int_apple_cc_single_mod=no
2903
    lt_int_apple_cc_single_mod=no
Lines 2884-2902 Link Here
2884
      lt_int_apple_cc_single_mod=yes
2906
      lt_int_apple_cc_single_mod=yes
2885
    fi
2907
    fi
2886
    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2908
    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2887
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2909
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
2888
    else
2910
    else
2889
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
2911
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
2890
    fi
2912
    fi
2891
    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
2913
    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
2892
2914
2893
    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2915
    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
2894
    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2916
    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
2895
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2917
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2896
    else
2918
    else
2897
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2919
      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2898
    fi
2920
    fi
2899
    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2921
    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
2900
    _LT_AC_TAGVAR(hardcode_direct, $1)=no
2922
    _LT_AC_TAGVAR(hardcode_direct, $1)=no
2901
    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2923
    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
2902
    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
2924
    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
Lines 2931-2937 Link Here
2931
  freebsd-elf*)
2953
  freebsd-elf*)
2932
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2954
    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
2933
    ;;
2955
    ;;
2934
  freebsd*)
2956
  freebsd* | kfreebsd*-gnu)
2935
    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
2957
    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
2936
    # conventions
2958
    # conventions
2937
    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
2959
    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
Lines 2953-2959 Link Here
2953
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
2975
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
2954
      ;;
2976
      ;;
2955
    aCC)
2977
    aCC)
2956
      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2978
      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2957
      # Commands to make compiler produce verbose output that lists
2979
      # Commands to make compiler produce verbose output that lists
2958
      # what "hidden" libraries, object files and flags are used when
2980
      # what "hidden" libraries, object files and flags are used when
2959
      # linking a shared library.
2981
      # linking a shared library.
Lines 2966-2972 Link Here
2966
      ;;
2988
      ;;
2967
    *)
2989
    *)
2968
      if test "$GXX" = yes; then
2990
      if test "$GXX" = yes; then
2969
        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2991
        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
2970
      else
2992
      else
2971
        # FIXME: insert proper C++ library support
2993
        # FIXME: insert proper C++ library support
2972
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
2994
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
Lines 3023-3029 Link Here
3023
	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3045
	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3024
	  ;;
3046
	  ;;
3025
	*)
3047
	*)
3026
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3048
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
3027
	  ;;
3049
	  ;;
3028
	esac
3050
	esac
3029
	# Commands to make compiler produce verbose output that lists
3051
	# Commands to make compiler produce verbose output that lists
Lines 3044-3050 Link Here
3044
	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3066
	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
3045
	      ;;
3067
	      ;;
3046
	    *)
3068
	    *)
3047
	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3069
	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
3048
	      ;;
3070
	      ;;
3049
	    esac
3071
	    esac
3050
	  fi
3072
	  fi
Lines 3059-3065 Link Here
3059
    case $cc_basename in
3081
    case $cc_basename in
3060
      CC)
3082
      CC)
3061
	# SGI C++
3083
	# SGI C++
3062
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3084
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3063
3085
3064
	# Archives containing C++ object files must be created using
3086
	# Archives containing C++ object files must be created using
3065
	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
3087
	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
Lines 3070-3078 Link Here
3070
      *)
3092
      *)
3071
	if test "$GXX" = yes; then
3093
	if test "$GXX" = yes; then
3072
	  if test "$with_gnu_ld" = no; then
3094
	  if test "$with_gnu_ld" = no; then
3073
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3095
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3074
	  else
3096
	  else
3075
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
3097
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
3076
	  fi
3098
	  fi
3077
	fi
3099
	fi
3078
	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3100
	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
Lines 3089-3096 Link Here
3089
	# KCC will only create a shared library if the output file
3111
	# KCC will only create a shared library if the output file
3090
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3112
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3091
	# to its proper name (with version) after linking.
3113
	# to its proper name (with version) after linking.
3092
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
3114
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
3093
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
3115
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
3094
	# Commands to make compiler produce verbose output that lists
3116
	# Commands to make compiler produce verbose output that lists
3095
	# what "hidden" libraries, object files and flags are used when
3117
	# what "hidden" libraries, object files and flags are used when
3096
	# linking a shared library.
3118
	# linking a shared library.
Lines 3112-3127 Link Here
3112
	# Intel C++
3134
	# Intel C++
3113
	with_gnu_ld=yes
3135
	with_gnu_ld=yes
3114
	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3136
	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3115
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3137
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
3116
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3138
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
3117
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3139
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3118
	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3140
	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3119
	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
3141
	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
3120
	;;
3142
	;;
3121
      cxx)
3143
      cxx)
3122
	# Compaq C++
3144
	# Compaq C++
3123
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
3145
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
3124
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
3146
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
3125
3147
3126
	runpath_var=LD_RUN_PATH
3148
	runpath_var=LD_RUN_PATH
3127
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
3149
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
Lines 3178-3184 Link Here
3178
	# KCC will only create a shared library if the output file
3200
	# KCC will only create a shared library if the output file
3179
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3201
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3180
	# to its proper name (with version) after linking.
3202
	# to its proper name (with version) after linking.
3181
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
3203
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
3182
3204
3183
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3205
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3184
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3206
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
Lines 3195-3201 Link Here
3195
	;;
3217
	;;
3196
      cxx)
3218
      cxx)
3197
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3219
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3198
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3220
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3199
3221
3200
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3222
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3201
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3223
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
Lines 3213-3219 Link Here
3213
      *)
3235
      *)
3214
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3236
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3215
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3237
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3216
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3238
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3217
3239
3218
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3240
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3219
	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3241
	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
Lines 3238-3244 Link Here
3238
	# KCC will only create a shared library if the output file
3260
	# KCC will only create a shared library if the output file
3239
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3261
	# ends with ".so" (or ".sl" for HP-UX), so rename the library
3240
	# to its proper name (with version) after linking.
3262
	# to its proper name (with version) after linking.
3241
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
3263
	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
3242
3264
3243
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3265
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
3244
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3266
	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
Lines 3254-3263 Link Here
3254
	;;
3276
	;;
3255
      cxx)
3277
      cxx)
3256
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
3278
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
3257
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3279
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
3258
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
3280
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
3259
	  echo "-hidden">> $lib.exp~
3281
	  echo "-hidden">> $lib.exp~
3260
	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
3282
	  $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
3261
	  $rm $lib.exp'
3283
	  $rm $lib.exp'
3262
3284
3263
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
3285
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
Lines 3276-3282 Link Here
3276
      *)
3298
      *)
3277
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3299
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3278
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3300
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
3279
	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3301
	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
3280
3302
3281
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3303
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
3282
	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
3304
	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
Lines 3333-3341 Link Here
3333
      CC)
3355
      CC)
3334
	# Sun C++ 4.2, 5.x and Centerline C++
3356
	# Sun C++ 4.2, 5.x and Centerline C++
3335
	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
3357
	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
3336
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
3358
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
3337
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3359
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3338
	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
3360
	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
3339
3361
3340
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
3362
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
3341
	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
3363
	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
Lines 3369-3375 Link Here
3369
	;;
3391
	;;
3370
      gcx)
3392
      gcx)
3371
	# Green Hills C++ Compiler
3393
	# Green Hills C++ Compiler
3372
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
3394
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
3373
3395
3374
	# The C++ compiler must be used to create the archive.
3396
	# The C++ compiler must be used to create the archive.
3375
	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
3397
	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
Lines 3379-3387 Link Here
3379
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3401
	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
3380
	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
3402
	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
3381
	  if $CC --version | grep -v '^2\.7' > /dev/null; then
3403
	  if $CC --version | grep -v '^2\.7' > /dev/null; then
3382
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
3404
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
3383
	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3405
	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3384
		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
3406
		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
3385
3407
3386
	    # Commands to make compiler produce verbose output that lists
3408
	    # Commands to make compiler produce verbose output that lists
3387
	    # what "hidden" libraries, object files and flags are used when
3409
	    # what "hidden" libraries, object files and flags are used when
Lines 3390-3398 Link Here
3390
	  else
3412
	  else
3391
	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
3413
	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
3392
	    # platform.
3414
	    # platform.
3393
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
3415
	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
3394
	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3416
	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
3395
		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
3417
		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
3396
3418
3397
	    # Commands to make compiler produce verbose output that lists
3419
	    # Commands to make compiler produce verbose output that lists
3398
	    # what "hidden" libraries, object files and flags are used when
3420
	    # what "hidden" libraries, object files and flags are used when
Lines 3920-3926 Link Here
3920
#
3942
#
3921
# You should have received a copy of the GNU General Public License
3943
# You should have received a copy of the GNU General Public License
3922
# along with this program; if not, write to the Free Software
3944
# along with this program; if not, write to the Free Software
3923
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
3945
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3924
#
3946
#
3925
# As a special exception to the GNU General Public License, if you
3947
# As a special exception to the GNU General Public License, if you
3926
# distribute this file as part of a program that contains a
3948
# distribute this file as part of a program that contains a
Lines 4577-4583 Link Here
4577
	    ;;
4599
	    ;;
4578
	esac
4600
	esac
4579
	;;
4601
	;;
4580
      freebsd*)
4602
      freebsd* | kfreebsd*-gnu)
4581
	# FreeBSD uses GNU C++
4603
	# FreeBSD uses GNU C++
4582
	;;
4604
	;;
4583
      hpux9* | hpux10* | hpux11*)
4605
      hpux9* | hpux10* | hpux11*)
Lines 5062-5068 Link Here
5062
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
5084
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
5063
	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
5085
	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
5064
	# support --undefined.  This deserves some investigation.  FIXME
5086
	# support --undefined.  This deserves some investigation.  FIXME
5065
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5087
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
5066
      else
5088
      else
5067
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5089
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5068
      fi
5090
      fi
Lines 5078-5084 Link Here
5078
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
5100
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
5079
5101
5080
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
5102
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
5081
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
5103
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
5082
	# If the export-symbols file already is a .def file (1st line
5104
	# If the export-symbols file already is a .def file (1st line
5083
	# is EXPORTS), use it as is; otherwise, prepend...
5105
	# is EXPORTS), use it as is; otherwise, prepend...
5084
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
5106
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
Lines 5087-5093 Link Here
5087
	  echo EXPORTS > $output_objdir/$soname.def;
5109
	  echo EXPORTS > $output_objdir/$soname.def;
5088
	  cat $export_symbols >> $output_objdir/$soname.def;
5110
	  cat $export_symbols >> $output_objdir/$soname.def;
5089
	fi~
5111
	fi~
5090
	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
5112
	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
5091
      else
5113
      else
5092
	ld_shlibs=no
5114
	ld_shlibs=no
5093
      fi
5115
      fi
Lines 5098-5105 Link Here
5098
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5120
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5099
	wlarc=
5121
	wlarc=
5100
      else
5122
      else
5101
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5123
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
5102
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5124
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5103
      fi
5125
      fi
5104
      ;;
5126
      ;;
5105
5127
Lines 5117-5124 Link Here
5117
5139
5118
EOF
5140
EOF
5119
      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5141
      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5120
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5142
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
5121
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5143
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5122
      else
5144
      else
5123
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5145
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5124
      fi
5146
      fi
Lines 5133-5140 Link Here
5133
5155
5134
    *)
5156
    *)
5135
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5157
      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
5136
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
5158
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
5137
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5159
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
5138
      else
5160
      else
5139
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5161
	_LT_AC_TAGVAR(ld_shlibs, $1)=no
5140
      fi
5162
      fi
Lines 5248-5260 Link Here
5248
       # Determine the default libpath from the value encoded in an empty executable.
5270
       # Determine the default libpath from the value encoded in an empty executable.
5249
	_LT_AC_SYS_LIBPATH_AIX
5271
	_LT_AC_SYS_LIBPATH_AIX
5250
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5272
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
5251
	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
5273
	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
5252
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5274
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
5253
       else
5275
       else
5254
	if test "$host_cpu" = ia64; then
5276
	if test "$host_cpu" = ia64; then
5255
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
5277
	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
5256
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
5278
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
5257
	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
5279
	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
5258
	else
5280
	else
5259
	 # Determine the default libpath from the value encoded in an empty executable.
5281
	 # Determine the default libpath from the value encoded in an empty executable.
5260
	 _LT_AC_SYS_LIBPATH_AIX
5282
	 _LT_AC_SYS_LIBPATH_AIX
Lines 5269-5275 Link Here
5269
	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
5291
	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
5270
	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
5292
	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
5271
	  # This is similar to how AIX traditionally builds it's shared libraries.
5293
	  # This is similar to how AIX traditionally builds it's shared libraries.
5272
	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
5294
	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
5273
	fi
5295
	fi
5274
      fi
5296
      fi
5275
      ;;
5297
      ;;
Lines 5298-5304 Link Here
5298
      # Tell ltmain to make .dll files, not .so files.
5320
      # Tell ltmain to make .dll files, not .so files.
5299
      shrext=".dll"
5321
      shrext=".dll"
5300
      # FIXME: Setting linknames here is a bad hack.
5322
      # FIXME: Setting linknames here is a bad hack.
5301
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
5323
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
5302
      # The linker will automatically build a .lib file if we build a DLL.
5324
      # The linker will automatically build a .lib file if we build a DLL.
5303
      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
5325
      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
5304
      # FIXME: Should let the user specify the lib program.
5326
      # FIXME: Should let the user specify the lib program.
Lines 5312-5321 Link Here
5312
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5334
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
5313
      case "$host_os" in
5335
      case "$host_os" in
5314
      rhapsody* | darwin1.[[012]])
5336
      rhapsody* | darwin1.[[012]])
5315
	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
5337
	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
5316
	;;
5338
	;;
5317
      *) # Darwin 1.3 on
5339
      *) # Darwin 1.3 on
5318
	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
5340
	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
5341
	  _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
5342
	else
5343
	  case ${MACOSX_DEPLOYMENT_TARGET} in
5344
	    10.[012])
5345
	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
5346
	      ;;
5347
	    10.*)
5348
	      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
5349
	      ;;
5350
	  esac
5351
	fi
5319
	;;
5352
	;;
5320
      esac
5353
      esac
5321
    	lt_int_apple_cc_single_mod=no
5354
    	lt_int_apple_cc_single_mod=no
Lines 5324-5341 Link Here
5324
    	  lt_int_apple_cc_single_mod=yes
5357
    	  lt_int_apple_cc_single_mod=yes
5325
    	fi
5358
    	fi
5326
    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5359
    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5327
    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
5360
    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
5328
    	else
5361
    	else
5329
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
5362
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
5330
      fi
5363
      fi
5331
      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
5364
      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
5332
      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
5365
      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
5333
        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5366
        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
5334
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5367
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5335
        else
5368
        else
5336
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5369
          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5337
        fi
5370
        fi
5338
          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5371
          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
5339
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
5372
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
5340
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
5373
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
5341
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
5374
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
Lines 5376-5383 Link Here
5376
      ;;
5409
      ;;
5377
5410
5378
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5411
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
5379
    freebsd*)
5412
    freebsd* | kfreebsd*-gnu)
5380
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
5413
      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
5381
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5414
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5382
      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5415
      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5383
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5416
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
Lines 5385-5391 Link Here
5385
5418
5386
    hpux9*)
5419
    hpux9*)
5387
      if test "$GCC" = yes; then
5420
      if test "$GCC" = yes; then
5388
	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5421
	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5389
      else
5422
      else
5390
	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5423
	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
5391
      fi
5424
      fi
Lines 5403-5412 Link Here
5403
      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
5436
      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
5404
	case "$host_cpu" in
5437
	case "$host_cpu" in
5405
	hppa*64*|ia64*)
5438
	hppa*64*|ia64*)
5406
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5439
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
5407
	  ;;
5440
	  ;;
5408
	*)
5441
	*)
5409
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
5442
	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
5410
	  ;;
5443
	  ;;
5411
	esac
5444
	esac
5412
      else
5445
      else
Lines 5453-5459 Link Here
5453
5486
5454
    irix5* | irix6* | nonstopux*)
5487
    irix5* | irix6* | nonstopux*)
5455
      if test "$GCC" = yes; then
5488
      if test "$GCC" = yes; then
5456
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5489
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5457
      else
5490
      else
5458
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5491
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5459
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
5492
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
Lines 5486-5492 Link Here
5486
      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5519
      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
5487
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5520
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5488
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5521
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
5489
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
5522
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
5490
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5523
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5491
	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
5524
	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
5492
      else
5525
      else
Lines 5496-5502 Link Here
5496
	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5529
	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
5497
	   ;;
5530
	   ;;
5498
	 *)
5531
	 *)
5499
	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
5532
	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
5500
	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5533
	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
5501
	   ;;
5534
	   ;;
5502
       esac
5535
       esac
Lines 5507-5520 Link Here
5507
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5540
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
5508
      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
5541
      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
5509
      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
5542
      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
5510
      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
5543
      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
5511
      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
5544
      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
5512
      ;;
5545
      ;;
5513
5546
5514
    osf3*)
5547
    osf3*)
5515
      if test "$GCC" = yes; then
5548
      if test "$GCC" = yes; then
5516
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5549
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5517
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5550
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5518
      else
5551
      else
5519
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5552
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5520
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
5553
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
Lines 5526-5532 Link Here
5526
    osf4* | osf5*)	# as osf3* with the addition of -msym flag
5559
    osf4* | osf5*)	# as osf3* with the addition of -msym flag
5527
      if test "$GCC" = yes; then
5560
      if test "$GCC" = yes; then
5528
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5561
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
5529
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5562
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
5530
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5563
	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
5531
      else
5564
      else
5532
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
5565
	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
Lines 5551-5559 Link Here
5551
    solaris*)
5584
    solaris*)
5552
      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
5585
      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
5553
      if test "$GCC" = yes; then
5586
      if test "$GCC" = yes; then
5554
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5587
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
5555
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5588
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5556
	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
5589
	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
5557
      else
5590
      else
5558
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
5591
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
5559
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
5592
	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
Lines 5573-5579 Link Here
5573
      if test "x$host_vendor" = xsequent; then
5606
      if test "x$host_vendor" = xsequent; then
5574
	# Use $CC to link under sequent, because it throws in some extra .o
5607
	# Use $CC to link under sequent, because it throws in some extra .o
5575
	# files that make .init and .fini sections work.
5608
	# files that make .init and .fini sections work.
5576
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
5609
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
5577
      else
5610
      else
5578
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
5611
	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
5579
      fi
5612
      fi
Lines 5633-5641 Link Here
5633
   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
5666
   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
5634
      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
5667
      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
5635
      if test "$GCC" = yes; then
5668
      if test "$GCC" = yes; then
5636
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5669
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
5637
      else
5670
      else
5638
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
5671
	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
5639
      fi
5672
      fi
5640
      runpath_var='LD_RUN_PATH'
5673
      runpath_var='LD_RUN_PATH'
5641
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
5674
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
(-)eventwatcher-0.4.3-orig/admin/ltmain.sh (-23 / +69 lines)
Lines 17-23 Link Here
17
#
17
#
18
# You should have received a copy of the GNU General Public License
18
# You should have received a copy of the GNU General Public License
19
# along with this program; if not, write to the Free Software
19
# along with this program; if not, write to the Free Software
20
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
20
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
21
#
21
#
22
# As a special exception to the GNU General Public License, if you
22
# As a special exception to the GNU General Public License, if you
23
# distribute this file as part of a program that contains a
23
# distribute this file as part of a program that contains a
Lines 1149-1154 Link Here
1149
	  finalize_command="$finalize_command $qarg"
1149
	  finalize_command="$finalize_command $qarg"
1150
	  continue
1150
	  continue
1151
	  ;;
1151
	  ;;
1152
	framework)
1153
	  case $host in
1154
	    *-*-darwin*)
1155
	      case "$deplibs " in
1156
	        *" $qarg.ltframework "*) ;;
1157
		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
1158
		   ;;
1159
              esac
1160
              ;;
1161
   	  esac
1162
	  prev=
1163
	  continue
1164
	  ;;
1152
	*)
1165
	*)
1153
	  eval "$prev=\"\$arg\""
1166
	  eval "$prev=\"\$arg\""
1154
	  prev=
1167
	  prev=
Lines 1263-1271 Link Here
1263
	    # These systems don't actually have a C or math library (as such)
1276
	    # These systems don't actually have a C or math library (as such)
1264
	    continue
1277
	    continue
1265
	    ;;
1278
	    ;;
1266
	  *-*-freebsd*-gnu*)
1267
	    # prevent being parsed by the freebsd regexp below
1268
	    ;;
1269
	  *-*-mingw* | *-*-os2*)
1279
	  *-*-mingw* | *-*-os2*)
1270
	    # These systems don't actually have a C library (as such)
1280
	    # These systems don't actually have a C library (as such)
1271
	    test "X$arg" = "X-lc" && continue
1281
	    test "X$arg" = "X-lc" && continue
Lines 1276-1289 Link Here
1276
	    ;;
1286
	    ;;
1277
	  *-*-rhapsody* | *-*-darwin1.[012])
1287
	  *-*-rhapsody* | *-*-darwin1.[012])
1278
	    # Rhapsody C and math libraries are in the System framework
1288
	    # Rhapsody C and math libraries are in the System framework
1279
	    deplibs="$deplibs -framework System"
1289
	    deplibs="$deplibs System.ltframework"
1280
	    continue
1290
	    continue
1281
	  esac
1291
	  esac
1282
	elif test "X$arg" = "X-lc_r"; then
1292
	elif test "X$arg" = "X-lc_r"; then
1283
	 case $host in
1293
	 case $host in
1284
	 *-*-freebsd*-gnu*)
1285
	   # prevent being parsed by the freebsd regexp below
1286
	   ;;
1287
	 *-*-openbsd*)
1294
	 *-*-openbsd*)
1288
	   # Do not include libc_r directly, use -pthread flag.
1295
	   # Do not include libc_r directly, use -pthread flag.
1289
	   continue
1296
	   continue
Lines 1466-1471 Link Here
1466
	continue
1473
	continue
1467
	;;
1474
	;;
1468
1475
1476
      -framework)
1477
        prev=framework
1478
	continue
1479
	;;
1480
1469
      # Some other compiler flag.
1481
      # Some other compiler flag.
1470
      -* | +*)
1482
      -* | +*)
1471
	# Unknown arguments in both finalize_command and compile_command need
1483
	# Unknown arguments in both finalize_command and compile_command need
Lines 1883-1888 Link Here
1883
	    fi
1895
	    fi
1884
	  fi
1896
	  fi
1885
	  ;; # -l
1897
	  ;; # -l
1898
	*.ltframework)
1899
	  if test "$linkmode,$pass" = "prog,link"; then
1900
	    compile_deplibs="$deplib $compile_deplibs"
1901
	    finalize_deplibs="$deplib $finalize_deplibs"
1902
	  else
1903
	    deplibs="$deplib $deplibs"
1904
	    if test "$linkmode" = lib ; then
1905
	      newdependency_libs="$deplib $newdependency_libs"
1906
	    fi
1907
	  fi
1908
	  continue
1909
	  ;;
1886
	-L*)
1910
	-L*)
1887
	  case $linkmode in
1911
	  case $linkmode in
1888
	  lib)
1912
	  lib)
Lines 2011-2016 Link Here
2011
	*) . ./$lib ;;
2035
	*) . ./$lib ;;
2012
	esac
2036
	esac
2013
2037
2038
	case $host in
2039
	*-*-darwin*)
2040
	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
2041
	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
2042
	  ;;
2043
	esac
2044
2014
	if test "$linkmode,$pass" = "lib,link" ||
2045
	if test "$linkmode,$pass" = "lib,link" ||
2015
	   test "$linkmode,$pass" = "prog,scan" ||
2046
	   test "$linkmode,$pass" = "prog,scan" ||
2016
	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
2047
	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
Lines 2617-2622 Link Here
2617
		*) continue ;;
2648
		*) continue ;;
2618
		esac  		  
2649
		esac  		  
2619
		;;
2650
		;;
2651
2652
	      *.ltframework)
2653
		case $host in
2654
		  *-*-darwin*)
2655
		    depdepl="$deplib"
2656
		    ;;
2657
		esac
2658
		;;
2659
2620
	      *) continue ;;
2660
	      *) continue ;;
2621
	      esac
2661
	      esac
2622
	      case " $deplibs " in
2662
	      case " $deplibs " in
Lines 3058-3064 Link Here
3058
	tempremovelist=`$echo "$output_objdir/*"`
3098
	tempremovelist=`$echo "$output_objdir/*"`
3059
	for p in $tempremovelist; do
3099
	for p in $tempremovelist; do
3060
	  case $p in
3100
	  case $p in
3061
	    *.$objext)
3101
	    *.$objext | *$exeext)
3062
	       ;;
3102
	       ;;
3063
	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
3103
	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
3064
	       removelist="$removelist $p"
3104
	       removelist="$removelist $p"
Lines 3130-3146 Link Here
3130
	    ;;
3170
	    ;;
3131
	  *-*-rhapsody* | *-*-darwin1.[012])
3171
	  *-*-rhapsody* | *-*-darwin1.[012])
3132
	    # Rhapsody C library is in the System framework
3172
	    # Rhapsody C library is in the System framework
3133
	    deplibs="$deplibs -framework System"
3173
	    deplibs="$deplibs System.ltframework"
3134
	    ;;
3174
	    ;;
3135
	  *-*-netbsd*)
3175
	  *-*-netbsd*)
3136
	    # Don't link with libc until the a.out ld.so is fixed.
3176
	    # Don't link with libc until the a.out ld.so is fixed.
3137
	    ;;
3177
	    ;;
3138
	  *-*-freebsd*-gnu*)
3139
	    # Prevent $arg from being parsed by the freebsd regexp below.
3140
	    if test "$build_libtool_need_lc" = "yes"; then
3141
	      deplibs="$deplibs -lc"
3142
	    fi
3143
	    ;;
3144
	  *-*-openbsd* | *-*-freebsd*)
3178
	  *-*-openbsd* | *-*-freebsd*)
3145
	    # Do not include libc due to us having libc/libc_r.
3179
	    # Do not include libc due to us having libc/libc_r.
3146
	    test "X$arg" = "X-lc" && continue
3180
	    test "X$arg" = "X-lc" && continue
Lines 3429-3435 Link Here
3429
	case $host in
3463
	case $host in
3430
	*-*-rhapsody* | *-*-darwin1.[012])
3464
	*-*-rhapsody* | *-*-darwin1.[012])
3431
	  # On Rhapsody replace the C library is the System framework
3465
	  # On Rhapsody replace the C library is the System framework
3432
	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
3466
	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
3433
	  ;;
3467
	  ;;
3434
	esac
3468
	esac
3435
3469
Lines 3475-3480 Link Here
3475
	    fi
3509
	    fi
3476
	  fi
3510
	  fi
3477
	fi
3511
	fi
3512
	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
3513
	case $host in
3514
	  *-*-darwin*)
3515
	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
3516
	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
3517
	    ;;
3518
	esac
3478
	# Done checking deplibs!
3519
	# Done checking deplibs!
3479
	deplibs=$newdeplibs
3520
	deplibs=$newdeplibs
3480
      fi
3521
      fi
Lines 4057-4074 Link Here
4057
      case $host in
4098
      case $host in
4058
      *-*-rhapsody* | *-*-darwin1.[012])
4099
      *-*-rhapsody* | *-*-darwin1.[012])
4059
	# On Rhapsody replace the C library is the System framework
4100
	# On Rhapsody replace the C library is the System framework
4060
	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
4101
	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
4061
	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
4102
	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
4062
	;;
4103
	;;
4063
      esac
4104
      esac
4064
4105
4065
      case $host in
4106
      case $host in
4066
      *darwin*)
4107
      *-*-darwin*)
4067
        # Don't allow lazy linking, it breaks C++ global constructors
4108
        # Don't allow lazy linking, it breaks C++ global constructors
4068
        if test "$tagname" = CXX ; then
4109
        if test "$tagname" = CXX ; then
4069
        compile_command="$compile_command ${wl}-bind_at_load"
4110
        compile_command="$compile_command ${wl}-bind_at_load"
4070
        finalize_command="$finalize_command ${wl}-bind_at_load"
4111
        finalize_command="$finalize_command ${wl}-bind_at_load"
4071
        fi
4112
        fi
4113
	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
4114
	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
4115
	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
4072
        ;;
4116
        ;;
4073
      esac
4117
      esac
4074
4118
Lines 4529-4536 Link Here
4529
	  *) exeext= ;;
4573
	  *) exeext= ;;
4530
	esac
4574
	esac
4531
	case $host in
4575
	case $host in
4532
	  *cygwin* | *mingw* )
4576
	  *mingw* )
4533
	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
4577
	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
4534
	    cwrapper=`$echo ${output}.exe`
4578
	    cwrapper=`$echo ${output}.exe`
4535
	    $rm $cwrappersource $cwrapper
4579
	    $rm $cwrappersource $cwrapper
4536
	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
4580
	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
Lines 4897-4904 Link Here
4897
	  ;;
4941
	  ;;
4898
4942
4899
	*)
4943
	*)
4944
	  # Need to set LD_LIBRARY_PATH, to the value already
4945
	  # computed within libtool.
4900
	  $echo >> $output "\
4946
	  $echo >> $output "\
4901
      exec \$progdir/\$program \${1+\"\$@\"}
4947
      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
4902
"
4948
"
4903
	  ;;
4949
	  ;;
4904
	esac
4950
	esac
(-)eventwatcher-0.4.3-orig/admin/Makefile.common (-2 / +4 lines)
Lines 6-12 Link Here
6
6
7
SHELL=/bin/sh
7
SHELL=/bin/sh
8
8
9
cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
9
cvs dist configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4 extract-messages:
10
	@admindir=$(admindir); \
10
	@admindir=$(admindir); \
11
	if test "x$$admindir" = x; then \
11
	if test "x$$admindir" = x; then \
12
	  admindir=.; until test -f $$admindir/admin/cvs.sh; do \
12
	  admindir=.; until test -f $$admindir/admin/cvs.sh; do \
Lines 30-35 Link Here
30
configure.in: configure.files subdirs
30
configure.in: configure.files subdirs
31
configure.files: subdirs
31
configure.files: subdirs
32
32
33
svn: cvs
34
33
.SILENT:
35
.SILENT:
34
36
35
.PHONY: cvs dist cvs-clean package-merge package-messages
37
.PHONY: svn cvs dist package-merge package-messages
(-)eventwatcher-0.4.3-orig/admin/missing (-57 / +74 lines)
Lines 1-6 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# Common stub for a few missing GNU programs while installing.
2
# Common stub for a few missing GNU programs while installing.
3
# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
3
4
scriptversion=2004-09-07.08
5
6
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
7
#   Free Software Foundation, Inc.
4
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
5
9
6
# This program is free software; you can redistribute it and/or modify
10
# This program is free software; you can redistribute it and/or modify
Lines 38-55 Link Here
38
  configure_ac=configure.in
42
  configure_ac=configure.in
39
fi
43
fi
40
44
45
msg="missing on your system"
46
41
case "$1" in
47
case "$1" in
42
--run)
48
--run)
43
  # Try to run requested program, and just exit if it succeeds.
49
  # Try to run requested program, and just exit if it succeeds.
44
  run=
50
  run=
45
  shift
51
  shift
46
  "$@" && exit 0
52
  "$@" && exit 0
53
  # Exit code 63 means version mismatch.  This often happens
54
  # when the user try to use an ancient version of a tool on
55
  # a file that requires a minimum version.  In this case we
56
  # we should proceed has if the program had been absent, or
57
  # if --run hadn't been passed.
58
  if test $? = 63; then
59
    run=:
60
    msg="probably too old"
61
  fi
47
  ;;
62
  ;;
48
esac
49
50
# If it does not exist, or fails to run (possibly an outdated version),
51
# try to emulate it.
52
case "$1" in
53
63
54
  -h|--h|--he|--hel|--help)
64
  -h|--h|--he|--hel|--help)
55
    echo "\
65
    echo "\
Lines 74-84 Link Here
74
  lex          create \`lex.yy.c', if possible, from existing .c
84
  lex          create \`lex.yy.c', if possible, from existing .c
75
  makeinfo     touch the output file
85
  makeinfo     touch the output file
76
  tar          try tar, gnutar, gtar, then tar without non-portable flags
86
  tar          try tar, gnutar, gtar, then tar without non-portable flags
77
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
87
  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
88
89
Send bug reports to <bug-automake@gnu.org>."
90
    exit 0
78
    ;;
91
    ;;
79
92
80
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
93
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
81
    echo "missing 0.4 - GNU automake"
94
    echo "missing $scriptversion (GNU Automake)"
95
    exit 0
82
    ;;
96
    ;;
83
97
84
  -*)
98
  -*)
Lines 87-100 Link Here
87
    exit 1
101
    exit 1
88
    ;;
102
    ;;
89
103
90
  aclocal*)
104
esac
105
106
# Now exit if we have it, but it failed.  Also exit now if we
107
# don't have it and --version was passed (most likely to detect
108
# the program).
109
case "$1" in
110
  lex|yacc)
111
    # Not GNU programs, they don't have --version.
112
    ;;
113
114
  tar)
115
    if test -n "$run"; then
116
       echo 1>&2 "ERROR: \`tar' requires --run"
117
       exit 1
118
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
119
       exit 1
120
    fi
121
    ;;
122
123
  *)
91
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
124
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
92
       # We have it, but it failed.
125
       # We have it, but it failed.
93
       exit 1
126
       exit 1
127
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128
       # Could not run --version or --help.  This is probably someone
129
       # running `$TOOL --version' or `$TOOL --help' to check whether
130
       # $TOOL exists and not knowing $TOOL uses missing.
131
       exit 1
94
    fi
132
    fi
133
    ;;
134
esac
95
135
136
# If it does not exist, or fails to run (possibly an outdated version),
137
# try to emulate it.
138
case "$1" in
139
  aclocal*)
96
    echo 1>&2 "\
140
    echo 1>&2 "\
97
WARNING: \`$1' is missing on your system.  You should only need it if
141
WARNING: \`$1' is $msg.  You should only need it if
98
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
142
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
99
         to install the \`Automake' and \`Perl' packages.  Grab them from
143
         to install the \`Automake' and \`Perl' packages.  Grab them from
100
         any GNU archive site."
144
         any GNU archive site."
Lines 102-114 Link Here
102
    ;;
146
    ;;
103
147
104
  autoconf)
148
  autoconf)
105
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
106
       # We have it, but it failed.
107
       exit 1
108
    fi
109
110
    echo 1>&2 "\
149
    echo 1>&2 "\
111
WARNING: \`$1' is missing on your system.  You should only need it if
150
WARNING: \`$1' is $msg.  You should only need it if
112
         you modified \`${configure_ac}'.  You might want to install the
151
         you modified \`${configure_ac}'.  You might want to install the
113
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
152
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
114
         archive site."
153
         archive site."
Lines 116-128 Link Here
116
    ;;
155
    ;;
117
156
118
  autoheader)
157
  autoheader)
119
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
120
       # We have it, but it failed.
121
       exit 1
122
    fi
123
124
    echo 1>&2 "\
158
    echo 1>&2 "\
125
WARNING: \`$1' is missing on your system.  You should only need it if
159
WARNING: \`$1' is $msg.  You should only need it if
126
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
160
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
127
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
161
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
128
         from any GNU archive site."
162
         from any GNU archive site."
Lines 140-152 Link Here
140
    ;;
174
    ;;
141
175
142
  automake*)
176
  automake*)
143
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
144
       # We have it, but it failed.
145
       exit 1
146
    fi
147
148
    echo 1>&2 "\
177
    echo 1>&2 "\
149
WARNING: \`$1' is missing on your system.  You should only need it if
178
WARNING: \`$1' is $msg.  You should only need it if
150
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
179
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
151
         You might want to install the \`Automake' and \`Perl' packages.
180
         You might want to install the \`Automake' and \`Perl' packages.
152
         Grab them from any GNU archive site."
181
         Grab them from any GNU archive site."
Lines 156-171 Link Here
156
    ;;
185
    ;;
157
186
158
  autom4te)
187
  autom4te)
159
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
160
       # We have it, but it failed.
161
       exit 1
162
    fi
163
164
    echo 1>&2 "\
188
    echo 1>&2 "\
165
WARNING: \`$1' is needed, and you do not seem to have it handy on your
189
WARNING: \`$1' is needed, but is $msg.
166
         system.  You might have modified some files without having the
190
         You might have modified some files without having the
167
         proper tools for further handling them.
191
         proper tools for further handling them.
168
         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
192
         You can get \`$1' as part of \`Autoconf' from any GNU
169
         archive site."
193
         archive site."
170
194
171
    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
195
    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
Lines 185-191 Link Here
185
209
186
  bison|yacc)
210
  bison|yacc)
187
    echo 1>&2 "\
211
    echo 1>&2 "\
188
WARNING: \`$1' is missing on your system.  You should only need it if
212
WARNING: \`$1' $msg.  You should only need it if
189
         you modified a \`.y' file.  You may need the \`Bison' package
213
         you modified a \`.y' file.  You may need the \`Bison' package
190
         in order for those modifications to take effect.  You can get
214
         in order for those modifications to take effect.  You can get
191
         \`Bison' from any GNU archive site."
215
         \`Bison' from any GNU archive site."
Lines 215-221 Link Here
215
239
216
  lex|flex)
240
  lex|flex)
217
    echo 1>&2 "\
241
    echo 1>&2 "\
218
WARNING: \`$1' is missing on your system.  You should only need it if
242
WARNING: \`$1' is $msg.  You should only need it if
219
         you modified a \`.l' file.  You may need the \`Flex' package
243
         you modified a \`.l' file.  You may need the \`Flex' package
220
         in order for those modifications to take effect.  You can get
244
         in order for those modifications to take effect.  You can get
221
         \`Flex' from any GNU archive site."
245
         \`Flex' from any GNU archive site."
Lines 237-249 Link Here
237
    ;;
261
    ;;
238
262
239
  help2man)
263
  help2man)
240
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
241
       # We have it, but it failed.
242
       exit 1
243
    fi
244
245
    echo 1>&2 "\
264
    echo 1>&2 "\
246
WARNING: \`$1' is missing on your system.  You should only need it if
265
WARNING: \`$1' is $msg.  You should only need it if
247
	 you modified a dependency of a manual page.  You may need the
266
	 you modified a dependency of a manual page.  You may need the
248
	 \`Help2man' package in order for those modifications to take
267
	 \`Help2man' package in order for those modifications to take
249
	 effect.  You can get \`Help2man' from any GNU archive site."
268
	 effect.  You can get \`Help2man' from any GNU archive site."
Lines 262-274 Link Here
262
    ;;
281
    ;;
263
282
264
  makeinfo)
283
  makeinfo)
265
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
266
       # We have makeinfo, but it failed.
267
       exit 1
268
    fi
269
270
    echo 1>&2 "\
284
    echo 1>&2 "\
271
WARNING: \`$1' is missing on your system.  You should only need it if
285
WARNING: \`$1' is $msg.  You should only need it if
272
         you modified a \`.texi' or \`.texinfo' file, or any other file
286
         you modified a \`.texi' or \`.texinfo' file, or any other file
273
         indirectly affecting the aspect of the manual.  The spurious
287
         indirectly affecting the aspect of the manual.  The spurious
274
         call might also be the consequence of using a buggy \`make' (AIX,
288
         call might also be the consequence of using a buggy \`make' (AIX,
Lines 284-293 Link Here
284
298
285
  tar)
299
  tar)
286
    shift
300
    shift
287
    if test -n "$run"; then
288
      echo 1>&2 "ERROR: \`tar' requires --run"
289
      exit 1
290
    fi
291
301
292
    # We have already tried tar in the generic part.
302
    # We have already tried tar in the generic part.
293
    # Look for gnutar/gtar before invocation to avoid ugly error
303
    # Look for gnutar/gtar before invocation to avoid ugly error
Lines 323-332 Link Here
323
333
324
  *)
334
  *)
325
    echo 1>&2 "\
335
    echo 1>&2 "\
326
WARNING: \`$1' is needed, and you do not seem to have it handy on your
336
WARNING: \`$1' is needed, and is $msg.
327
         system.  You might have modified some files without having the
337
         You might have modified some files without having the
328
         proper tools for further handling them.  Check the \`README' file,
338
         proper tools for further handling them.  Check the \`README' file,
329
         it often tells you about the needed prerequirements for installing
339
         it often tells you about the needed prerequisites for installing
330
         this package.  You may also peek at any GNU archive site, in case
340
         this package.  You may also peek at any GNU archive site, in case
331
         some other package would contain this missing \`$1' program."
341
         some other package would contain this missing \`$1' program."
332
    exit 1
342
    exit 1
Lines 334-336 Link Here
334
esac
344
esac
335
345
336
exit 0
346
exit 0
347
348
# Local variables:
349
# eval: (add-hook 'write-file-hooks 'time-stamp)
350
# time-stamp-start: "scriptversion="
351
# time-stamp-format: "%:y-%02m-%02d.%02H"
352
# time-stamp-end: "$"
353
# End:
(-)eventwatcher-0.4.3-orig/admin/mkinstalldirs (-21 / +68 lines)
Lines 1-21 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# mkinstalldirs --- make directory hierarchy
2
# mkinstalldirs --- make directory hierarchy
3
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
3
4
scriptversion=2005-06-29.22
5
6
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
4
# Created: 1993-05-16
7
# Created: 1993-05-16
5
# Public domain
8
# Public domain.
9
#
10
# This file is maintained in Automake, please report
11
# bugs to <bug-automake@gnu.org> or send patches to
12
# <automake-patches@gnu.org>.
6
13
7
errstatus=0
14
errstatus=0
8
dirmode=""
15
dirmode=
9
16
10
usage="\
17
usage="\
11
Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
18
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
19
20
Create each directory DIR (with mode MODE, if specified), including all
21
leading file name components.
22
23
Report bugs to <bug-automake@gnu.org>."
12
24
13
# process command line arguments
25
# process command line arguments
14
while test $# -gt 0 ; do
26
while test $# -gt 0 ; do
15
  case $1 in
27
  case $1 in
16
    -h | --help | --h*)         # -h for help
28
    -h | --help | --h*)         # -h for help
17
      echo "$usage" 1>&2
29
      echo "$usage"
18
      exit 0
30
      exit $?
19
      ;;
31
      ;;
20
    -m)                         # -m PERM arg
32
    -m)                         # -m PERM arg
21
      shift
33
      shift
Lines 23-28 Link Here
23
      dirmode=$1
35
      dirmode=$1
24
      shift
36
      shift
25
      ;;
37
      ;;
38
    --version)
39
      echo "$0 $scriptversion"
40
      exit $?
41
      ;;
26
    --)                         # stop option processing
42
    --)                         # stop option processing
27
      shift
43
      shift
28
      break
44
      break
Lines 50-79 Link Here
50
  0) exit 0 ;;
66
  0) exit 0 ;;
51
esac
67
esac
52
68
69
# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
70
# mkdir -p a/c at the same time, both will detect that a is missing,
71
# one will create a, then the other will try to create a and die with
72
# a "File exists" error.  This is a problem when calling mkinstalldirs
73
# from a parallel make.  We use --version in the probe to restrict
74
# ourselves to GNU mkdir, which is thread-safe.
53
case $dirmode in
75
case $dirmode in
54
  '')
76
  '')
55
    if mkdir -p -- . 2>/dev/null; then
77
    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
56
      echo "mkdir -p -- $*"
78
      echo "mkdir -p -- $*"
57
      exec mkdir -p -- "$@"
79
      exec mkdir -p -- "$@"
80
    else
81
      # On NextStep and OpenStep, the `mkdir' command does not
82
      # recognize any option.  It will interpret all options as
83
      # directories to create, and then abort because `.' already
84
      # exists.
85
      test -d ./-p && rmdir ./-p
86
      test -d ./--version && rmdir ./--version
58
    fi
87
    fi
59
    ;;
88
    ;;
60
  *)
89
  *)
61
    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
90
    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
91
       test ! -d ./--version; then
62
      echo "mkdir -m $dirmode -p -- $*"
92
      echo "mkdir -m $dirmode -p -- $*"
63
      exec mkdir -m "$dirmode" -p -- "$@"
93
      exec mkdir -m "$dirmode" -p -- "$@"
94
    else
95
      # Clean up after NextStep and OpenStep mkdir.
96
      for d in ./-m ./-p ./--version "./$dirmode";
97
      do
98
        test -d $d && rmdir $d
99
      done
64
    fi
100
    fi
65
    ;;
101
    ;;
66
esac
102
esac
67
103
68
for file
104
for file
69
do
105
do
70
  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
106
  case $file in
107
    /*) pathcomp=/ ;;
108
    *)  pathcomp= ;;
109
  esac
110
  oIFS=$IFS
111
  IFS=/
112
  set fnord $file
71
  shift
113
  shift
114
  IFS=$oIFS
72
115
73
  pathcomp=
74
  for d
116
  for d
75
  do
117
  do
76
    pathcomp="$pathcomp$d"
118
    test "x$d" = x && continue
119
120
    pathcomp=$pathcomp$d
77
    case $pathcomp in
121
    case $pathcomp in
78
      -*) pathcomp=./$pathcomp ;;
122
      -*) pathcomp=./$pathcomp ;;
79
    esac
123
    esac
Lines 84-104 Link Here
84
      mkdir "$pathcomp" || lasterr=$?
128
      mkdir "$pathcomp" || lasterr=$?
85
129
86
      if test ! -d "$pathcomp"; then
130
      if test ! -d "$pathcomp"; then
87
  	errstatus=$lasterr
131
	errstatus=$lasterr
88
      else
132
      else
89
  	if test ! -z "$dirmode"; then
133
	if test ! -z "$dirmode"; then
90
	  echo "chmod $dirmode $pathcomp"
134
	  echo "chmod $dirmode $pathcomp"
91
    	  lasterr=""
135
	  lasterr=
92
  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
136
	  chmod "$dirmode" "$pathcomp" || lasterr=$?
93
137
94
  	  if test ! -z "$lasterr"; then
138
	  if test ! -z "$lasterr"; then
95
  	    errstatus=$lasterr
139
	    errstatus=$lasterr
96
  	  fi
140
	  fi
97
  	fi
141
	fi
98
      fi
142
      fi
99
    fi
143
    fi
100
144
101
    pathcomp="$pathcomp/"
145
    pathcomp=$pathcomp/
102
  done
146
  done
103
done
147
done
104
148
Lines 107-111 Link Here
107
# Local Variables:
151
# Local Variables:
108
# mode: shell-script
152
# mode: shell-script
109
# sh-indentation: 2
153
# sh-indentation: 2
154
# eval: (add-hook 'write-file-hooks 'time-stamp)
155
# time-stamp-start: "scriptversion="
156
# time-stamp-format: "%:y-%02m-%02d.%02H"
157
# time-stamp-end: "$"
110
# End:
158
# End:
111
# mkinstalldirs ends here
(-)eventwatcher-0.4.3-orig/admin/oldinclude.m4.in (-2 / +2 lines)
Lines 16-23 Link Here
16
16
17
dnl    You should have received a copy of the GNU Library General Public License
17
dnl    You should have received a copy of the GNU Library General Public License
18
dnl    along with this library; see the file COPYING.LIB.  If not, write to
18
dnl    along with this library; see the file COPYING.LIB.  If not, write to
19
dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
19
dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20
dnl    Boston, MA 02111-1307, USA.
20
dnl    Boston, MA 02110-1301, USA.
21
21
22
AC_DEFUN([KDE_CHECK_MICO],
22
AC_DEFUN([KDE_CHECK_MICO],
23
[
23
[
(-)eventwatcher-0.4.3-orig/admin/pkg.m4.in (+57 lines)
Line 0 Link Here
1
2
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
3
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
4
dnl also defines GSTUFF_PKG_ERRORS on error
5
AC_DEFUN([PKG_CHECK_MODULES], [
6
  succeeded=no
7
8
  if test -z "$PKG_CONFIG"; then
9
    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
10
  fi
11
12
  if test "$PKG_CONFIG" = "no" ; then
13
     echo "*** The pkg-config script could not be found. Make sure it is"
14
     echo "*** in your path, or set the PKG_CONFIG environment variable"
15
     echo "*** to the full path to pkg-config."
16
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
17
  else
18
     PKG_CONFIG_MIN_VERSION=0.9.0
19
     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
20
        AC_MSG_CHECKING(for $2)
21
22
        if $PKG_CONFIG --exists "$2" ; then
23
            AC_MSG_RESULT(yes)
24
            succeeded=yes
25
26
            AC_MSG_CHECKING($1_CFLAGS)
27
            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
28
            AC_MSG_RESULT($$1_CFLAGS)
29
30
            AC_MSG_CHECKING($1_LIBS)
31
            $1_LIBS=`$PKG_CONFIG --libs "$2"`
32
            AC_MSG_RESULT($$1_LIBS)
33
        else
34
            $1_CFLAGS=""
35
            $1_LIBS=""
36
            ## If we have a custom action on failure, don't print errors, but 
37
            ## do set a variable so people can do so.
38
            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
39
            ifelse([$4], ,echo $$1_PKG_ERRORS,)
40
        fi
41
42
        AC_SUBST($1_CFLAGS)
43
        AC_SUBST($1_LIBS)
44
     else
45
        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
46
        echo "*** See http://www.freedesktop.org/software/pkgconfig"
47
     fi
48
  fi
49
50
  if test $succeeded = yes; then
51
     ifelse([$3], , :, [$3])
52
  else
53
     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
54
  fi
55
])
56
57
(-)eventwatcher-0.4.3-orig/admin/ylwrap (-78 / +158 lines)
Lines 1-6 Link Here
1
#! /bin/sh
1
#! /bin/sh
2
# ylwrap - wrapper for lex/yacc invocations.
2
# ylwrap - wrapper for lex/yacc invocations.
3
# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
3
4
scriptversion=2005-05-14.22
5
6
# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
7
#   Free Software Foundation, Inc.
8
#
4
# Written by Tom Tromey <tromey@cygnus.com>.
9
# Written by Tom Tromey <tromey@cygnus.com>.
5
#
10
#
6
# This program is free software; you can redistribute it and/or modify
11
# This program is free software; you can redistribute it and/or modify
Lines 15-65 Link Here
15
#
20
#
16
# You should have received a copy of the GNU General Public License
21
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
22
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
23
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
24
# 02110-1301, USA.
19
25
20
# As a special exception to the GNU General Public License, if you
26
# As a special exception to the GNU General Public License, if you
21
# distribute this file as part of a program that contains a
27
# distribute this file as part of a program that contains a
22
# configuration script generated by Autoconf, you may include it under
28
# configuration script generated by Autoconf, you may include it under
23
# the same distribution terms that you use for the rest of that program.
29
# the same distribution terms that you use for the rest of that program.
24
30
25
# Usage:
31
# This file is maintained in Automake, please report
26
#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
32
# bugs to <bug-automake@gnu.org> or send patches to
27
# * INPUT is the input file
33
# <automake-patches@gnu.org>.
28
# * OUTPUT is file PROG generates
34
29
# * DESIRED is file we actually want
35
case "$1" in
30
# * PROGRAM is program to run
36
  '')
31
# * ARGS are passed to PROG
37
    echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
32
# Any number of OUTPUT,DESIRED pairs may be used.
38
    exit 1
39
    ;;
40
  --basedir)
41
    basedir=$2
42
    shift 2
43
    ;;
44
  -h|--h*)
45
    cat <<\EOF
46
Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
47
48
Wrapper for lex/yacc invocations, renaming files as desired.
49
50
  INPUT is the input file
51
  OUTPUT is one file PROG generates
52
  DESIRED is the file we actually want instead of OUTPUT
53
  PROGRAM is program to run
54
  ARGS are passed to PROG
55
56
Any number of OUTPUT,DESIRED pairs may be used.
57
58
Report bugs to <bug-automake@gnu.org>.
59
EOF
60
    exit $?
61
    ;;
62
  -v|--v*)
63
    echo "ylwrap $scriptversion"
64
    exit $?
65
    ;;
66
esac
67
33
68
34
# The input.
69
# The input.
35
input="$1"
70
input="$1"
36
shift
71
shift
37
case "$input" in
72
case "$input" in
38
 [\\/]* | ?:[\\/]*)
73
  [\\/]* | ?:[\\/]*)
39
    # Absolute path; do nothing.
74
    # Absolute path; do nothing.
40
    ;;
75
    ;;
41
 *)
76
  *)
42
    # Relative path.  Make it absolute.
77
    # Relative path.  Make it absolute.
43
    input="`pwd`/$input"
78
    input="`pwd`/$input"
44
    ;;
79
    ;;
45
esac
80
esac
46
81
47
# The directory holding the input.
48
input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
49
# Quote $INPUT_DIR so we can use it in a regexp.
50
# FIXME: really we should care about more than `.' and `\'.
51
input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
52
53
echo "got $input_rx"
54
55
pairlist=
82
pairlist=
56
while test "$#" -ne 0; do
83
while test "$#" -ne 0; do
57
   if test "$1" = "--"; then
84
  if test "$1" = "--"; then
58
      shift
85
    shift
59
      break
86
    break
60
   fi
87
  fi
61
   pairlist="$pairlist $1"
88
  pairlist="$pairlist $1"
62
   shift
89
  shift
63
done
90
done
64
91
65
# The program to run.
92
# The program to run.
Lines 67-74 Link Here
67
shift
94
shift
68
# Make any relative path in $prog absolute.
95
# Make any relative path in $prog absolute.
69
case "$prog" in
96
case "$prog" in
70
 [\\/]* | ?:[\\/]*) ;;
97
  [\\/]* | ?:[\\/]*) ;;
71
 *[\\/]*) prog="`pwd`/$prog" ;;
98
  *[\\/]*) prog="`pwd`/$prog" ;;
72
esac
99
esac
73
100
74
# FIXME: add hostname here for parallel makes that run commands on
101
# FIXME: add hostname here for parallel makes that run commands on
Lines 79-143 Link Here
79
106
80
cd $dirname
107
cd $dirname
81
108
82
$prog ${1+"$@"} "$input"
109
case $# in
83
status=$?
110
  0) $prog "$input" ;;
111
  *) $prog "$@" "$input" ;;
112
esac
113
ret=$?
84
114
85
if test $status -eq 0; then
115
if test $ret -eq 0; then
86
   set X $pairlist
116
  set X $pairlist
87
   shift
117
  shift
88
   first=yes
118
  first=yes
89
   # Since DOS filename conventions don't allow two dots,
119
  # Since DOS filename conventions don't allow two dots,
90
   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
120
  # the DOS version of Bison writes out y_tab.c instead of y.tab.c
91
   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
121
  # and y_tab.h instead of y.tab.h. Test to see if this is the case.
92
   y_tab_nodot="no"
122
  y_tab_nodot="no"
93
   if test -f y_tab.c || test -f y_tab.h; then
123
  if test -f y_tab.c || test -f y_tab.h; then
94
      y_tab_nodot="yes"
124
    y_tab_nodot="yes"
95
   fi
125
  fi
96
126
97
   while test "$#" -ne 0; do
127
  # The directory holding the input.
98
      from="$1"
128
  input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
99
      # Handle y_tab.c and y_tab.h output by DOS
129
  # Quote $INPUT_DIR so we can use it in a regexp.
100
      if test $y_tab_nodot = "yes"; then
130
  # FIXME: really we should care about more than `.' and `\'.
101
	 if test $from = "y.tab.c"; then
131
  input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
102
	    from="y_tab.c"
103
	 else
104
	    if test $from = "y.tab.h"; then
105
	       from="y_tab.h"
106
	    fi
107
	 fi
108
      fi
109
      if test -f "$from"; then
110
         # If $2 is an absolute path name, then just use that,
111
         # otherwise prepend `../'.
112
         case "$2" in
113
	   [\\/]* | ?:[\\/]*) target="$2";;
114
	   *) target="../$2";;
115
	 esac
116
132
117
	 # Edit out `#line' or `#' directives.  We don't want the
133
  while test "$#" -ne 0; do
118
	 # resulting debug information to point at an absolute srcdir;
134
    from="$1"
119
	 # it is better for it to just mention the .y file with no
135
    # Handle y_tab.c and y_tab.h output by DOS
120
	 # path.
136
    if test $y_tab_nodot = "yes"; then
121
	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
137
      if test $from = "y.tab.c"; then
138
    	from="y_tab.c"
122
      else
139
      else
123
	 # A missing file is only an error for the first file.  This
140
    	if test $from = "y.tab.h"; then
124
	 # is a blatant hack to let us support using "yacc -d".  If -d
141
    	  from="y_tab.h"
125
	 # is not specified, we don't want an error when the header
142
    	fi
126
	 # file is "missing".
127
	 if test $first = yes; then
128
	    status=1
129
	 fi
130
      fi
143
      fi
131
      shift
144
    fi
132
      shift
145
    if test -f "$from"; then
133
      first=no
146
      # If $2 is an absolute path name, then just use that,
134
   done
147
      # otherwise prepend `../'.
148
      case "$2" in
149
    	[\\/]* | ?:[\\/]*) target="$2";;
150
    	*) target="../$2";;
151
      esac
152
153
      # We do not want to overwrite a header file if it hasn't
154
      # changed.  This avoid useless recompilations.  However the
155
      # parser itself (the first file) should always be updated,
156
      # because it is the destination of the .y.c rule in the
157
      # Makefile.  Divert the output of all other files to a temporary
158
      # file so we can compare them to existing versions.
159
      if test $first = no; then
160
	realtarget="$target"
161
	target="tmp-`echo $target | sed s/.*[\\/]//g`"
162
      fi
163
      # Edit out `#line' or `#' directives.
164
      #
165
      # We don't want the resulting debug information to point at
166
      # an absolute srcdir; it is better for it to just mention the
167
      # .y file with no path.
168
      #
169
      # We want to use the real output file name, not yy.lex.c for
170
      # instance.
171
      #
172
      # We want the include guards to be adjusted too.
173
      FROM=`echo "$from" | sed \
174
            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
175
            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
176
      TARGET=`echo "$2" | sed \
177
            -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
178
            -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
179
180
      sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
181
          -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
182
183
      # Check whether header files must be updated.
184
      if test $first = no; then
185
	if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
186
	  echo "$2" is unchanged
187
	  rm -f "$target"
188
	else
189
          echo updating "$2"
190
          mv -f "$target" "$realtarget"
191
        fi
192
      fi
193
    else
194
      # A missing file is only an error for the first file.  This
195
      # is a blatant hack to let us support using "yacc -d".  If -d
196
      # is not specified, we don't want an error when the header
197
      # file is "missing".
198
      if test $first = yes; then
199
        ret=1
200
      fi
201
    fi
202
    shift
203
    shift
204
    first=no
205
  done
135
else
206
else
136
   status=$?
207
  ret=$?
137
fi
208
fi
138
209
139
# Remove the directory.
210
# Remove the directory.
140
cd ..
211
cd ..
141
rm -rf $dirname
212
rm -rf $dirname
142
213
143
exit $status
214
exit $ret
215
216
# Local Variables:
217
# mode: shell-script
218
# sh-indentation: 2
219
# eval: (add-hook 'write-file-hooks 'time-stamp)
220
# time-stamp-start: "scriptversion="
221
# time-stamp-format: "%:y-%02m-%02d.%02H"
222
# time-stamp-end: "$"
223
# End:

Return to bug 277427