|
 |
2b1fba5 |
diff -ubrN aeskulap-0.2.2-beta1.orig/configure.in aeskulap-0.2.2-beta1/configure.in
|
|
|
2b1fba5 |
--- aeskulap-0.2.2-beta1.orig/configure.in 2007-05-24 20:59:09.000000000 +0200
|
|
|
2b1fba5 |
+++ aeskulap-0.2.2-beta1/configure.in 2007-11-12 23:03:37.000000000 +0100
|
|
|
2b1fba5 |
@@ -30,7 +30,6 @@
|
|
|
2b1fba5 |
AC_PROG_CC
|
|
|
2b1fba5 |
AC_PROG_CXX
|
|
|
2b1fba5 |
AC_PROG_INSTALL
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
if test x"$MINGW32" = xno ; then
|
|
|
2b1fba5 |
AM_BINRELOC
|
|
|
2b1fba5 |
else
|
|
|
2b1fba5 |
@@ -80,6 +79,7 @@
|
|
|
2b1fba5 |
AC_SUBST(GTHREAD_CFLAGS)
|
|
|
2b1fba5 |
AC_SUBST(GTHREAD_LIBS)
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
+
|
|
|
2b1fba5 |
if test x"$MINGW32" = xno ; then
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
PKG_CHECK_MODULES(GCONFMM, gconfmm-2.6 >= 2.10.0)
|
|
|
2b1fba5 |
@@ -95,32 +95,16 @@
|
|
|
2b1fba5 |
fi
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
-dnl AC_CONFIG_SUBDIRS(dcmtk)
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-if test x"$MINGW32" = xyes ; then
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
|
|
|
2b1fba5 |
-DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwsock32"
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-else
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
|
|
|
2b1fba5 |
-AC_SUBST(DCMJPEG_LIBS)
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
|
|
|
2b1fba5 |
-DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
|
|
|
2b1fba5 |
--L../dcmtk/dcmdata/libsrc \
|
|
|
2b1fba5 |
--L../dcmtk/dcmnet/libsrc \
|
|
|
2b1fba5 |
--L../dcmtk/dcmjpeg/libsrc \
|
|
|
2b1fba5 |
--L../dcmtk/dcmimage/libsrc \
|
|
|
2b1fba5 |
--L../dcmtk/dcmimgle/libsrc \
|
|
|
2b1fba5 |
-\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-fi
|
|
|
2b1fba5 |
+dnl use Debian packages dcmtk
|
|
|
2b1fba5 |
+dnl AC_CHECK_LIB(dcmimage)
|
|
|
2b1fba5 |
+AC_CHECK_HEADER(dcmtk/config/osconfig.h)
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
AC_SUBST(DCMTK_CFLAGS)
|
|
|
2b1fba5 |
AC_SUBST(DCMTK_LIBS)
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
|
|
|
2b1fba5 |
+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lwrap"
|
|
|
2b1fba5 |
+
|
|
|
2b1fba5 |
dnl set PREFIX
|
|
|
2b1fba5 |
if test "x${prefix}" = "xNONE"; then
|
|
|
2b1fba5 |
packageprefix=${ac_default_prefix}
|
|
|
2b1fba5 |
@@ -128,16 +112,13 @@
|
|
|
2b1fba5 |
packageprefix=${prefix}
|
|
|
2b1fba5 |
fi
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
-DCMTK_SUBDIR=""
|
|
|
2b1fba5 |
if test x"$MINGW32" = xno ; then
|
|
|
2b1fba5 |
-DCMTK_SUBDIR="dcmtk"
|
|
|
2b1fba5 |
LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
|
|
|
2b1fba5 |
else
|
|
|
2b1fba5 |
LDFLAGS_MINGW32="-mwindows"
|
|
|
2b1fba5 |
LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
|
|
|
2b1fba5 |
fi
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
-AC_SUBST(DCMTK_SUBDIR)
|
|
|
2b1fba5 |
AC_SUBST(LDFLAGS_MINGW32)
|
|
|
2b1fba5 |
AC_SUBST(LDFLAGS_AESKULAP_LIBS)
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
@@ -160,12 +141,3 @@
|
|
|
2b1fba5 |
packaging/win32/aeskulap.iss
|
|
|
2b1fba5 |
])
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-if test x"$MINGW32" = xno ; then
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-cd $srcdir/dcmtk
|
|
|
2b1fba5 |
-export CFLAGS="$CFLAGS"
|
|
|
2b1fba5 |
-export CXXFLAGS="$CXXFLAGS"
|
|
|
2b1fba5 |
-sh ./configure --without-openssl --without-zlib --without-libwrap --prefix=${prefix} --libdir=${prefix}/lib/aeskulap
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
-fi
|
|
|
2b1fba5 |
diff -ubrN aeskulap-0.2.2-beta1.orig/Makefile.am aeskulap-0.2.2-beta1/Makefile.am
|
|
|
2b1fba5 |
--- aeskulap-0.2.2-beta1.orig/Makefile.am 2007-05-24 21:19:55.000000000 +0200
|
|
|
2b1fba5 |
+++ aeskulap-0.2.2-beta1/Makefile.am 2007-11-07 07:23:00.000000000 +0100
|
|
|
2b1fba5 |
@@ -1,6 +1,5 @@
|
|
|
2b1fba5 |
SUBDIRS = \
|
|
|
2b1fba5 |
po \
|
|
|
2b1fba5 |
- $(DCMTK_SUBDIR) \
|
|
|
2b1fba5 |
configuration \
|
|
|
2b1fba5 |
imagepool \
|
|
|
2b1fba5 |
widgets \
|
|
|
2b1fba5 |
@@ -21,7 +20,6 @@
|
|
|
2b1fba5 |
AUTHORS \
|
|
|
2b1fba5 |
COPYING \
|
|
|
2b1fba5 |
COPYING.LIB \
|
|
|
2b1fba5 |
- COPYING.DCMTK \
|
|
|
2b1fba5 |
INSTALL \
|
|
|
2b1fba5 |
README \
|
|
|
2b1fba5 |
aeskulap.cbp \
|
|
|
2b1fba5 |
@@ -39,18 +37,7 @@
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
@INTLTOOL_DESKTOP_RULE@
|
|
|
2b1fba5 |
|
|
|
2b1fba5 |
-dist-hook:
|
|
|
2b1fba5 |
- mkdir -p $(distdir)/dcmtk
|
|
|
2b1fba5 |
- cp -Rf $(top_srcdir)/dcmtk/* $(distdir)/dcmtk
|
|
|
2b1fba5 |
- cd $(distdir)/dcmtk && make distclean
|
|
|
2b1fba5 |
- list=`find $(distdir)/dcmtk -name "CVS"` && rm -Rf $$list
|
|
|
2b1fba5 |
- list=`find $(distdir)/dcmtk -name ".cvsignore"` && rm -f $$list
|
|
|
2b1fba5 |
- list=`find $(distdir)/dcmtk -name ".#*"` && rm -f $$list
|
|
|
2b1fba5 |
- list=`find $(distdir)/dcmtk -name "*.a"` && rm -f $$list
|
|
|
2b1fba5 |
- list=`find $(distdir)/dcmtk -name "*.so"` && rm -f $$list
|
|
|
2b1fba5 |
-
|
|
|
2b1fba5 |
distclean: distclean-recursive
|
|
|
2b1fba5 |
- if test x"" != "x" ; then cd ./dcmtk && make distclean ; fi
|
|
|
2b1fba5 |
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
|
|
2b1fba5 |
-rm -f Makefile
|
|
|
2b1fba5 |
|