diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2014-01-27 15:47:49 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2014-01-27 15:47:49 +0000 |
| commit | 4df27e22c6cc05e1315d9d7fa8b31dac9ce6c82a (patch) | |
| tree | 437aa8f86f44aa2c9e32f774489324756d0df694 /graphics/amide/files/patch-configure | |
| parent | Revert r341073, static libs are not supposed to be PIC (diff) | |
Update to 1.0.5
Diffstat (limited to 'graphics/amide/files/patch-configure')
| -rw-r--r-- | graphics/amide/files/patch-configure | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/graphics/amide/files/patch-configure b/graphics/amide/files/patch-configure index 3a38229840c1..6981761a1cb2 100644 --- a/graphics/amide/files/patch-configure +++ b/graphics/amide/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2012-04-14 20:02:59.000000000 +0200 -+++ configure 2012-05-29 22:31:25.785277676 +0200 -@@ -16046,7 +16046,7 @@ +--- configure.orig 2014-01-25 23:25:33.000000000 +0100 ++++ configure 2014-01-27 16:03:41.403133047 +0100 +@@ -16216,7 +16216,7 @@ DATADIRNAME=share else CATOBJEXT=.mo @@ -9,7 +9,7 @@ fi ;; -@@ -16056,7 +16056,7 @@ +@@ -16226,7 +16226,7 @@ ;; *) CATOBJEXT=.mo @@ -18,7 +18,7 @@ ;; esac fi -@@ -16723,12 +16723,12 @@ +@@ -16914,12 +16914,12 @@ if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else @@ -33,31 +33,18 @@ ;; esac fi -@@ -16793,9 +16793,9 @@ - fi - - --OPTIMIZATION_LEVEL="-O3" --echo "setting optimization level to $OPTIMIZATION_LEVEL" --CFLAGS="$CFLAGS $OPTIMIZATION_LEVEL" -+#OPTIMIZATION_LEVEL="-O3" -+#echo "setting optimization level to $OPTIMIZATION_LEVEL" -+#CFLAGS="$CFLAGS $OPTIMIZATION_LEVEL" - - if test $CC = "gcc"; then - echo -n "checking version of gcc... " -@@ -17443,8 +17443,8 @@ +@@ -17612,8 +17612,8 @@ THREAD_LIBS="" fi -AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS" -AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include" -+AMIDE_LIBDCMDATA_LIBS="-L%%LOCALBASE%%/lib -L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS" -+AMIDE_LIBDCMDATA_CFLAGS="-I%%LOCALBASE%%/include -I/usr/local/dicom/include" ++AMIDE_LIBDCMDATA_LIBS="-L%%LOCALBASE%%/lib -ldcmdata -loflog -lofstd -lz $THREAD_LIBS" ++AMIDE_LIBDCMDATA_CFLAGS="-I%%LOCALBASE%%/include" saved_libs="${LIBS}" LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}" saved_cxxflags="${CXXFLAGS}" -@@ -17982,6 +17982,7 @@ +@@ -18154,6 +18154,7 @@ ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $LIBFAME_CFLAGS" @@ -65,7 +52,7 @@ LIBS="$LIBFAME_LIBS $LIBS" rm -f conf.libfametest if test "$cross_compiling" = yes; then : -@@ -17993,6 +17994,7 @@ +@@ -18165,6 +18166,7 @@ #include <fame.h> #include <stdio.h> #include <stdlib.h> @@ -73,7 +60,7 @@ int main () -@@ -21896,7 +21898,3 @@ +@@ -22121,7 +22123,3 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi |