configure/Makefile fixes

2 files changed, 29 insertions, 13 deletions

diff --git a/configure.ac b/configure.ac
index 2571b17..f46513d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,10 +47,10 @@ fi
 AC_CHECK_LIB(m, main)
 
 AC_CHECK_LIB(gslcblas,main, [],  AC_MSG_ERROR([
-       *** gslcblas not found.  gslcblas is required to build Synth2D.]))
+       *** gslcblas not found.  gslcblas is required to build DTR.]))
 
 AC_CHECK_LIB(gsl, main, [],  AC_MSG_ERROR([
-       *** gsl not found.  gsl is required to build Synth2D.]))
+       *** gsl not found.  gsl is required to build DTR.]))
 
 AC_MSG_CHECKING([libpng])
 if $PKG_CONFIG --atleast-version 1.2.0 libpng ; then
@@ -61,15 +61,33 @@ if $PKG_CONFIG --atleast-version 1.2.0 libpng ; then
 else
         AC_MSG_RESULT([Lower than 1.2.0 or not found])
         AC_MSG_ERROR([
-*** libPNG is required to build ugliquant])
+*** libPNG is required to build DTR.])
 fi
 
-AM_PATH_GTKGLEXT_1_0(1.0.0,[echo "$GTKGLEXT_LIBS"],AC_MSG_ERROR([
- 	*** gtkglext is required to build dtr; please make sure you have the
- 	*** gtkglext development headers installed.]))
-
+AC_ARG_WITH(gtkglext,
+[AS_HELP_STRING([--with-gtkglext], [specify location of gtkglext])],
+[GTKGLEXT_CFLAGS="-I$withval/include/gtkglext-1.0 -I$withval/lib/gtkglext-1.0/include"
+ GTKGLEXT_LIBS="-L$withval/lib -lgtkglext-x11-1.0"],
+[
+AC_MSG_CHECKING([gtkglext])
+if $PKG_CONFIG --exists gtkglext-1.0 ; then
+        AC_MSG_RESULT([found])
+        GTKGLEXT_CFLAGS=`$PKG_CONFIG --cflags gtkglext-1.0`
+        GTKGLEXT_LIBS=`$PKG_CONFIG --libs gtkglext-1.0`
+else
+ AC_MSG_RESULT([ not found])
+        AC_MSG_ERROR([
+*** gtkglext is required to build DTR.])
+fi])
+
+AC_ARG_WITH(glew,
+[AS_HELP_STRING([--with-glew], [specify location of GLEW])],
+[GLEW_CFLAGS="-I$withval/include/GL"
+ GLEW_LIBS="-L$withval/lib64 -lGLEW"],
+[
 AC_CHECK_LIB(GLEW, main, [GLEW_LIBS=-lGLEW],  AC_MSG_ERROR([
 *** GLEW not found.  Do you have 'libglew-dev' or similar installed?]))
+])
 
 AC_MSG_CHECKING([Cairo version 1.2.0])
 if $PKG_CONFIG --atleast-version 1.2.0 cairo ; then
@@ -82,8 +100,7 @@ else
 	AC_MSG_RESULT([not found.  Some functions will be unavailable.])
 fi
 
-CFLAGS="$CFLAGS $CAIRO_CFLAGS $LIBPNG_CLAGS"
-LIBS="$LIBS $CAIRO_LIBS $LIBPNG_LIBS $GLEW_LIBS"
+CFLAGS="$CFLAGS $CAIRO_CFLAGS $GTK_CFLAGS $LIBPNG_CFLAGS $GLEW_CFLAGS $GTKGLEXT_CFLAGS"
+LIBS="$LIBS $CAIRO_LIBS $LIBPNG_LIBS $GTK_LIBS $GLEW_LIBS $GTKGLEXT_LIBS"
 
 AC_OUTPUT(Makefile src/Makefile data/Makefile)
-
diff --git a/src/Makefile.am b/src/Makefile.am
index d6e39c6..1af0a44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = dtr refinetest2d refinetest3d1 refinetest3d2 refinetest3d3
 dtr_SOURCES = main.c displaywindow.c trackball.c reflections.c readpng.c mrc.c imagedisplay.c utils.c itrans.c qdrp.c \
 		cache.c itrans-threshold.c itrans-zaefferer.c itrans-stat.c control.c mapping.c reproject.c prealign.c \
 		basis.c dirax.c image.c refine.c gtk-valuegraph.c intensities.c glbits.c
-dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm @GTKGLEXT_LIBS@ -lgsl -lgslcblas -lutil
+dtr_LDADD = @LIBS@ @GTK_LIBS@ -lm -lgsl -lgslcblas -lutil
 
 refinetest2d_SOURCES = refinetest2d.c reflections.c basis.c utils.c reproject.c image.c refine.c mapping.c control.c
 refinetest2d_LDADD = @LIBS@ @GTK_LIBS@ -lm -lgsl -lgslcblas -lutil
@@ -17,6 +17,5 @@ refinetest3d2_LDADD = @LIBS@ @GTK_LIBS@ -lm -lgsl -lgslcblas -lutil
 refinetest3d3_SOURCES = refinetest3d3.c reflections.c basis.c utils.c reproject.c image.c refine.c mapping.c control.c
 refinetest3d3_LDADD = @LIBS@ @GTK_LIBS@ -lm -lgsl -lgslcblas -lutil
 
-AM_CFLAGS = -Wall -g @CFLAGS@ @GTK_CFLAGS@ @GTKGLEXT_CFLAGS@
+AM_CFLAGS = -Wall -g @CFLAGS@
 AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" -I/usr/include/GL
-