Use AC_PATH_GENERIC

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/emotion@16492 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.in b/configure.in
index 6e05742..864b6ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -104,145 +104,37 @@ function vser
   echo $V
 }
 
+AC_PATH_GENERIC(eet, 0.9.10,
+  [ ],
+  [ AC_MSG_ERROR(Eet isn't installed)]
+)
+
+AC_PATH_GENERIC(evas, 0.9.9,
+  [ ],
+  [ AC_MSG_ERROR(Evas isn't installed)]
+)
+
+AC_PATH_GENERIC(edje, 0.5.0,
+  [ ],
+  [ AC_MSG_ERROR(Edje isn't installed)]
+)
+
+AC_PATH_GENERIC(ecore, 0.9.9,
+  [ ],
+  [ AC_MSG_ERROR(Ecore isn't installed)]
+)
+
+AC_PATH_GENERIC(embryo, 0.9.1,
+  [ ],
+  [ AC_MSG_ERROR(Embryo isn't installed)]
+)
+
+AC_PATH_GENERIC(xine, 1.0.0,
+  [ ],
+  [ AC_MSG_ERROR(Xine isn't installed)]
+)
 
-AC_ARG_WITH(eet-config, [  --with-eet-config=EET_CONFIG    use eet-config specified ],
-[ EET_CONFIG=$withval;
-  echo "using "$EET_CONFIG" for eet-config";
-],[
-  if test -z "$EET_CONFIG"; then
-    PROG="eet-config";
-    AC_PATH_PROG(EET_CONFIG, $PROG, "", $PATH)
-  fi
-])
-eet_cflags=`$EET_CONFIG --cflags`
-eet_libs=`$EET_CONFIG --libs`
-
-
-AC_ARG_WITH(evas-config, [  --with-evas-config=EVAS_CONFIG    use evas-config specified ],
-[ EVAS_CONFIG=$withval;
-  echo "using "$EVAS_CONFIG" for evas-config";
-],[
-  if test -z "$EVAS_CONFIG"; then
-    PROG="evas-config";
-    AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH)
-  fi
-])
-evas_cflags=`$EVAS_CONFIG --cflags`
-evas_libs=`$EVAS_CONFIG --libs`
-
-
-AC_ARG_WITH(edje-config, [  --with-edje-config=EDJE_CONFIG    use edje-config specified ],
-[ EDJE_CONFIG=$withval;
-  echo "using "$EDJE_CONFIG" for edje-config";
-],[
-  if test -z "$EDJE_CONFIG"; then
-    PROG="edje-config";
-    AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH)
-  fi
-])
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-
-
-AC_ARG_WITH(ecore-config, [  --with-ecore-config=ECORE_CONFIG    use ecore-config specified ],
-[ ECORE_CONFIG=$withval;
-  echo "using "$ECORE_CONFIG" for ecore-config";
-],[
-  if test -z "$ECORE_CONFIG"; then
-    PROG="ecore-config";
-    AC_PATH_PROG(ECORE_CONFIG, $PROG, "", $PATH)
-  fi
-])
-ecore_cflags=`$ECORE_CONFIG --cflags`
-ecore_libs=`$ECORE_CONFIG --libs`
-
-
-AC_ARG_WITH(embryo-config, [  --with-embryo-config=EMBRYO_CONFIG    use embryo-config specified ],
-[ EMBRYO_CONFIG=$withval;
-  echo "using "$EMBRYO_CONFIG" for embryo-config";
-],[
-  if test -z "$EMBRYO_CONFIG"; then
-    PROG="embryo-config";
-    AC_PATH_PROG(EMBRYO_CONFIG, $PROG, "", $PATH)
-  fi
-])
-embryo_cflags=`$EMBRYO_CONFIG --cflags`
-embryo_libs=`$EMBRYO_CONFIG --libs`
-
-
-AC_ARG_WITH(xine-config, [  --with-xine-config=XINE_CONFIG    use xine-config specified ],
-[ XINE_CONFIG=$withval;
-  echo "using "$XINE_CONFIG" for xine-config";
-],[
-  if test -z "$XINE_CONFIG"; then
-    PROG="xine-config";
-    AC_PATH_PROG(XINE_CONFIG, $PROG, "", $PATH)
-  fi
-])
-xine_cflags=`$XINE_CONFIG --cflags`
-xine_libs=`$XINE_CONFIG --libs`
-
-
-V=`$ECORE_CONFIG --version`
-if test -z "$V"; then
-  AC_MSG_ERROR(Ecore is not installed or $ECORE_CONFIG cannot be found.)
-fi
-VV=`vser $V`
-VM="0.9.9"
-VVM=`vser $VM`
-if test $VV -lt $VVM; then
-  AC_MSG_ERROR(Ecore is not at least "$VM". It is "$V".)
-fi
-
-V=`$EVAS_CONFIG --version`
-if test -z "$V"; then
-  AC_MSG_ERROR(Evas is not installed or $EVAS_CONFIG cannot be found.)
-fi
-VV=`vser $V`
-VM="0.9.9"
-VVM=`vser $VM`
-if test $VV -lt $VVM; then
-  AC_MSG_ERROR(Evas is not at least "$VM". It is "$V".)
-fi
-
-V=`$EDJE_CONFIG --version`
-if test -z "$V"; then
-  AC_MSG_ERROR(Edje is not installed or $EDJE_CONFIG cannot be found.)
-fi
-VV=`vser $V`
-VM="0.5.0"
-VVM=`vser $VM`
-if test $VV -lt $VVM; then
-  AC_MSG_ERROR(Edje is not at least "$VM". It is "$V".)
-fi
-
-V=`$XINE_CONFIG --version`
-if test -z "$V"; then
-  AC_MSG_ERROR(Xine is not installed or $XINE_CONFIG cannot be found.)
-fi
-VV=`vser $V`
-VM="1.0.0"
-VVM=`vser $VM`
-if test $VV -lt $VVM; then
-  AC_MSG_ERROR(Xine is not at least "$VM". It is "$V".)
-fi
-
-my_cflags=`$EVAS_CONFIG --cflags`" "`$ECORE_CONFIG --cflags`
-my_libs=`$EVAS_CONFIG --libs`" "`$ECORE_CONFIG --libs`
-AC_SUBST(my_cflags)
-AC_SUBST(my_libs)
-
-edje_cflags=`$EDJE_CONFIG --cflags`
-edje_libs=`$EDJE_CONFIG --libs`
-AC_SUBST(edje_cflags)
-AC_SUBST(edje_libs)
-
-xine_cflags=`$XINE_CONFIG --cflags`
-xine_libs=`$XINE_CONFIG --libs`
 xine_plugins=`$XINE_CONFIG --plugindir`
-
-AC_SUBST(xine_cflags)
-AC_SUBST(xine_libs)
 AC_SUBST(xine_plugins)
 
 AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ccaee99..c94527c 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/lib \
-@my_cflags@ @edje_cflags@
+@EVAS_CFLAGS@ @ECORE_CFLAGS@ @EDJE_CFLAGS@
 
 bin_PROGRAMS = \
 emotion_test
@@ -12,7 +12,7 @@ emotion_test_SOURCES = \
 emotion_test_main.c
 
 emotion_test_LDADD = \
-@my_libs@ @edje_libs@ \
+@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ \
 $(top_builddir)/src/lib/libemotion.la
 
 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 30c067f..a11e8c3 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,7 +6,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES            = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
-                      @my_cflags@
+                      @EVAS_CFLAGS@ \
+                      @ECORE_CFLAGS@
 
 lib_LTLIBRARIES      = libemotion.la
 include_HEADERS      = Emotion.h
@@ -14,6 +15,6 @@ libemotion_la_SOURCES  = \
 emotion_smart.c \
 emotion_private.h
 
-libemotion_la_LIBADD       = @my_libs@ @dlopen_libs@
+libemotion_la_LIBADD       = @EVAS_LIBS@ @ECORE_LIBS@ @dlopen_libs@
 libemotion_la_DEPENDENCIES = $(top_builddir)/config.h
 libemotion_la_LDFLAGS      = -version-info 0:1:0

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index d135bd9..5182d39 100644 (file)
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = Makefile.in
 INCLUDES            = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
                       -I$(top_srcdir)/src/modules \
-                      @my_cflags@ @xine_cflags@
+                      @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@
 
 pkgdir               = $(libdir)/emotion
 
@@ -17,7 +17,7 @@ pkg_LTLIBRARIES      = emotion_decoder_xine.la
 emotion_decoder_xine_la_SOURCES  = \
 emotion_xine.c \
 emotion_xine.h
-emotion_decoder_xine_la_LIBADD       = @my_libs@ @xine_libs@
+emotion_decoder_xine_la_LIBADD       = @EVAS_LIBS@ @ECORE_LIBS@ @XINE_LIBS@
 emotion_decoder_xine_la_LDFLAGS      = -module -avoid-version \
                                       -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
 emotion_decoder_xine_la_DEPENDENCIES = $(top_builddir)/config.h

diff --git a/src/modules/xine/Makefile.am b/src/modules/xine/Makefile.am
index 5973490..064d817 100644 (file)
--- a/src/modules/xine/Makefile.am
+++ b/src/modules/xine/Makefile.am
@@ -8,14 +8,14 @@ INCLUDES           = -I$(top_srcdir) \
                       -I$(top_srcdir)/src/lib \
                       -I$(top_srcdir)/src/modules \
                       -I$(top_srcdir)/src/modules/xine \
-                      @my_cflags@ @xine_cflags@
+                      @EVAS_CFLAGS@ @ECORE_CFLAGS@ @XINE_CFLAGS@
 
 pkgdir               = @xine_plugins@
 
 pkg_LTLIBRARIES      = xineplug_vo_out_emotion.la
 
 xineplug_vo_out_emotion_la_SOURCES      = emotion_xine_vo_out.c
-xineplug_vo_out_emotion_la_LIBADD       = @xine_libs@
+xineplug_vo_out_emotion_la_LIBADD       = @XINE_LIBS@
 xineplug_vo_out_emotion_la_LDFLAGS      = -module -avoid-version \
                                          -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
 xineplug_vo_out_emotion_la_DEPENDENCIES = $(top_builddir)/config.h