| 123456789101112131415161718192021222324252627282930313233343536 |
- $OpenBSD: patch-configure_ac,v 1.1 2014/04/03 19:53:07 brad Exp $
- --- configure.ac.orig Thu Mar 27 03:45:56 2014
- +++ configure.ac Thu Mar 27 03:46:08 2014
- @@ -55,7 +55,7 @@ dnl make sure an optimization level is set. On jhbuild
- dnl overwritten, so we're using this to make sure some optimization is on
- dnl when compiling. This is especially important to speeding up the
- dnl reslicing algorithm
- -OPTIMIZATION_CFLAGS="-O2"
- +OPTIMIZATION_CFLAGS=""
- echo "setting optimization level to $OPTIMIZATION_CFLAGS"
- AC_SUBST(OPTIMIZATION_CFLAGS)
-
- @@ -106,7 +106,7 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDC
- dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
- dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
- AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
- -AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -lz $THREAD_LIBS"
- +AMIDE_LIBDCMDATA_LIBS=""
- AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
- saved_libs="${LIBS}"
- LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}"
- @@ -352,11 +352,8 @@ fi
- ## add in gnome-vfs if not on win32 or gtk-osx
- ## gnome-vfs is only used by amide_gnome.c and only on unix
- if (test $native_win32 = no) && (test $enable_native_gtk_osx = no); then
- - PKG_CHECK_MODULES(AMIDE_GTK_EXTRA_GVFS,[
- - gnome-vfs-2.0 >= 2.16.0
- - ])
- - AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS $AMIDE_GTK_EXTRA_GVFS_LIBS"
- - AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS $AMIDE_GTK_EXTRA_GVFS_CFLAGS"
- + AMIDE_GTK_LIBS="$AMIDE_GTK_LIBS"
- + AMIDE_GTK_CFLAGS="$AMIDE_GTK_CFLAGS"
- fi
-
- AC_SUBST(AMIDE_GTK_LIBS)
|
