Default to not build shared libraries.
CVS patchset: 2980 CVS date: 1999/04/11 22:15:26
This commit is contained in:
jbj
parent
ba7f3e41e0
commit
c5f831ad7e
|
|
@ -26,7 +26,7 @@ if [ "$1" = "--noconfigure" ]; then
|
|||
fi
|
||||
|
||||
if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
|
||||
./configure --disable-shared --prefix=/usr
|
||||
./configure --prefix=/usr
|
||||
else
|
||||
./configure --disable-shared "$@"
|
||||
./configure "$@"
|
||||
fi
|
||||
|
|
|
|||
67
configure.in
67
configure.in
|
|
@ -152,72 +152,18 @@ AM_C_PROTOTYPES
|
|||
AC_PROG_AWK
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
|
||||
AM_DISABLE_SHARED
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
AC_CHECK_TOOL(AR, ar, :)
|
||||
|
||||
if test "$cross_compiling" != "yes"; then
|
||||
MYPATH="/bin:/usr/bin:/usr/local/bin:$PATH:/opt/gnu/bin"
|
||||
AC_MSG_CHECKING(for gzip location)
|
||||
if test -z "$GZIPBIN"; then
|
||||
oldifs="$IFS"
|
||||
IFS=:
|
||||
for n in $MYPATH; do
|
||||
if test -f $n/gzip; then
|
||||
GZIPBIN="$n/gzip";
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$oldifs"
|
||||
fi
|
||||
|
||||
if test -z "$GZIPBIN"; then
|
||||
GZIPBIN="/bin/gzip"
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN(Can't find gzip, assuming $GZIPBIN)
|
||||
else
|
||||
AC_MSG_RESULT($GZIPBIN)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for bzip2 location)
|
||||
if test -z "$BZIP2BIN"; then
|
||||
oldifs="$IFS"
|
||||
IFS=:
|
||||
for n in $MYPATH; do
|
||||
if test -f $n/bzip2; then
|
||||
BZIP2BIN="$n/bzip2";
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$oldifs"
|
||||
fi
|
||||
|
||||
if test -z "$BZIP2BIN"; then
|
||||
BZIP2BIN="/usr/bin/bzip2"
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN(Can't find bzip2, assuming $BZIP2BIN)
|
||||
else
|
||||
AC_MSG_RESULT($BZIP2BIN)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for pgp location)
|
||||
if test -z "$PGPBIN"; then
|
||||
oldifs="$IFS"
|
||||
IFS=:
|
||||
for n in $MYPATH; do
|
||||
if test -f $n/pgp; then
|
||||
PGPBIN="$n/pgp";
|
||||
break
|
||||
fi
|
||||
done
|
||||
IFS="$oldifs"
|
||||
fi
|
||||
|
||||
if test -z "$PGPBIN"; then
|
||||
PGPBIN="/usr/bin/pgp"
|
||||
else
|
||||
AC_MSG_RESULT($PGPBIN)
|
||||
fi
|
||||
AC_PATH_PROG(GZIPBIN, gzip, /bin/gzip, $MYPATH)
|
||||
AC_PATH_PROG(BZIP2BIN, bzip2, /usr/bin/bzip2, $MYPATH)
|
||||
AC_PATH_PROG(PGPBIN, pgp, /usr/bin/pgp, $MYPATH)
|
||||
|
||||
AC_MSG_CHECKING(old version of patch)
|
||||
PATCHVERSION=`patch --version 2>&1`
|
||||
|
|
@ -738,9 +684,6 @@ AC_SUBST(tmpdir)
|
|||
AC_SUBST(LIBS)
|
||||
|
||||
AC_SUBST(RPM)
|
||||
AC_SUBST(GZIPBIN)
|
||||
AC_SUBST(BZIP2BIN)
|
||||
AC_SUBST(PGPBIN)
|
||||
AC_SUBST(FIXPERMS)
|
||||
AC_SUBST(LIBMISC)
|
||||
AC_SUBST(MKDIR_P)
|
||||
|
|
|
|||
22
po/rpm.pot
22
po/rpm.pot
|
|
@ -6,7 +6,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 1999-04-09 11:16-0400\n"
|
||||
"POT-Creation-Date: 1999-04-09 18:32-0400\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -2487,7 +2487,7 @@ msgstr ""
|
|||
msgid "warning: %s saved as %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:440 ../lib/install.c:808 ../lib/uninstall.c:337
|
||||
#: ../lib/install.c:440 ../lib/install.c:806 ../lib/uninstall.c:337
|
||||
#, c-format
|
||||
msgid "rename of %s to %s failed: %s"
|
||||
msgstr ""
|
||||
|
|
@ -2498,44 +2498,44 @@ msgstr ""
|
|||
|
||||
#. this would probably be a good place to check if disk space
|
||||
#. was used up - if so, we should return a different error
|
||||
#: ../lib/install.c:631
|
||||
#: ../lib/install.c:629
|
||||
#, c-format
|
||||
msgid "unpacking of archive failed%s%s: %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:632
|
||||
#: ../lib/install.c:630
|
||||
msgid " on file "
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:672
|
||||
#: ../lib/install.c:670
|
||||
msgid "installing a source package\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:683 ../lib/install.c:705
|
||||
#: ../lib/install.c:681 ../lib/install.c:703
|
||||
#, c-format
|
||||
msgid "cannot create %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:690 ../lib/install.c:712
|
||||
#: ../lib/install.c:688 ../lib/install.c:710
|
||||
#, c-format
|
||||
msgid "cannot write to %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:694
|
||||
#: ../lib/install.c:692
|
||||
#, c-format
|
||||
msgid "sources in: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:716
|
||||
#: ../lib/install.c:714
|
||||
#, c-format
|
||||
msgid "spec file in: %s\n"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:749 ../lib/install.c:785
|
||||
#: ../lib/install.c:747 ../lib/install.c:783
|
||||
msgid "source package contains no .spec file"
|
||||
msgstr ""
|
||||
|
||||
#: ../lib/install.c:806
|
||||
#: ../lib/install.c:804
|
||||
#, c-format
|
||||
msgid "renaming %s to %s\n"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ fi
|
|||
cd "$THEDIR"
|
||||
|
||||
if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
|
||||
$srcdir/configure --disable-shared --prefix=/usr
|
||||
$srcdir/configure --prefix=/usr
|
||||
else
|
||||
$srcdir/configure --disable-shared "$@"
|
||||
$srcdir/configure "$@"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ AC_PROG_CC
|
|||
AC_GCC_TRADITIONAL
|
||||
AM_C_PROTOTYPES
|
||||
|
||||
AM_DISABLE_SHARED
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
if test $CC = gcc; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue