99a390f50b
o Do not install everything except headers and libraries (to avoid conflicting with graphics/gd2) o Fix dependency on new libgd1(for many ports). PR: ports/54100 Submitted by: Ports Fury
120 lines
3.7 KiB
Text
120 lines
3.7 KiB
Text
--- configure.orig Sun Mar 9 02:17:40 2003
|
|
+++ configure Sat Jul 5 23:55:07 2003
|
|
@@ -3159,13 +3159,13 @@
|
|
LDFLAGS="${LDFLAGS} ${MATHLIBS}"
|
|
|
|
GDEXTRALIB=""
|
|
-echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
|
|
-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for gdImageGif in %%GD%%" >&5
|
|
+echo $ECHO_N "checking for gdImageGif in %%GD%%... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgd -lgd ${MATHLIBS} $LIBS"
|
|
+LIBS="%%GD%% %%GD%% ${MATHLIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -3211,20 +3211,20 @@
|
|
if test $ac_cv_lib_gd_gdImageGif = yes; then
|
|
|
|
GDFORM_EXT=gif
|
|
- GLIBS="-lgd"
|
|
+ GLIBS="%%GD%%"
|
|
|
|
else
|
|
:
|
|
fi
|
|
|
|
|
|
-echo "$as_me:$LINENO: checking for gdImagePng in -lgd" >&5
|
|
-echo $ECHO_N "checking for gdImagePng in -lgd... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for gdImagePng in %%GD%%" >&5
|
|
+echo $ECHO_N "checking for gdImagePng in %%GD%%... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_gd_gdImagePng+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgd -lgd -lpng -lz ${MATHLIBS} $LIBS"
|
|
+LIBS="%%GD%% %%GD%% -lpng -lz ${MATHLIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -3270,20 +3270,20 @@
|
|
if test $ac_cv_lib_gd_gdImagePng = yes; then
|
|
|
|
GDFORM_EXT=png
|
|
- GLIBS="-lgd -lpng -lz"
|
|
+ GLIBS="%%GD%% -lpng -lz"
|
|
|
|
else
|
|
:
|
|
fi
|
|
|
|
|
|
-echo "$as_me:$LINENO: checking for gdImagePng_jpg in -lgd" >&5
|
|
-echo $ECHO_N "checking for gdImagePng_jpg in -lgd... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for gdImagePng_jpg in %%GD%%" >&5
|
|
+echo $ECHO_N "checking for gdImagePng_jpg in %%GD%%... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_gd_gdImagePng_jpg+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgd -lgd -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
|
|
+LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg ${MATHLIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -3329,20 +3329,20 @@
|
|
if test $ac_cv_lib_gd_gdImagePng_jpg = yes; then
|
|
|
|
GDFORM_EXT=png
|
|
- GLIBS="-lgd -lpng -lz -ljpeg"
|
|
+ GLIBS="%%GD%% -lpng -lz -ljpeg"
|
|
|
|
else
|
|
:
|
|
fi
|
|
|
|
|
|
-echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in -lgd" >&5
|
|
-echo $ECHO_N "checking for gdImagePng_jpg_ft in -lgd... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for gdImagePng_jpg_ft in %%GD%%" >&5
|
|
+echo $ECHO_N "checking for gdImagePng_jpg_ft in %%GD%%... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_gd_gdImagePng_jpg_ft+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgd -lgd -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
|
|
+LIBS="%%GD%% %%GD%% -lpng -lz -ljpeg -lfreetype ${MATHLIBS} $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|
|
@@ -3388,7 +3388,7 @@
|
|
if test $ac_cv_lib_gd_gdImagePng_jpg_ft = yes; then
|
|
|
|
GDFORM_EXT=png
|
|
- GLIBS="-lgd -lpng -lz -ljpeg -lfreetype"
|
|
+ GLIBS="%%GD%% -lpng -lz -ljpeg -lfreetype"
|
|
|
|
else
|
|
:
|
|
@@ -3399,13 +3399,13 @@
|
|
CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif"
|
|
fi
|
|
|
|
-echo "$as_me:$LINENO: checking for gdImageGd in -lgd" >&5
|
|
-echo $ECHO_N "checking for gdImageGd in -lgd... $ECHO_C" >&6
|
|
+echo "$as_me:$LINENO: checking for gdImageGd in %%GD%%" >&5
|
|
+echo $ECHO_N "checking for gdImageGd in %%GD%%... $ECHO_C" >&6
|
|
if test "${ac_cv_lib_gd_gdImageGd+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgd -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
|
|
+LIBS="%%GD%% -Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line $LINENO "configure"
|
|
#include "confdefs.h"
|