Author: cazfi
Date: Sun Aug  2 21:10:24 2015
New Revision: 29297

URL: http://svn.gna.org/viewcvs/freeciv?rev=29297&view=rev
Log:
Moved FC_EXPAND_DIR() from x.m4 to new expanddir.m4,

See patch #6159

Added:
    trunk/m4/expanddir.m4
Modified:
    trunk/Makefile.am
    trunk/m4/x.m4

Modified: trunk/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=29297&r1=29296&r2=29297&view=diff
==============================================================================
--- trunk/Makefile.am   (original)
+++ trunk/Makefile.am   Sun Aug  2 21:10:24 2015
@@ -39,6 +39,7 @@
                m4/codeset.m4                   \
                m4/compiler.m4                  \
                m4/debug.m4                     \
+               m4/expanddir.m4                 \
                m4/fcdb-mysql.m4                \
                m4/fcdb-postgres.m4             \
                m4/fcdb-sqlite3.m4              \

Added: trunk/m4/expanddir.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/m4/expanddir.m4?rev=29297&view=auto
==============================================================================
--- trunk/m4/expanddir.m4       (added)
+++ trunk/m4/expanddir.m4       Sun Aug  2 21:10:24 2015
@@ -0,0 +1,15 @@
+dnl FC_EXPAND_DIR(VARNAME, DIR)
+dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
+dnl and assigns the resulting string to VARNAME
+dnl example: FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
+dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
+dnl by Alexandre Oliva 
+dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
+AC_DEFUN([FC_EXPAND_DIR], [
+        $1=$2
+        $1=`(
+            test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+            test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+            eval echo \""[$]$1"\"
+        )`
+])

Modified: trunk/m4/x.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/m4/x.m4?rev=29297&r1=29296&r2=29297&view=diff
==============================================================================
--- trunk/m4/x.m4       (original)
+++ trunk/m4/x.m4       Sun Aug  2 21:10:24 2015
@@ -81,23 +81,6 @@
  ])dnl
  fi
 ])
-
-dnl FC_EXPAND_DIR(VARNAME, DIR)
-dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
-dnl and assigns the resulting string to VARNAME
-dnl example: FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
-dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
-dnl by Alexandre Oliva 
-dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
-AC_DEFUN([FC_EXPAND_DIR], [
-        $1=$2
-        $1=`(
-            test "x$prefix" = xNONE && prefix="$ac_default_prefix"
-            test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
-            eval echo \""[$]$1"\"
-        )`
-])
-
 
 dnl FC_XPM_PATHS
 dnl Allow user to specify extra include/lib paths for Xpm, with


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to