Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
27 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,85 +1,18 @@ | ||
--- configure.orig 2009-04-15 13:46:26.000000000 -0500 | ||
+++ configure 2011-10-02 08:54:54.000000000 -0500 | ||
@@ -264,6 +264,7 @@ | ||
MT_PO_DEST=$MT_LANG_DEST;; | ||
"--mandir="* ) MT_MAN_DEST="`echo "$A" | sed -e "s/--mandir=//"`";; | ||
"cflags" ) CFLAG=${CFLAGS};; | ||
+ "ldflags" ) LDFLAG=${LDFLAGS};; | ||
"--cpu="* ) MARCH='-march='"`echo "$A" | sed -e "s/--cpu=//"`";; | ||
"icons"* ) ICON_SET=$A;; | ||
"386" ) MARCH='-march=i386';; | ||
@@ -360,6 +361,7 @@ | ||
noxft ........... Don't use Xft in MTK | ||
--- configure.orig 2020-12-31 10:02:20.000000000 -0500 | ||
+++ configure 2021-10-27 13:44:56.000000000 -0400 | ||
@@ -96,6 +96,7 @@ | ||
"win" ) OS="MinGW/MSYS" | ||
GTK=2;; | ||
"cflags" ) OPTS=CFLAGS;; | ||
+ "ldflags" ) LDFLAG=LDFLAGS;; | ||
"386" ) MARCH='-march=i386';; | ||
"486" ) MARCH='-march=i486';; | ||
"586" ) MARCH='-march=i586';; | ||
@@ -179,6 +180,7 @@ | ||
nothread ......... Don't use multithreading | ||
|
||
cflags .......... Use CFLAGS environment variable | ||
+ldflags ......... Use LDFLAGS environment variable | ||
--cpu= .......... Target a specific CPU, e.g. athlon-xp, x86-64 | ||
686 ............. Target 686 machines | ||
586 ............. Target 586 machines | ||
@@ -595,7 +597,7 @@ | ||
|
||
I_EX="$I_EX -DVERSION=\"\\\"$MT_VERSION\"\\\"" | ||
GTK_INCLUDE="$GTK_INCLUDE $I_EX" | ||
- echo "LDFLAG = $L_EX $GTK_LIB" >> $GTK_FILE | ||
+ echo "LDFLAG = $LDFLAG $L_EX $GTK_LIB" >> $GTK_FILE | ||
|
||
if [ "$CFLAG" ] | ||
then | ||
@@ -631,7 +633,7 @@ | ||
echo | ||
echo " Version $MT_V" | ||
echo " System $OS" | ||
- echo -n " Toolkit " | ||
+ printf " Toolkit " | ||
if [ "$MTK_DIR" ] | ||
then | ||
echo "MTK - $MTK_DIR" | ||
@@ -660,6 +662,10 @@ | ||
echo "Compiler" | ||
echo "--------" | ||
echo | ||
+if [ "$LDFLAG" ] | ||
+then | ||
+ echo " LDFLAGS $LDFLAG" | ||
+fi | ||
if [ "$CFLAG" ] | ||
then | ||
echo " CFLAGS $CFLAG" | ||
@@ -673,30 +679,30 @@ | ||
echo " Debug info $DEBUG" | ||
if [ "$STATIC_PNG" ] || [ "$STATIC_GIF" ] || [ "$STATIC_JPEG" ] || [ "$STATIC_JP2" ] || [ "$STATIC_TIFF" ] | ||
then | ||
- echo -n " Static libraries " | ||
+ printf " Static libraries " | ||
if [ "$STATIC_PNG" ] | ||
then | ||
- echo -n "$STATIC_PNG " | ||
+ printf "$STATIC_PNG " | ||
fi | ||
if [ "$STATIC_GIF" ] | ||
then | ||
- echo -n "$STATIC_GIF " | ||
+ printf "$STATIC_GIF " | ||
fi | ||
if [ "$STATIC_JPEG" ] | ||
then | ||
- echo -n "$STATIC_JPEG " | ||
+ printf "$STATIC_JPEG " | ||
fi | ||
if [ "$STATIC_JP2" ] | ||
then | ||
- echo -n "$STATIC_JP2 " | ||
+ printf "$STATIC_JP2 " | ||
fi | ||
if [ "$STATIC_TIFF" ] | ||
then | ||
- echo -n "$STATIC_TIFF " | ||
+ printf "$STATIC_TIFF " | ||
fi | ||
if [ "$STATIC_FT" ] | ||
then | ||
- echo -n "$STATIC_FT " | ||
+ printf "$STATIC_FT " | ||
fi | ||
echo | ||
fi | ||
cflags ........... Use CFLAGS environment variable | ||
+ldflags .......... Use LDFLAGS environment variable | ||
--cpu= ........... Target a specific CPU, e.g. athlon-xp, x86-64 | ||
686 .............. Target 686 machines | ||
586 .............. Target 586 machines |